diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ee56921234..a8db572ac3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -244,6 +244,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     private static final ExecutorService executor =
             Helper.getBackgroundExecutor(2, "differ");
+    private static final ExecutorService precompute =
+            Helper.getBackgroundExecutor(1, "precompute");
 
     private static final int LARGE_MESSAGE_SIZE = 250 * 1024;
 
@@ -1816,7 +1818,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             return PrecomputedTextCompat.getTextFuture(
                                     builder,
                                     TextViewCompat.getTextMetricsParams(tvBody),
-                                    executor)
+                                    precompute)
                                     .get();
                         } catch (Throwable ex) {
                             Log.w(ex);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9d552925de..e907b6224a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -159,6 +159,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
 import java.util.regex.Pattern;
 
 import javax.activation.DataHandler;
@@ -251,6 +252,9 @@ public class FragmentCompose extends FragmentBase {
     private long[] pgpKeyIds;
     private long pgpSignKeyId;
 
+    private static final ExecutorService precompute =
+            Helper.getBackgroundExecutor(1, "precompute");
+
     static final int REDUCED_IMAGE_SIZE = 1440; // pixels
     static final int REDUCED_IMAGE_QUALITY = 90; // percent
 
@@ -4102,7 +4106,7 @@ public class FragmentCompose extends FragmentBase {
                         precomputed = PrecomputedTextCompat.getTextFuture(
                                 spannedRef,
                                 TextViewCompat.getTextMetricsParams(tvReference),
-                                null)
+                                precompute)
                                 .get();
                     } catch (Throwable ex) {
                         Log.w(ex);