diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index d8f6558e9b..ca7f0a551c 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3196,6 +3196,10 @@ class Core {
                 if (imessages == null)
                     imessages = new Message[0];
 
+                for (Message imessage : imessages)
+                    if (imessage instanceof IMAPMessage)
+                        ((IMAPMessage) imessage).invalidateHeaders();
+
                 stats.search_ms = (SystemClock.elapsedRealtime() - search);
                 Log.i(folder.name + " remote count=" + imessages.length + " search=" + stats.search_ms + " ms");