mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Keep signatures in forwarded messages

This commit is contained in:
M66B 2020-11-14 18:33:30 +01:00
parent 209e3fa00d
commit 97d8728986
1 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -3784,6 +3784,7 @@ public class FragmentCompose extends FragmentBase {
for (Element e : d.select("[x-plain=true]"))
e.removeAttr("x-plain");
if ("reply".equals(action) || "reply_all".equals(action)) {
// Remove signature separators
boolean remove_signatures = prefs.getBoolean("remove_signatures", false);
if (remove_signatures)
@ -3824,8 +3825,7 @@ public class FragmentCompose extends FragmentBase {
// Limit number of nested block quotes
boolean quote_limit = prefs.getBoolean("quote_limit", false);
if (quote_limit &&
("reply".equals(action) || "reply_all".equals(action)))
if (quote_limit)
for (Element bq : d.select("blockquote")) {
int level = 1;
Element parent = bq.parent();
@ -3837,6 +3837,7 @@ public class FragmentCompose extends FragmentBase {
if (level >= MAX_QUOTE_LEVEL)
bq.html("…");
}
}
} else {
// Selected text
d = Document.createShell("");