diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 3a42c28040..058639edf7 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1554,7 +1554,8 @@ class Core {
                     }
 
                     for (Flags.Flag flag : imessage.getFlags().getSystemFlags())
-                        icopy.setFlag(flag, true);
+                        if (flag != Flags.Flag.DRAFT || EntityFolder.DRAFTS.equals(target.type))
+                            icopy.setFlag(flag, true);
 
                     icopies.add(icopy);
                 }