diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 65193ddc24..ca4c5eb445 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -675,9 +675,6 @@ 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("UPDATE message SET fts = 0")
     int resetFts();
 
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index 0fe452cb74..62416d01d6 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -111,10 +111,6 @@ public class WorkerCleanup extends Worker {
                     Log.i("Attachments purged=" + purged);
                 }
 
-                // Clear raw headers
-                int headers = db.message().clearMessageHeaders();
-                Log.i("Cleared message headers=" + headers);
-
                 // Restore alarms
                 for (EntityMessage message : db.message().getSnoozed(null))
                     EntityMessage.snooze(context, message.id, message.ui_snoozed);