diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 76d0ea8ffd..9aa4477090 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2836,6 +2836,13 @@ public class HtmlHelper {
 
         SpannableStringBuilder ssb = fromDocument(context, d, null, null);
 
+        for (UnderlineSpan span : ssb.getSpans(0, ssb.length(), UnderlineSpan.class)) {
+            int start = ssb.getSpanStart(span);
+            int end = ssb.getSpanEnd(span);
+            ssb.insert(end, "_");
+            ssb.insert(start, "_");
+        }
+
         for (StyleSpan span : ssb.getSpans(0, ssb.length(), StyleSpan.class)) {
             int start = ssb.getSpanStart(span);
             int end = ssb.getSpanEnd(span);
@@ -2848,13 +2855,6 @@ public class HtmlHelper {
             }
         }
 
-        for (UnderlineSpan span : ssb.getSpans(0, ssb.length(), UnderlineSpan.class)) {
-            int start = ssb.getSpanStart(span);
-            int end = ssb.getSpanEnd(span);
-            ssb.insert(end, "_");
-            ssb.insert(start, "_");
-        }
-
         for (URLSpan span : ssb.getSpans(0, ssb.length(), URLSpan.class)) {
             String url = span.getURL();
             if (TextUtils.isEmpty(url))