diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 1b39807eda..80936d7cc8 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -44,7 +44,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
         void onLoaded();
 
-        void onError(Context context, Throwable ex);
+        void onError(Throwable ex);
     }
 
     BoundaryCallbackMessages(LifecycleOwner owner, ViewModelBrowse _model, IBoundaryCallbackMessages intf) {
@@ -102,7 +102,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
-                                intf.onError(model.getContext(), ex);
+                                intf.onError(ex);
                             }
                         });
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 79c243f5c5..673d18ee91 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1099,7 +1099,7 @@ public class FragmentMessages extends FragmentEx {
                                     }
 
                                     @Override
-                                    public void onError(Context context, Throwable ex) {
+                                    public void onError(Throwable ex) {
                                         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
                                             new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
                                                     .setMessage(Helper.formatThrowable(ex))
@@ -1143,7 +1143,7 @@ public class FragmentMessages extends FragmentEx {
                             }
 
                             @Override
-                            public void onError(Context context, Throwable ex) {
+                            public void onError(Throwable ex) {
                                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
                                     new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
                                             .setMessage(Helper.formatThrowable(ex))
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index 85eac299a8..54ed75f24c 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -79,10 +79,6 @@ public class ViewModelBrowse extends ViewModel {
         imessages = null;
     }
 
-    Context getContext() {
-        return context;
-    }
-
     void load() throws MessagingException, IOException {
         DB db = DB.getInstance(context);
         EntityFolder folder = db.folder().getFolder(fid);