diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 8aef7f0bae..5d80f9bb60 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -472,6 +472,10 @@ class Core {
         // Add message
         DB db = DB.getInstance(context);
 
+        // Drafts can change accounts
+        if (jargs.length() == 0 && !folder.id.equals(message.folder))
+            throw new IllegalArgumentException("Message folder changed");
+
         // Get arguments
         long target = jargs.optLong(0, folder.id);
         boolean autoread = jargs.optBoolean(1, false);
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 9c35264f82..20503b5d46 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -214,8 +214,7 @@ public class EntityOperation {
 
                 // Cross account move
                 if (!source.account.equals(target.account))
-                    if (message.raw != null && message.raw &&
-                            message.getRawFile(context).exists()) {
+                    if (message.raw != null && message.raw) {
                         name = ADD;
                         folder = target.id;
                     } else