diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 438fd01acf..bbc1f869ec 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -44,7 +44,8 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
 
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
-        handle(getIntent());
+        if (getSupportFragmentManager().getBackStackEntryCount() == 0)
+            handle(getIntent());
     }
 
     @Override