diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index d19eef07..4b070eb5 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -50,6 +50,14 @@ public class ViewModelBrowse extends ViewModel {
         this.loaded = 0;
     }
 
+    @Override
+    protected void onCleared() {
+        context = null;
+        istore = null;
+        ifolder = null;
+        imessages = null;
+    }
+
     Context getContext() {
         return context;
     }
@@ -158,6 +166,7 @@ public class ViewModelBrowse extends ViewModel {
         } catch (Throwable ex) {
             Log.e(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
         } finally {
+            context = null;
             istore = null;
             ifolder = null;
             imessages = null;
diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 148b7190..b9d55030 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -10,6 +10,11 @@ public class ViewModelMessages extends ViewModel {
         this.messages = messages;
     }
 
+    @Override
+    protected void onCleared() {
+        messages = null;
+    }
+
     Target[] getPrevNext(String thread) {
         if (messages == null)
             return new Target[]{null, null};