diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 7714538fce..c3c2d2f06b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1658,7 +1658,6 @@ public class FragmentCompose extends FragmentEx {
                     draft.id = id;
                     draft.account = aid;
                     draft.folder = db.folder().getFolderByType(aid, EntityFolder.DRAFTS).id;
-                    draft.msgid = EntityMessage.generateMessageId();
                     draft.content = true;
                     draft.ui_hide = false;
                     EntityOperation.queue(db, draft, EntityOperation.ADD);
@@ -1771,7 +1770,6 @@ public class FragmentCompose extends FragmentEx {
                     draft.id = null;
                     draft.folder = db.folder().getOutbox().id;
                     draft.uid = null;
-                    draft.msgid = EntityMessage.generateMessageId();
                     draft.ui_hide = false;
                     draft.id = db.message().insertMessage(draft);
                     draft.write(getContext(), body);