diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index f6752337a8..51e9afd070 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -64,6 +64,9 @@ public class MessageClassifier {
             if (!folder.auto_classify_source)
                 return;
 
+            if (target != null && !target.auto_classify_source)
+                return;
+
             long start = new Date().getTime();
 
             // Build text to classify