diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 6307cdff48..8f6ab1788d 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -674,7 +674,9 @@ public class HtmlHelper {
                     newline();
                     tlevel = qlevel;
                 }
-                if (!nl)
+                if (!nl &&
+                        (text != null && !text.startsWith(" ")) &&
+                        (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' '))
                     sb.append(" ");
                 sb.append(text);
                 nl = false;