diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 8e7b02516f..d11e1ee1f8 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -184,7 +184,7 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
         switch (item.getItemId()) {
             case android.R.id.home:
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
-                    getSupportFragmentManager().popBackStack();
+                    onBackPressed();
                 return true;
             default:
                 return false;