diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 4947457231..1e09bf3ddf 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -460,6 +460,9 @@ public interface DaoMessage {
     @Query("UPDATE message SET notifying = 0")
     int clearNotifyingMessages();
 
+    @Query("UPDATE message SET headers = NULL WHERE headers IS NOT NULL")
+    int clearMessageHeaders();
+
     @Query("DELETE FROM message WHERE id = :id")
     int deleteMessage(long id);
 
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index f5cb2b8546..f594562704 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -98,6 +98,9 @@ public class WorkerCleanup extends Worker {
                 // Restore alarms
                 for (EntityMessage message : db.message().getSnoozed())
                     EntityMessage.snooze(context, message.id, message.ui_snoozed);
+
+                int headers = db.message().clearMessageHeaders();
+                Log.i("Cleared message headers=" + headers);
             }
 
             long now = new Date().getTime();