From 4fe39328dc6d22a7272e3453127181489ba8ca0f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 28 Jun 2021 08:21:40 +0200 Subject: [PATCH] Skip blocklist move for trash/junk folder --- app/src/main/java/eu/faircode/email/Core.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 0c0e9b1c7e..5edfc83a9d 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3410,7 +3410,10 @@ class Core { runRules(context, imessage, account, folder, message, rules); - if (!have && message.blocklist != null && message.blocklist) { + if (!have && + !EntityFolder.TRASH.equals(folder.type) && + !EntityFolder.JUNK.equals(folder.type) && + message.blocklist != null && message.blocklist) { boolean use_blocklist = prefs.getBoolean("use_blocklist", false); if (use_blocklist) { EntityLog.log(context, "Block list" +