diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index df5da34418..b234015cb2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4138,11 +4138,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     void submitList(PagedList<TupleMessageEx> list) {
         keyPosition.clear();
-        for (int i = 0; i < list.size(); i++) {
-            TupleMessageEx message = list.get(i);
-            if (message != null)
-                message.resolveKeywordColors(context);
-        }
+
+        if (keywords_header)
+            for (int i = 0; i < list.size(); i++) {
+                TupleMessageEx message = list.get(i);
+                if (message != null)
+                    message.resolveKeywordColors(context);
+            }
+
         differ.submitList(list);
     }