diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index dce0d4cafb..9c599861d8 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -116,8 +116,11 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
         this.paused = false;
         this.args = null;
         this.stored = null;
+
         owner.getLifecycle().addObserver(this);
 
+        final Handler handler = new Handler();
+
         // Run in background thread
         executor.submit(new Runnable() {
             @Override
@@ -132,7 +135,7 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
                 }
 
                 // Run on main thread
-                new Handler(context.getMainLooper()).post(new Runnable() {
+                handler.post(new Runnable() {
                     @Override
                     public void run() {
                         deliver(args, result);