diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1452adc610..1a9b68c30c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -867,7 +867,7 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
-        etBody.setTypeface(Typeface.create(compose_font, Typeface.NORMAL));
+        etBody.setTypeface(StyleHelper.getTypeface(compose_font, getContext()));
         tvReference.setTypeface(monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT);
 
         tvReference.setMovementMethod(new ArrowKeyMovementMethod() {
diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index da23f138d1..5466e1480c 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -769,12 +769,22 @@ public class StyleHelper {
         String face = family.toLowerCase(Locale.ROOT);
         if ("fairemail".equals(face)) {
             Typeface typeface = ResourcesCompat.getFont(context, R.font.fantasy);
-            return new CustomTypefaceSpan(face, typeface);
+            return new CustomTypefaceSpan(family, typeface);
         } else if (face.contains("comic sans")) {
             Typeface typeface = ResourcesCompat.getFont(context, R.font.opendyslexic);
-            return new CustomTypefaceSpan(face, typeface);
+            return new CustomTypefaceSpan(family, typeface);
         } else
-            return new TypefaceSpan(face);
+            return new TypefaceSpan(family);
+    }
+
+    static Typeface getTypeface(String family, Context context) {
+        String face = family.toLowerCase(Locale.ROOT);
+        if ("fairemail".equals(face))
+            return ResourcesCompat.getFont(context, R.font.fantasy);
+        else if (face.contains("comic sans"))
+            return ResourcesCompat.getFont(context, R.font.opendyslexic);
+        else
+            return Typeface.create(family, Typeface.NORMAL);
     }
 
     //TextUtils.dumpSpans(text, new LogPrinter(android.util.Log.INFO, "FairEmail"), "afterTextChanged ");