diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 6a833d9a53..fb5cf331a8 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -82,37 +82,39 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     }
 
     private void load() {
-        if (model != null)
-            executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        searching = model.isSearching();
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                intf.onLoading();
-                            }
-                        });
-                        model.load();
-                    } catch (final Throwable ex) {
-                        Log.e("Boundary", ex);
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                intf.onError(ex);
-                            }
-                        });
-                    } finally {
-                        searching = false;
-                        handler.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                intf.onLoaded();
-                            }
-                        });
-                    }
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                if (model == null)
+                    return;
+
+                try {
+                    searching = model.isSearching();
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            intf.onLoading();
+                        }
+                    });
+                    model.load();
+                } catch (final Throwable ex) {
+                    Log.e("Boundary", ex);
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            intf.onError(ex);
+                        }
+                    });
+                } finally {
+                    searching = false;
+                    handler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            intf.onLoaded();
+                        }
+                    });
                 }
-            });
+            }
+        });
     }
 }
\ No newline at end of file