diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f34b0f4009..aab00386c6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -661,6 +661,7 @@ public class FragmentCompose extends FragmentBase {
                 if (a == null) {
                     a = new Bundle();
                     a.putString("action", "new");
+                    setArguments(a);
                 }
 
                 Bundle args = new Bundle();