diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index af41362394..24b6777bc6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1295,6 +1295,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (pgpService != null && pgpService.isBound())
             pgpService.unbindFromService();
 
+        kv.clear();
+        values.clear();
+        sizes.clear();
+        heights.clear();
+        positions.clear();
+        attachments.clear();
+        accountSwipes.clear();
+
         super.onDestroyView();
     }