diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 0573ae1973..de2af17dad 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -33,6 +33,7 @@ import androidx.core.net.MailTo;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 
 import java.io.File;
@@ -222,8 +223,8 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
             args.putLong("account", -1);
         }
 
-        //if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-        //    getSupportFragmentManager().popBackStack("compose", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            getSupportFragmentManager().popBackStack("compose", FragmentManager.POP_BACK_STACK_INCLUSIVE);
 
         FragmentCompose fragment = new FragmentCompose();
         fragment.setArguments(args);