diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index 080ec50aa0..e05dd496ca 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -110,8 +110,10 @@ public class MessageClassifier {
 
             if (classified != null) {
                 EntityFolder f = db.folder().getFolderByName(account.id, classified);
-                if (f != null && f.download && f.auto_classify && !f.id.equals(folder.id))
+                if (f != null && !f.id.equals(folder.id) && f.auto_classify) {
                     EntityOperation.queue(context, message, EntityOperation.MOVE, f.id, false);
+                    message.ui_hide = true;
+                }
             }
         } catch (Throwable ex) {
             Log.e(ex);