diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index eda98a50..8750b8b4 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -320,6 +320,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
                         draft.ui_hide = false;
                         draft.id = db.message().insertMessage(draft);
 
+                        EntityOperation.queue(ActivityView.this, draft, EntityOperation.ADD);
+
                         startActivity(new Intent(ActivityView.this, ActivityCompose.class)
                                 .putExtra("id", draft.id));
                     }