diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8a28866c6..921890ca7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -95,6 +95,7 @@
 
         <activity
             android:name=".ActivityCompose"
+            android:documentLaunchMode="always"
             android:exported="true"
             android:launchMode="standard"
             android:parentActivityName=".ActivityView">
diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index ce4a59a31f..1de93300c9 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -152,7 +152,7 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
     @Override
     public void onBackStackChanged() {
         if (getSupportFragmentManager().getBackStackEntryCount() == 0)
-            finish();
+            finishAndRemoveTask();
     }
 
     @Override