diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index f93bd41753..0ad68ee024 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -495,6 +495,7 @@ public class FragmentMessage extends FragmentEx {
                     draft.id = null;
                     draft.folder = drafts.id;
                     draft.uid = null;
+                    draft.msgid = EntityMessage.generateMessageId();
                     draft.id = db.message().insertMessage(draft);
 
                     EntityOperation.queue(db, draft, EntityOperation.ADD);