From 8c8ac653e71ce588a9470a3c76c4134442f813f5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 11 Apr 2021 09:22:24 +0200
Subject: [PATCH] Added alternative re/fwd texts

---
 .../main/java/eu/faircode/email/FragmentCompose.java   | 10 ++++++++--
 app/src/main/res/values/strings.xml                    |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b1f8420c60..d8ca32748f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3819,9 +3819,12 @@ public class FragmentCompose extends FragmentBase {
                         // Subject
                         String subject = (ref.subject == null ? "" : ref.subject);
                         if ("reply".equals(action) || "reply_all".equals(action)) {
-                            if (prefix_once)
+                            if (prefix_once) {
                                 for (String re : Helper.getStrings(context, ref.language, R.string.title_subject_reply, ""))
                                     subject = unprefix(subject, re);
+                                for (String re : Helper.getStrings(context, ref.language, R.string.title_subject_reply_alt, ""))
+                                    subject = unprefix(subject, re);
+                            }
                             data.draft.subject = Helper.getString(context, ref.language, R.string.title_subject_reply, subject);
 
                             String t = args.getString("text");
@@ -3836,9 +3839,12 @@ public class FragmentCompose extends FragmentBase {
                                 document.body().appendChild(div);
                             }
                         } else if ("forward".equals(action)) {
-                            if (prefix_once)
+                            if (prefix_once) {
                                 for (String fwd : Helper.getStrings(context, ref.language, R.string.title_subject_forward, ""))
                                     subject = unprefix(subject, fwd);
+                                for (String fwd : Helper.getStrings(context, ref.language, R.string.title_subject_forward_alt, ""))
+                                    subject = unprefix(subject, fwd);
+                            }
                             data.draft.subject = Helper.getString(context, ref.language, R.string.title_subject_forward, subject);
                         } else if ("editasnew".equals(action)) {
                             if (ref.from != null && ref.from.length == 1) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 381d764912..85dfdd7b06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -863,6 +863,9 @@
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
 
+    <string name="title_subject_reply_alt">Re: %1$s</string>
+    <string name="title_subject_forward_alt">Fwd: %1$s</string>
+
     <string name="title_seen">Mark read</string>
     <string name="title_unseen">Mark unread</string>
     <string name="title_toggle_seen">Toggle read</string>