diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index e0fed31ddf..7477bc0c84 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -80,7 +80,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             @Override
             public void onStateChanged(LifecycleOwner source, Lifecycle.Event event) {
                 if (event == Lifecycle.Event.ON_DESTROY)
-                    new Thread(new Runnable() {
+                    executor.submit(new Runnable() {
                         @Override
                         public void run() {
                             Log.i(Helper.TAG, "Boundary close");
@@ -95,7 +95,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                 imessages = null;
                             }
                         }
-                    }).start();
+                    });
             }
         });
     }