From 94e1b9bc5eb6c78543f29334966589e859c13bba Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 7 Mar 2020 08:41:43 +0100
Subject: [PATCH] Support for format flowed

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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);
             }