diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 7d867aa69f..cd2b19d693 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -86,6 +86,9 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
                     }
             }
 
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            prefs.edit().remove("last_composing").apply();
+
             finishAndRemoveTask();
         }
     }