diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d652b8d989..a3aa5a67d8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -6430,6 +6430,7 @@ public class FragmentCompose extends FragmentBase {
             if (activity != null) {
                 Intent intent = activity.getIntent();
                 if (intent != null) {
+                    intent.setAction(null);
                     intent.putExtra("id", data.draft.id);
                     intent.putExtra("action", "edit");
                 }