diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index 333c9bca11..1f93d4fbbf 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -116,7 +116,8 @@ public class MessageClassifier {
 
                     EntityFolder dest = db.folder().getFolderByName(folder.account, classified);
                     if (dest != null && dest.auto_classify_target &&
-                            (pro || EntityFolder.JUNK.equals(dest.type))) {
+                            (pro || EntityFolder.JUNK.equals(dest.type)) &&
+                                    (!EntityFolder.JUNK.equals(dest.type) || !message.isNotJunk(context))) {
                         EntityOperation.queue(context, message, EntityOperation.KEYWORD, MessageHelper.FLAG_CLASSIFIED, true);
                         EntityOperation.queue(context, message, EntityOperation.MOVE, dest.id, false, true);
                         message.ui_hide = true;