diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index fb0736b6ca..dd2d152f17 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -217,7 +217,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
         long now = new Date().getTime();
         long last = prefs.getLong("last_composed", 0L);
 
-        if (!create &&
+        if (!create && !BuildConfig.PLAY_STORE_RELEASE &&
                 now - last < APPEND_ATTACHMENT_INTERVAL &&
                 args.size() == 1 && args.containsKey("attachments")) {
             List<Fragment> fragments = fm.getFragments();
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index c1584ff306..4ebd5697f2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -170,7 +170,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                         // https://developer.android.com/docs/quality-guidelines/core-app-quality
                         long now = new Date().getTime();
                         long last = prefs.getLong("last_launched", 0L);
-                        if (now - last > RESTORE_STATE_INTERVAL)
+                        if (!BuildConfig.PLAY_STORE_RELEASE &&
+                                now - last > RESTORE_STATE_INTERVAL)
                             view.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
 
                         Intent saved = args.getParcelable("intent");