diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 8ab02f3839..c9d5743404 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1406,8 +1406,13 @@ public class MessageHelper {
                     Log.e(ex);
                 }
 
-                if (part.isMimeType("text/plain"))
+                if (part.isMimeType("text/plain")) {
+                    ContentType ct = new ContentType(part.getContentType());
+                    // https://tools.ietf.org/html/rfc3676
+                    if ("flowed".equalsIgnoreCase(ct.getParameter("format")))
+                        result = result.replaceAll(" \\r?\\n", " ");
                     result = "<div>" + HtmlHelper.formatPre(result) + "</div>";
+                }
 
                 sb.append(result);
             }