diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6ea9cc54be..21ffd17b4e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1945,7 +1945,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 args.putBoolean("show_images", show_images);
                 args.putBoolean("show_quotes", show_quotes);
                 args.putInt("zoom", zoom);
-                bodyTask.execute(context, owner, args, "message:body");
+                bodyTask.setCount(false).execute(context, owner, args, "message:body");
             }
         }
 
diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index 9e457da492..2c525f5d36 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -44,6 +44,9 @@ import java.util.concurrent.Executors;
 // Results will not be delivered to destroyed fragments
 
 public abstract class SimpleTask<T> implements LifecycleObserver {
+    private boolean count = true;
+    private int executing = 0;
+
     private static final List<SimpleTask> tasks = new ArrayList<>();
 
     private static final ExecutorService executor = Executors.newFixedThreadPool(
@@ -51,6 +54,11 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
 
     static final String ACTION_TASK_COUNT = BuildConfig.APPLICATION_ID + ".ACTION_TASK_COUNT";
 
+    public SimpleTask<T> setCount(boolean count) {
+        this.count = count;
+        return this;
+    }
+
     public void execute(Context context, LifecycleOwner owner, @NonNull Bundle args, @NonNull String name) {
         run(context, owner, args, name);
     }
@@ -75,14 +83,14 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
         final Handler handler = new Handler();
 
         // prevent garbage collection
-        int count;
         synchronized (tasks) {
             tasks.add(this);
-            count = tasks.size();
+            if (count)
+                executing++;
         }
 
         LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-        lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", count));
+        lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", executing));
 
         try {
             onPreExecute(args);
@@ -164,15 +172,15 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
     }
 
     private void cleanup(Context context) {
-        int count;
         synchronized (tasks) {
             tasks.remove(this);
-            count = tasks.size();
+            if (count)
+                executing--;
         }
 
         LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-        lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", count));
-        Log.i("Remaining tasks=" + count);
+        lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", executing));
+        Log.i("Remaining tasks=" + tasks.size());
     }
 
     protected void onPreExecute(Bundle args) {