diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index bcfd4d543d..f908535198 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -582,7 +582,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     db.folder().setFolderError(browsable.id, Log.formatThrowable(ex));
                 } finally {
                     isub[j] = null;
-                    //((IMAPMessage) isub[j]).invalidateHeaders();
                 }
         }
 
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 6111274c55..e776c9002e 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1406,43 +1406,39 @@ class Core {
             boolean download = db.folder().getFolderDownload(folder.id);
             List<EntityRule> rules = db.rule().getEnabledRules(folder.id);
 
-            try {
-                FetchProfile fp = new FetchProfile();
-                fp.add(FetchProfile.Item.ENVELOPE);
-                fp.add(FetchProfile.Item.FLAGS);
-                fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
-                //fp.add(UIDFolder.FetchProfileItem.UID);
-                fp.add(IMAPFolder.FetchProfileItem.HEADERS);
-                //fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
-                fp.add(FetchProfile.Item.SIZE);
-                fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
-                if (account.isGmail()) {
-                    fp.add(GmailFolder.FetchProfileItem.THRID);
-                    fp.add(GmailFolder.FetchProfileItem.LABELS);
-                }
-                ifolder.fetch(new Message[]{imessage}, fp);
-
-                EntityMessage message = synchronizeMessage(context, account, folder, istore, ifolder, imessage, false, download, rules, state, stats);
-                if (message != null) {
-                    if (account.isGmail() && EntityFolder.USER.equals(folder.type))
-                        try {
-                            JSONArray jlabel = new JSONArray();
-                            jlabel.put(0, folder.name);
-                            jlabel.put(1, true);
-                            onLabel(context, jlabel, folder, message, istore, ifolder, state);
-                        } catch (Throwable ex1) {
-                            Log.e(ex1);
-                        }
+            FetchProfile fp = new FetchProfile();
+            fp.add(FetchProfile.Item.ENVELOPE);
+            fp.add(FetchProfile.Item.FLAGS);
+            fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
+            //fp.add(UIDFolder.FetchProfileItem.UID);
+            fp.add(IMAPFolder.FetchProfileItem.HEADERS);
+            //fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
+            fp.add(FetchProfile.Item.SIZE);
+            fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
+            if (account.isGmail()) {
+                fp.add(GmailFolder.FetchProfileItem.THRID);
+                fp.add(GmailFolder.FetchProfileItem.LABELS);
+            }
+            ifolder.fetch(new Message[]{imessage}, fp);
 
-                    if (download)
-                        downloadMessage(context, account, folder, istore, ifolder, imessage, message.id, state, stats);
-                }
+            EntityMessage message = synchronizeMessage(context, account, folder, istore, ifolder, imessage, false, download, rules, state, stats);
+            if (message != null) {
+                if (account.isGmail() && EntityFolder.USER.equals(folder.type))
+                    try {
+                        JSONArray jlabel = new JSONArray();
+                        jlabel.put(0, folder.name);
+                        jlabel.put(1, true);
+                        onLabel(context, jlabel, folder, message, istore, ifolder, state);
+                    } catch (Throwable ex1) {
+                        Log.e(ex1);
+                    }
 
-                if (!stats.isEmpty())
-                    EntityLog.log(context, account.name + "/" + folder.name + " fetch stats " + stats);
-            } finally {
-                ((IMAPMessage) imessage).invalidateHeaders();
+                if (download)
+                    downloadMessage(context, account, folder, istore, ifolder, imessage, message.id, state, stats);
             }
+
+            if (!stats.isEmpty())
+                EntityLog.log(context, account.name + "/" + folder.name + " fetch stats " + stats);
         } catch (MessageRemovedException | MessageRemovedIOException ex) {
             Log.i(ex);
 
@@ -2981,7 +2977,7 @@ class Core {
                             db.folder().setFolderError(folder.id, Log.formatThrowable(ex));
                         } finally {
                             // Free memory
-                            ((IMAPMessage) isub[j]).invalidateHeaders();
+                            isub[j] = null;
                         }
                 }
             }
@@ -3051,7 +3047,6 @@ class Core {
                         } finally {
                             // Free memory
                             isub[j] = null;
-                            //((IMAPMessage) isub[j]).invalidateHeaders();
                         }
                 }
             }
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 7de150e7d9..f6699e5576 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1409,12 +1409,6 @@ public class Log {
                             "failed to create new store connection".equals(ex.getMessage())))
                 return null;
 
-            if (ex instanceof MessagingException &&
-                    ex.getMessage() != null &&
-                    ex.getMessage().contains("invalid message sequence number"))
-                // invalid message sequence number: message is probably expunged
-                return null;
-
             if (ex instanceof MessagingException &&
                     ex.getCause() instanceof ConnectionException &&
                     ex.getCause().getMessage() != null &&