From 59dc02a0936c325489156835a35dd6f85442b98f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 19 Sep 2022 17:30:40 +0200
Subject: [PATCH] Skip classifying junk for not-spam

---
 app/src/main/java/eu/faircode/email/MessageClassifier.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;