diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index 1acd3900eb..f4622e5086 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -116,11 +116,12 @@ public class MessageClassifier {
                     }
 
                     db.setTransactionSuccessful();
-
-                    accountMsgIds.get(folder.account).add(message.msgid);
                 } finally {
                     db.endTransaction();
                 }
+
+                if (message.ui_hide)
+                    accountMsgIds.get(folder.account).add(message.msgid);
             }
 
             dirty = true;