diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d14d6c61ac..a7cb26d087 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -244,8 +244,6 @@ 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");
 
     // https://github.com/newhouse/url-tracking-stripper
     private static final List<String> PARANOID_QUERY = Collections.unmodifiableList(Arrays.asList(
@@ -1813,7 +1811,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             return PrecomputedTextCompat.getTextFuture(
                                     builder,
                                     TextViewCompat.getTextMetricsParams(tvBody),
-                                    precompute)
+                                    executor)
                                     .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 e907b6224a..9d552925de 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -159,7 +159,6 @@ 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;
@@ -252,9 +251,6 @@ 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
 
@@ -4106,7 +4102,7 @@ public class FragmentCompose extends FragmentBase {
                         precomputed = PrecomputedTextCompat.getTextFuture(
                                 spannedRef,
                                 TextViewCompat.getTextMetricsParams(tvReference),
-                                precompute)
+                                null)
                                 .get();
                     } catch (Throwable ex) {
                         Log.w(ex);