diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index ea6ab2cfe1..44829275ce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1369,7 +1369,7 @@ public class FragmentMessages extends FragmentEx {
                     List<EntityMessage> messages = db.message().getMessageByThread(account, thread);
 
                     for (EntityMessage message : messages)
-                        if (!target.id.equals(message.folder)) {
+                        if (message.uid != null && !target.id.equals(message.folder)) {
                             db.message().setMessageUiHide(message.id, true);
                             EntityOperation.queue(db, message, EntityOperation.MOVE, target.id);
                         }