diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 99a97aceee..0742586ad1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1882,6 +1882,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             if (EntityFolder.OUTBOX.equals(message.folderType))
                 return makeMovementFlags(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
 
+            if (message.uid == null && message.accountProtocol == EntityAccount.TYPE_IMAP)
+                return 0;
+
             if (message.folderReadOnly)
                 return 0;
 
@@ -2123,11 +2126,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             if (message == null)
                 return null;
 
-            if (message.uid == null &&
-                    !EntityFolder.OUTBOX.equals(message.folderType) &&
-                    message.accountProtocol == EntityAccount.TYPE_IMAP)
-                return null;
-
             if (iProperties.getValue("expanded", message.id))
                 return null;