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