From f345fb8e0cce0758a07bfcfaca4b93a2cd4c317a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 18 Jul 2021 21:31:43 +0200
Subject: [PATCH] Plain text only extended reply header

---
 .../main/java/eu/faircode/email/EntityMessage.java    | 11 +++++------
 .../main/java/eu/faircode/email/MessageHelper.java    |  6 ++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 29c92fbb1d..708176341b 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -416,13 +416,12 @@ public class EntityMessage implements Serializable {
         } else
             p.text(DF.format(new Date(received)) + " " + MessageHelper.formatAddresses(from) + ":");
 
-        if (separate) {
-            Element div = document.createElement("div");
+        Element div = document.createElement("div")
+                .attr("fairemail", "reply");
+        if (separate)
             div.appendElement("hr");
-            div.appendChild(p);
-            return div;
-        } else
-            return p;
+        div.appendChild(p);
+        return div;
     }
 
     String getNotificationChannelId() {
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index f61628cedc..b4988aba0d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -41,6 +41,7 @@ import com.sun.mail.util.MessageRemovedIOException;
 
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -698,6 +699,11 @@ public class MessageHelper {
             document.select("div[fairemail=signature]").removeAttr("fairemail");
             document.select("div[fairemail=reference]").removeAttr("fairemail");
 
+            Elements reply = document.select("div[fairemail=reply]");
+            if (message.plain_only != null && message.plain_only)
+                reply.select("strong").tagName("span");
+            reply.removeAttr("fairemail");
+
             DB db = DB.getInstance(context);
             try {
                 db.beginTransaction();