diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 0abded5fc2..2d55667bef 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -145,9 +145,14 @@ public class HtmlHelper {
         }
 
         // Pre formatted text
-        for (Element code : document.select("pre")) {
-            code.html(code.html().replaceAll("\\r?\\n", "<br>"));
-            code.tagName("div");
+        for (Element pre : document.select("pre")) {
+            String[] lines = pre.html().split("\\r?\\n");
+            for (int i = 0; i < lines.length; i++) {
+                if (!"-- ".equals(lines[i]))
+                    lines[i] = lines[i].replace(" ", "&nbsp;");
+            }
+            pre.html(TextUtils.join("<br>", lines));
+            pre.tagName("div");
         }
 
         // Code
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 12cd93de5c..7150199d2e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -862,11 +862,8 @@ public class MessageHelper {
             // Prevent Jsoup throwing an exception
             result = result.replace("\0", "");
 
-            if (part.isMimeType("text/plain")) {
-                result = TextUtils.htmlEncode(result);
-                result = result.replaceAll("\\r?\\n", "<br>");
-                result = "<span>" + result + "</span>";
-            }
+            if (part.isMimeType("text/plain"))
+                result = "<pre>" + TextUtils.htmlEncode(result) + "</pre>";
 
             return result;
         }