From 38398fefdcd881e1d44dc49b4367ef9c4cabe372 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 27 Jan 2020 16:35:50 +0100
Subject: [PATCH] Move signature below replied/forwarded message

---
 .../eu/faircode/email/FragmentCompose.java    | 19 ++++++++++---------
 .../java/eu/faircode/email/MessageHelper.java |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f3e87d2fa2..c2b29af889 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3178,9 +3178,9 @@ public class FragmentCompose extends FragmentBase {
                         File file = data.draft.getFile(context);
 
                         Document doc = JsoupEx.parse(Helper.readText(file));
-                        doc.select("div[fairemail=signature]").remove();
                         Elements ref = doc.select("div[fairemail=reference]");
                         ref.remove();
+                        doc.select("div[fairemail=signature]").remove();
 
                         File refFile = data.draft.getRefFile(context);
                         if (refFile.exists()) {
@@ -3190,14 +3190,14 @@ public class FragmentCompose extends FragmentBase {
 
                         Document document = HtmlHelper.sanitize(context, doc.html(), true, false);
 
+                        for (Element e : ref)
+                            document.body().appendChild(e);
+
                         if (data.draft.identity != null) {
                             EntityIdentity identity = db.identity().getIdentity(data.draft.identity);
                             addSignature(context, document, data.draft, identity);
                         }
 
-                        for (Element e : ref)
-                            document.body().appendChild(e);
-
                         String html = JsoupEx.parse(document.html()).html();
                         Helper.writeText(file, html);
                         Helper.writeText(data.draft.getFile(context, data.draft.revision), html);
@@ -3579,26 +3579,26 @@ public class FragmentCompose extends FragmentBase {
                             (extras != null && extras.containsKey("html"))) {
                         dirty = true;
 
-                        doc.select("div[fairemail=signature]").remove();
                         Elements ref = doc.select("div[fairemail=reference]");
                         ref.remove();
+                        doc.select("div[fairemail=signature]").remove();
 
                         // Get saved body
                         Document d;
                         if (extras != null && extras.containsKey("html")) {
                             // Save current revision
                             Document c = JsoupEx.parse(body);
-                            addSignature(context, c, draft, identity);
                             for (Element e : ref)
                                 c.body().appendChild(e);
+                            addSignature(context, c, draft, identity);
                             Helper.writeText(draft.getFile(context, draft.revision), c.html());
 
                             d = JsoupEx.parse(extras.getString("html"));
                         } else {
                             d = JsoupEx.parse(body);
-                            addSignature(context, d, draft, identity);
                             for (Element e : ref)
                                 d.body().appendChild(e);
+                            addSignature(context, d, draft, identity);
                         }
 
                         body = d.html();
@@ -3679,8 +3679,9 @@ public class FragmentCompose extends FragmentBase {
                                 for (String text : Helper.getStrings(context, R.string.title_attachment_keywords))
                                     keywords.addAll(Arrays.asList(text.split(",")));
 
-                                d.select("div[fairemail=signature]").remove();
                                 d.select("div[fairemail=reference]").remove();
+                                d.select("div[fairemail=signature]").remove();
+
                                 String text = d.text();
                                 for (String keyword : keywords)
                                     if (text.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) {
@@ -3954,9 +3955,9 @@ public class FragmentCompose extends FragmentBase {
                     throw new IllegalArgumentException(context.getString(R.string.title_no_body));
 
                 Document doc = JsoupEx.parse(Helper.readText(draft.getFile(context)));
-                doc.select("div[fairemail=signature]").remove();
                 Elements ref = doc.select("div[fairemail=reference]");
                 ref.remove();
+                doc.select("div[fairemail=signature]").remove();
 
                 Spanned spannedBody = HtmlHelper.fromHtml(doc.html(), new Html.ImageGetter() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index db1e0ba8dd..243368bb99 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -484,7 +484,7 @@ public class MessageHelper {
 
         // When sending message
         if (identity != null)
-            document.select("div[fairemail=signature],div[fairemail=reference]").removeAttr("fairemail");
+            document.select("div[fairemail=reference],div[fairemail=signature]").removeAttr("fairemail");
 
         // multipart/mixed
         //   multipart/related