diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index ad813409a1..e12aab9fce 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -61,6 +61,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.util.PatternsCompat;
 import androidx.preference.PreferenceManager;
@@ -1993,7 +1994,11 @@ public class HtmlHelper {
                                     break;
                                 case "font-family":
                                     String face = value.toLowerCase(Locale.ROOT);
-                                    ssb.setSpan(new TypefaceSpan(face), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                    if (BuildConfig.DEBUG && "fantasy".equals(face)) {
+                                        Typeface typeface = ResourcesCompat.getFont(context, R.font.fantasy);
+                                        ssb.setSpan(new CustomTypefaceSpan(face, typeface), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                    } else
+                                        ssb.setSpan(new TypefaceSpan(face), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                                     break;
                                 case "text-decoration":
                                     if ("line-through".equals(value))
@@ -2334,4 +2339,34 @@ public class HtmlHelper {
             paint.setStrokeWidth(s);
         }
     }
+
+    public static class CustomTypefaceSpan extends TypefaceSpan {
+        private final Typeface newType;
+
+        public CustomTypefaceSpan(String family, Typeface type) {
+            super(family);
+            newType = type;
+        }
+
+        @Override
+        public void updateDrawState(TextPaint ds) {
+            applyCustomTypeFace(ds, newType);
+        }
+
+        @Override
+        public void updateMeasureState(TextPaint paint) {
+            applyCustomTypeFace(paint, newType);
+        }
+
+        private static void applyCustomTypeFace(Paint paint, Typeface tf) {
+            Typeface old = paint.getTypeface();
+            int oldStyle = (old == null ? 0 : old.getStyle());
+            int fake = oldStyle & ~tf.getStyle();
+            if ((fake & Typeface.BOLD) != 0)
+                paint.setFakeBoldText(true);
+            if ((fake & Typeface.ITALIC) != 0)
+                paint.setTextSkewX(-0.25f);
+            paint.setTypeface(tf);
+        }
+    }
 }
diff --git a/app/src/main/res/font/endor.ttf b/app/src/main/res/font/endor.ttf
new file mode 100644
index 0000000000..3a7274f845
Binary files /dev/null and b/app/src/main/res/font/endor.ttf differ
diff --git a/app/src/main/res/font/fantasy.xml b/app/src/main/res/font/fantasy.xml
new file mode 100644
index 0000000000..97539640ee
--- /dev/null
+++ b/app/src/main/res/font/fantasy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!-- https://developer.android.com/guide/topics/ui/look-and-feel/fonts-in-xml -->
+    <font
+        app:font="@font/endor"
+        app:fontStyle="normal"
+        app:fontWeight="400">
+        <!-- https://www.1001freefonts.com/endor.font -->
+    </font>
+</font-family>
\ No newline at end of file