diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f58bdb7e9d..ce2cedcc20 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1611,11 +1611,8 @@ class Core {
                             throw new IllegalArgumentException("move: msgid missing");
 
                         Long uid = findUid(context, account, itarget, msgid);
-                        if (uid == null) {
-                            Log.w("move: uid not found msgid=" + msgid);
-                            db.message().deleteMessage(message.id);
-                            continue;
-                        }
+                        if (uid == null)
+                            throw new IllegalArgumentException("move: uid not found");
 
                         if (draft || duplicate) {
                             Message icopy = itarget.getMessageByUID(uid);