From cb5e9827c4a4a77437940be4fc2be06ceed326d4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 Jan 2020 12:32:34 +0100
Subject: [PATCH] Use keyword blacklist only

---
 .../java/eu/faircode/email/AdapterMessage.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b234015cb2..0477073bb2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -264,11 +264,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     ));
 
     // https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
-    private static final List<String> IMAP_KEYWORDS_WHITELIST = Collections.unmodifiableList(Arrays.asList(
-            "$Phishing".toLowerCase()
-    ));
-
     private static final List<String> IMAP_KEYWORDS_BLACKLIST = Collections.unmodifiableList(Arrays.asList(
+            "$MDNSent".toLowerCase(),
+            "$Forwarded".toLowerCase(),
+            "$SubmitPending".toLowerCase(),
+            "$Submitted".toLowerCase(),
+            "$Junk".toLowerCase(),
+            "$NotJunk".toLowerCase(),
+            "$recent".toLowerCase(),
             "DTAG_document".toLowerCase(),
             "DTAG_image".toLowerCase()
     ));
@@ -881,8 +884,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 SpannableStringBuilder keywords = new SpannableStringBuilder();
                 for (int i = 0; i < message.keywords.length; i++) {
                     String k = message.keywords[i].toLowerCase();
-                    if (IMAP_KEYWORDS_WHITELIST.contains(k) ||
-                            !(k.startsWith("$") || IMAP_KEYWORDS_BLACKLIST.contains(k))) {
+                    if (!IMAP_KEYWORDS_BLACKLIST.contains(k)) {
                         if (keywords.length() > 0)
                             keywords.append(", ");