diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index ad95648727..049ff069b0 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1883,7 +1883,8 @@ class Core {
                 }
             } else {
                 // Delete not synchronized messages without uid
-                db.message().deleteOrphans(folder.id);
+                if (!EntityFolder.DRAFTS.equals(folder.type))
+                    db.message().deleteOrphans(folder.id);
             }
 
             int count = ifolder.getMessageCount();