diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 4c3c5fd42f..302350a489 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -66,7 +66,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
         void onLoaded();
 
-        void onError(Throwable ex);
+        void onError(Context context, Throwable ex);
     }
 
     BoundaryCallbackMessages(Context context, LifecycleOwner owner, long folder, String search, IBoundaryCallbackMessages intf) {
@@ -177,7 +177,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     mainHandler.post(new Runnable() {
                         @Override
                         public void run() {
-                            intf.onError(ex);
+                            intf.onError(context, 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 f406e1a06e..c07e65a85e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -385,8 +385,8 @@ public class FragmentMessages extends FragmentEx {
                             }
 
                             @Override
-                            public void onError(Throwable ex) {
-                                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                            public void onError(Context context, Throwable ex) {
+                                Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
                             }
                         });