diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index b1d6fae151..a938e16bb8 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -260,6 +260,11 @@ public class Helper {
             }
         };
 
+        if (threads == 0) {
+            int processors = Runtime.getRuntime().availableProcessors();
+            threads = processors * 4;
+        }
+
         if (threads == 0)
             return new ThreadPoolExecutorEx(
                     name,