From 45657d026e5d9867ff165f7a6a5b37263086723c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 11 Nov 2018 13:31:43 +0000
Subject: [PATCH] Added compose account spinner

---
 .../eu/faircode/email/FragmentCompose.java    | 214 +++++++++++++-----
 app/src/main/res/layout/fragment_compose.xml  |  17 +-
 app/src/main/res/layout/spinner_item1.xml     |  17 ++
 app/src/main/res/layout/spinner_item2.xml     |   4 +-
 app/src/main/res/values-af/strings.xml        |   5 +-
 app/src/main/res/values-ar-rBH/strings.xml    |   5 +-
 app/src/main/res/values-ar-rEG/strings.xml    |   5 +-
 app/src/main/res/values-ar-rSA/strings.xml    |   5 +-
 app/src/main/res/values-ar-rYE/strings.xml    |   5 +-
 app/src/main/res/values-ar/strings.xml        |   5 +-
 app/src/main/res/values-az/strings.xml        |   5 +-
 app/src/main/res/values-ca/strings.xml        |   5 +-
 app/src/main/res/values-cs/strings.xml        |   5 +-
 app/src/main/res/values-da/strings.xml        |   5 +-
 app/src/main/res/values-de/strings.xml        |   3 +-
 app/src/main/res/values-el/strings.xml        |   5 +-
 app/src/main/res/values-en/strings.xml        |   5 +-
 app/src/main/res/values-es-rES/strings.xml    |   5 +-
 app/src/main/res/values-fa/strings.xml        |   5 +-
 app/src/main/res/values-fi/strings.xml        |   5 +-
 app/src/main/res/values-fr/strings.xml        |   3 +-
 app/src/main/res/values-he/strings.xml        |   5 +-
 app/src/main/res/values-hu/strings.xml        |   5 +-
 app/src/main/res/values-it/strings.xml        |   5 +-
 app/src/main/res/values-iw/strings.xml        |   5 +-
 app/src/main/res/values-ja/strings.xml        |   5 +-
 app/src/main/res/values-ko/strings.xml        |   5 +-
 app/src/main/res/values-nb/strings.xml        |   5 +-
 app/src/main/res/values-nl/strings.xml        |   3 +-
 app/src/main/res/values-no/strings.xml        |   5 +-
 app/src/main/res/values-pl/strings.xml        |   5 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   5 +-
 app/src/main/res/values-pt-rPT/strings.xml    |   5 +-
 app/src/main/res/values-ro/strings.xml        |   5 +-
 app/src/main/res/values-ru/strings.xml        |   5 +-
 app/src/main/res/values-sr/strings.xml        |   5 +-
 app/src/main/res/values-sv-rSE/strings.xml    |   5 +-
 app/src/main/res/values-tr/strings.xml        |   5 +-
 app/src/main/res/values-uk/strings.xml        |   5 +-
 app/src/main/res/values-vi/strings.xml        |   5 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   5 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   5 +-
 app/src/main/res/values/strings.xml           |   2 +-
 43 files changed, 302 insertions(+), 136 deletions(-)
 create mode 100644 app/src/main/res/layout/spinner_item1.xml

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9c82680a78..bca5b622d5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -110,7 +110,8 @@ import static android.app.Activity.RESULT_OK;
 
 public class FragmentCompose extends FragmentEx {
     private ViewGroup view;
-    private Spinner spFrom;
+    private Spinner spAccount;
+    private Spinner spIdentity;
     private ImageView ivIdentityAdd;
     private TextView tvExtraPrefix;
     private EditText etExtra;
@@ -145,7 +146,8 @@ public class FragmentCompose extends FragmentEx {
         view = (ViewGroup) inflater.inflate(R.layout.fragment_compose, container, false);
 
         // Get controls
-        spFrom = view.findViewById(R.id.spFrom);
+        spAccount = view.findViewById(R.id.spAccount);
+        spIdentity = view.findViewById(R.id.spIdentity);
         ivIdentityAdd = view.findViewById(R.id.ivIdentityAdd);
         tvExtraPrefix = view.findViewById(R.id.tvExtraPrefix);
         etExtra = view.findViewById(R.id.etExtra);
@@ -168,7 +170,7 @@ public class FragmentCompose extends FragmentEx {
         grpAttachments = view.findViewById(R.id.grpAttachments);
 
         // Wire controls
-        spFrom.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        spIdentity.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 EntityIdentity identity = (EntityIdentity) parent.getAdapter().getItem(position);
@@ -272,6 +274,7 @@ public class FragmentCompose extends FragmentEx {
         setHasOptionsMenu(true);
 
         // Initialize
+        setSubtitle(R.string.title_compose);
         tvExtraPrefix.setText(null);
         tvExtraSuffix.setText(null);
 
@@ -285,7 +288,6 @@ public class FragmentCompose extends FragmentEx {
         pbWait.setVisibility(View.VISIBLE);
 
         getActivity().invalidateOptionsMenu();
-        spFrom.setEnabled(false);
         Helper.setViewsEnabled(view, false);
 
         if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_CONTACTS)
@@ -881,11 +883,12 @@ public class FragmentCompose extends FragmentEx {
         Helper.setViewsEnabled(view, false);
         getActivity().invalidateOptionsMenu();
 
-        EntityIdentity identity = (EntityIdentity) spFrom.getSelectedItem();
+        EntityIdentity identity = (EntityIdentity) spIdentity.getSelectedItem();
 
         Bundle args = new Bundle();
         args.putLong("id", working);
         args.putInt("action", action);
+        args.putLong("account", identity == null ? -1 : identity.account);
         args.putLong("identity", identity == null ? -1 : identity.id);
         args.putString("extra", etExtra.getText().toString());
         args.putString("to", etTo.getText().toString());
@@ -998,7 +1001,6 @@ public class FragmentCompose extends FragmentEx {
     }
 
     private SimpleTask<DraftAccount> draftLoader = new SimpleTask<DraftAccount>() {
-
         @Override
         protected DraftAccount onLoad(Context context, Bundle args) throws IOException {
             String action = args.getString("action");
@@ -1249,8 +1251,6 @@ public class FragmentCompose extends FragmentEx {
             final String action = getArguments().getString("action");
             Log.i(Helper.TAG, "Loaded draft id=" + result.draft.id + " action=" + action);
 
-            setSubtitle(getString(R.string.title_compose, result.account.name));
-
             etExtra.setText(result.draft.extra);
             etTo.setText(MessageHelper.getFormattedAddresses(result.draft.to, true));
             etCc.setText(MessageHelper.getFormattedAddresses(result.draft.cc, true));
@@ -1297,64 +1297,107 @@ public class FragmentCompose extends FragmentEx {
             edit_bar.setVisibility(View.VISIBLE);
             bottom_navigation.setVisibility(View.VISIBLE);
 
-            DB db = DB.getInstance(getContext());
+            final DB db = DB.getInstance(getContext());
 
-            db.identity().liveIdentities(result.draft.account, true).removeObservers(getViewLifecycleOwner());
-            db.identity().liveIdentities(result.draft.account, true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() {
+            db.account().liveAccounts(true).removeObservers(getViewLifecycleOwner());
+            db.account().liveAccounts(true).observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {
                 @Override
-                public void onChanged(@Nullable List<EntityIdentity> identities) {
-                    if (identities == null)
-                        identities = new ArrayList<>();
+                public void onChanged(List<EntityAccount> accounts) {
+                    if (accounts == null)
+                        accounts = new ArrayList<>();
 
-                    Log.i(Helper.TAG, "Set identities=" + identities.size());
+                    Log.i(Helper.TAG, "Set accounts=" + accounts.size());
 
-                    // Sort identities
-                    Collections.sort(identities, new Comparator<EntityIdentity>() {
+                    // Sort accounts
+                    Collections.sort(accounts, new Comparator<EntityAccount>() {
                         @Override
-                        public int compare(EntityIdentity i1, EntityIdentity i2) {
-                            return i1.name.compareTo(i2.name);
+                        public int compare(EntityAccount a1, EntityAccount a2) {
+                            return a1.name.compareTo(a2.name);
                         }
                     });
 
-                    // Show identities
-                    IdentityAdapter adapter = new IdentityAdapter(getContext(), identities);
+                    // Show accounts
+                    AccountAdapter adapter = new AccountAdapter(getContext(), accounts);
                     adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                    spFrom.setAdapter(adapter);
+                    spAccount.setAdapter(adapter);
 
-                    boolean found = false;
-
-                    // Select earlier selected identity
-                    if (result.draft.identity != null)
-                        for (int pos = 0; pos < identities.size(); pos++) {
-                            if (identities.get(pos).id.equals(result.draft.identity)) {
-                                spFrom.setSelection(pos);
-                                found = true;
-                                break;
-                            }
+                    spAccount.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                        @Override
+                        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                            EntityAccount account = (EntityAccount) parent.getAdapter().getItem(position);
+
+                            db.identity().liveIdentities(account.id, true).removeObservers(getViewLifecycleOwner());
+                            db.identity().liveIdentities(account.id, true).observe(getViewLifecycleOwner(), new Observer<List<EntityIdentity>>() {
+                                @Override
+                                public void onChanged(@Nullable List<EntityIdentity> identities) {
+                                    if (identities == null)
+                                        identities = new ArrayList<>();
+
+                                    Log.i(Helper.TAG, "Set identities=" + identities.size());
+
+                                    // Sort identities
+                                    Collections.sort(identities, new Comparator<EntityIdentity>() {
+                                        @Override
+                                        public int compare(EntityIdentity i1, EntityIdentity i2) {
+                                            return i1.name.compareTo(i2.name);
+                                        }
+                                    });
+
+                                    // Show identities
+                                    IdentityAdapter adapter = new IdentityAdapter(getContext(), identities);
+                                    adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                                    spIdentity.setAdapter(adapter);
+
+                                    boolean found = false;
+
+                                    // Select earlier selected identity
+                                    if (result.draft.identity != null)
+                                        for (int pos = 0; pos < identities.size(); pos++) {
+                                            if (identities.get(pos).id.equals(result.draft.identity)) {
+                                                spIdentity.setSelection(pos);
+                                                found = true;
+                                                break;
+                                            }
+                                        }
+
+                                    // Select identity matching from address
+                                    if (!found && result.draft.from != null && result.draft.from.length > 0) {
+                                        String from = Helper.canonicalAddress(((InternetAddress) result.draft.from[0]).getAddress());
+                                        for (int pos = 0; pos < identities.size(); pos++) {
+                                            String email = Helper.canonicalAddress(identities.get(pos).email);
+                                            if (email.equals(from)) {
+                                                spIdentity.setSelection(pos);
+                                                found = true;
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    // Select primary identity
+                                    if (!found)
+                                        for (int pos = 0; pos < identities.size(); pos++)
+                                            if (identities.get(pos).primary) {
+                                                spIdentity.setSelection(pos);
+                                                break;
+                                            }
+                                }
+                            });
                         }
 
-                    // Select identity matching from address
-                    if (!found && result.draft.from != null && result.draft.from.length > 0) {
-                        String from = Helper.canonicalAddress(((InternetAddress) result.draft.from[0]).getAddress());
-                        for (int pos = 0; pos < identities.size(); pos++) {
-                            String email = Helper.canonicalAddress(identities.get(pos).email);
-                            if (email.equals(from)) {
-                                spFrom.setSelection(pos);
-                                found = true;
-                                break;
-                            }
+                        @Override
+                        public void onNothingSelected(AdapterView<?> parent) {
+                            IdentityAdapter adapter = new IdentityAdapter(getContext(), new ArrayList<EntityIdentity>());
+                            adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                            spIdentity.setAdapter(adapter);
                         }
-                    }
-
-                    // Select primary identity
-                    if (!found)
-                        for (int pos = 0; pos < identities.size(); pos++)
-                            if (identities.get(pos).primary) {
-                                spFrom.setSelection(pos);
-                                break;
-                            }
+                    });
 
-                    spFrom.setEnabled(true);
+                    // Select account
+                    for (int pos = 0; pos < accounts.size(); pos++)
+                        if (accounts.get(pos).id == result.draft.account) {
+                            spAccount.setSelection(pos);
+                            break;
+                        }
                 }
             });
 
@@ -1394,6 +1437,7 @@ public class FragmentCompose extends FragmentEx {
             // Get data
             long id = args.getLong("id");
             int action = args.getInt("action");
+            long aid = args.getLong("account");
             long iid = args.getLong("identity");
             String extra = args.getString("extra");
             String to = args.getString("to");
@@ -1418,6 +1462,31 @@ public class FragmentCompose extends FragmentEx {
 
                 Log.i(Helper.TAG, "Load action id=" + draft.id + " action=" + action);
 
+                // Move draft to new account
+                if (draft.account != aid) {
+                    long uid = draft.uid;
+                    String msgid = draft.msgid;
+
+                    draft.uid = null;
+                    draft.msgid = null;
+                    db.message().updateMessage(draft);
+
+                    draft.id = null;
+                    draft.uid = uid;
+                    draft.msgid = msgid;
+                    draft.content = false;
+                    draft.ui_hide = true;
+                    draft.id = db.message().insertMessage(draft);
+                    EntityOperation.queue(db, draft, EntityOperation.DELETE);
+
+                    draft.id = id;
+                    draft.account = aid;
+                    draft.folder = db.folder().getFolderByType(aid, EntityFolder.DRAFTS).id;
+                    draft.content = true;
+                    draft.ui_hide = false;
+                    EntityOperation.queue(db, draft, EntityOperation.ADD);
+                }
+
                 // Convert data
                 InternetAddress afrom[] = (identity == null ? null : new InternetAddress[]{new InternetAddress(identity.email, identity.name)});
                 InternetAddress ato[] = (TextUtils.isEmpty(to) ? null : InternetAddress.parse(to));
@@ -1593,6 +1662,39 @@ public class FragmentCompose extends FragmentEx {
         EntityAccount account;
     }
 
+    public class AccountAdapter extends ArrayAdapter<EntityAccount> {
+        private Context context;
+        private List<EntityAccount> accounts;
+
+        AccountAdapter(@NonNull Context context, List<EntityAccount> accounts) {
+            super(context, 0, accounts);
+            this.context = context;
+            this.accounts = accounts;
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            return getLayout(position, convertView, parent);
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            return getLayout(position, convertView, parent);
+        }
+
+        View getLayout(int position, View convertView, ViewGroup parent) {
+            View view = LayoutInflater.from(context).inflate(R.layout.spinner_item1, parent, false);
+
+            EntityAccount account = accounts.get(position);
+
+            TextView text1 = view.findViewById(android.R.id.text1);
+            text1.setText(account.name);
+
+            return view;
+        }
+    }
+
     public class IdentityAdapter extends ArrayAdapter<EntityIdentity> {
         private Context context;
         private List<EntityIdentity> identities;
@@ -1619,11 +1721,11 @@ public class FragmentCompose extends FragmentEx {
 
             EntityIdentity identity = identities.get(position);
 
-            TextView name = view.findViewById(android.R.id.text1);
-            name.setText(identity.name);
+            TextView text1 = view.findViewById(android.R.id.text1);
+            text1.setText(identity.name);
 
-            TextView email = view.findViewById(android.R.id.text2);
-            email.setText(identity.email);
+            TextView text2 = view.findViewById(android.R.id.text2);
+            text2.setText(identity.email);
 
             return view;
         }
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 83eaeaa664..eb0047da69 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -16,7 +16,7 @@
             android:layout_height="wrap_content">
 
             <Spinner
-                android:id="@+id/spFrom"
+                android:id="@+id/spAccount"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
@@ -24,6 +24,15 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <Spinner
+                android:id="@+id/spIdentity"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                app:layout_constraintEnd_toStartOf="@+id/ivIdentityAdd"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/spAccount" />
+
             <ImageView
                 android:id="@+id/ivIdentityAdd"
                 android:layout_width="24dp"
@@ -31,9 +40,9 @@
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
                 android:src="@drawable/baseline_person_add_24"
-                app:layout_constraintBottom_toBottomOf="@id/spFrom"
+                app:layout_constraintBottom_toBottomOf="@id/spIdentity"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/spFrom" />
+                app:layout_constraintTop_toTopOf="@id/spIdentity" />
 
             <TextView
                 android:id="@+id/tvExtraPrefix"
@@ -53,7 +62,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/tvExtraSuffix"
                 app:layout_constraintStart_toEndOf="@id/tvExtraPrefix"
-                app:layout_constraintTop_toBottomOf="@id/spFrom" />
+                app:layout_constraintTop_toBottomOf="@id/spIdentity" />
 
             <TextView
                 android:id="@+id/tvExtraSuffix"
diff --git a/app/src/main/res/layout/spinner_item1.xml b/app/src/main/res/layout/spinner_item1.xml
new file mode 100644
index 0000000000..5b92a57b5d
--- /dev/null
+++ b/app/src/main/res/layout/spinner_item1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_item2.xml b/app/src/main/res/layout/spinner_item2.xml
index a8c64cdbda..ec5062ecaa 100644
--- a/app/src/main/res/layout/spinner_item2.xml
+++ b/app/src/main/res/layout/spinner_item2.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeightSmall"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@android:id/text1"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 4cd5772c4f..6142996eb9 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -214,8 +214,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">من:</string>
     <string name="title_to">إلى:</string>
     <string name="title_reply_to">الرد على:</string>
@@ -286,7 +287,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 4cd5772c4f..6142996eb9 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -214,8 +214,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">من:</string>
     <string name="title_to">إلى:</string>
     <string name="title_reply_to">الرد على:</string>
@@ -286,7 +287,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 4cd5772c4f..6142996eb9 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -214,8 +214,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">من:</string>
     <string name="title_to">إلى:</string>
     <string name="title_reply_to">الرد على:</string>
@@ -286,7 +287,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 4cd5772c4f..6142996eb9 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -214,8 +214,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">من:</string>
     <string name="title_to">إلى:</string>
     <string name="title_reply_to">الرد على:</string>
@@ -286,7 +287,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4cd5772c4f..6142996eb9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -214,8 +214,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">من:</string>
     <string name="title_to">إلى:</string>
     <string name="title_reply_to">الرد على:</string>
@@ -286,7 +287,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 2227331aa6..af14362643 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Qaralama silinsin?</string>
     <string name="title_ask_spam">Mesajı spam kimi bildirilsin?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Düzəlt</string>
-    <string name="title_compose">Yaz %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Göndərən:</string>
     <string name="title_to">Alıcı:</string>
     <string name="title_reply_to">Cavabla:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Sualınız və ya probleminiz varsa, zəhmət olmasa kömək almaq üçün dəstək menyusundan faydalanın</string>
     <string name="title_hint_message_actions">Tullantı üçün sola; arxiv üçün sağa sürüşdür (əgər varsa)</string>
     <string name="title_hint_message_selection">Bir neçə mesajı seçməyə başlamaq üçün bir mesaja uzun basın</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Bağlantını aç</string>
     <string name="title_updated">%1$s versiyası üçün yeniləmə mövcuddur</string>
     <string name="title_issue">Sualınız və ya probleminiz var?</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index a29ec77b14..1beea2e264 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Voleu rebutjar l\'esborrany?</string>
     <string name="title_ask_spam">Qualificar el missatge com correu brossa?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">De:</string>
     <string name="title_to">A:</string>
     <string name="title_reply_to">Respondre a:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Si tens algun problema o pregunta, per favor utilitza el menú d\'ajuda per obtenir assistència</string>
     <string name="title_hint_message_actions">Llisca cap a l\'esquerra per enviar a la paperera; o bé cap a la dreta per arxivar (si és possible)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Obrir l\'enllaç</string>
     <string name="title_updated">Hi ha disponible una actualització a la versió %1$s</string>
     <string name="title_issue">Tens alguna pregunta o problema?</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5ce3b7470f..afe10ee397 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index f688fffb40..f7faaa629f 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Rapportér meddelelse som spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Fra:</string>
     <string name="title_to">Til:</string>
     <string name="title_reply_to">Svar til:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 501dc25b20..e13a7ab3a8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Antwortvorlage unwiderruflich löschen?</string>
     <string name="title_ask_discard">Entwurf verwerfen?</string>
     <string name="title_ask_spam">Nachricht als Spam melden?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Problem beheben</string>
-    <string name="title_compose">Erstelle %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Von:</string>
     <string name="title_to">An:</string>
     <string name="title_reply_to">Antworten an:</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2b42fd9be0..556662d755 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">¿Eliminar plantilla de respuesta permanentemente?</string>
     <string name="title_ask_discard">¿Descartar el borrador?</string>
     <string name="title_ask_spam">¿Reportar mensaje como spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Reparar</string>
-    <string name="title_compose">Redactar %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">De:</string>
     <string name="title_to">A:</string>
     <string name="title_reply_to">Responder a:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Si tiene una pregunta o problema, por favor use el menú de Preguntas Frecuentes para obtener ayuda</string>
     <string name="title_hint_message_actions">Deslice a la izquierda para eliminar; deslice a la derecha para archivar (si está disponible)</string>
     <string name="title_hint_message_selection">Mantenga presionado un mensaje para empezar a seleccionar múltiples mensajes</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Abrir enlace</string>
     <string name="title_updated">Hay una actualización a la version %1$s disponible</string>
     <string name="title_issue">¿Tiene una pregunta o problema?</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 8266eea86f..8aa22ded15 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9f9951446c..cdfc977a0d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Supprimer définitivement le modèle de réponse ?</string>
     <string name="title_ask_discard">Supprimer le brouillon ?</string>
     <string name="title_ask_spam">Signaler le message comme spam ?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Corriger</string>
-    <string name="title_compose">Composer %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">De :</string>
     <string name="title_to">À :</string>
     <string name="title_reply_to">Répondre à :</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 694af5a3c9..abbed358bb 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b445ede8f7..6c5158d39f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c42679d594..5df1e3c920 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Eliminare la bozza?</string>
     <string name="title_ask_spam">Segnalare il messaggio come posta indesiderata?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Correggi</string>
-    <string name="title_compose">Componi %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Da:</string>
     <string name="title_to">A:</string>
     <string name="title_reply_to">Rispondi a:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Se hai una domanda o un problema, usa il menu di supporto per ottenere aiuto</string>
     <string name="title_hint_message_actions">Scorri a sinistra per cestinare; scorri a destra per archiviare (se disponibile)</string>
     <string name="title_hint_message_selection">Premi a lungo un messaggio per iniziare a selezionare più messaggi</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Apri collegamento</string>
     <string name="title_updated">È disponibile un aggiornamento alla versione %1$s</string>
     <string name="title_issue">Hai una domanda o un problema?</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 694af5a3c9..abbed358bb 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 20970734a7..09789ca5a7 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -261,7 +262,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 20970734a7..09789ca5a7 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -261,7 +262,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 486fe3560c..d1840974aa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Verwijder antwoordsjabloon permanent?</string>
     <string name="title_ask_discard">Concept weggooien?</string>
     <string name="title_ask_spam">Rapporteren als spam?</string>
+    <string name="title_ask_show_html">Het originele bericht tonen kan privacy gevoelige informatie lekken</string>
     <string name="title_fix">Oplossen</string>
-    <string name="title_compose">Opstellen %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Van:</string>
     <string name="title_to">Aan:</string>
     <string name="title_reply_to">Antwoord op:</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 71c2960b5a..5f0efa4ead 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Odrzucić szkic?</string>
     <string name="title_ask_spam">Zgłosić wiadomość jako spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Popraw</string>
-    <string name="title_compose">Napisz %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Od:</string>
     <string name="title_to">Do:</string>
     <string name="title_reply_to">Odpisz do:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">Jeśli masz pytanie lub problem, użyj menu Pomoc, aby uzyskać pomoc</string>
     <string name="title_hint_message_actions">Przesuń w lewo do kosza; przesuń w prawo do archiwum (jeśli dostępne)</string>
     <string name="title_hint_message_selection">Przytrzymaj wiadomość, aby zacząć zaznaczanie wielu wiadomości</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Otwórz link</string>
     <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
     <string name="title_issue">Masz pytanie lub problem?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ded1b33fb5..2b768b5972 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Reportar mensagem com spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">De:</string>
     <string name="title_to">Para:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 36c36a93e1..cf57b07f70 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 0839064861..b53e1bbef8 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -188,7 +188,7 @@
     <string name="title_archive">Arhivă</string>
     <string name="title_reply">Răspunde</string>
     <string name="title_moving">Mesajul se mută în %1$s</string>
-    <string name="title_open_with">Open with</string>
+    <string name="title_open_with">Deschide cu</string>
     <string name="title_no_answers">Nici un șablon de răspuns definit</string>
     <string name="title_no_viewer">Nici o aplicație nu poate deschide %1$s</string>
     <string name="title_no_saf">Nu se poate accesa stocarea locală</string>
@@ -199,8 +199,9 @@
     <string name="title_ask_delete_answer">Se șterge permanent șablonul de răspuns?</string>
     <string name="title_ask_discard">Renunțați la ciornă?</string>
     <string name="title_ask_spam">Raportați mesajul drept spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Remediere</string>
-    <string name="title_compose">Compune %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">De la:</string>
     <string name="title_to">Către:</string>
     <string name="title_reply_to">Răspunde la:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5ce3b7470f..afe10ee397 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index c5051dff14..3dccee8113 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -199,8 +199,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -271,7 +272,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9eeacea4e5..8754d0e2a7 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Släng utkastet?</string>
     <string name="title_ask_spam">Rapportera meddelandet som skräppost?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Från:</string>
     <string name="title_to">Till:</string>
     <string name="title_reply_to">Svara till:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Om du har en fråga eller ett problem, vänligen använd supportmenyn för att få hjälp</string>
     <string name="title_hint_message_actions">Svep åt vänster för att slänga; svep åt höger för att arkivera (om tillgängligt)</string>
     <string name="title_hint_message_selection">Tryck länge på ett meddelande för att börja välja flera meddelanden</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Öppna länken</string>
     <string name="title_updated">Det finns en uppdatering till version %1$s tillgänglig</string>
     <string name="title_issue">Har du en fråga eller problem?</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 97ed5c6735..6efba75998 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -194,8 +194,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Taslağı sil?</string>
     <string name="title_ask_spam">İletiyi spam olarak raporla?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Düzelt</string>
-    <string name="title_compose">Yaz %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">Gönderen:</string>
     <string name="title_to">Alıcı:</string>
     <string name="title_reply_to">Yanıt adresi:</string>
@@ -266,7 +267,7 @@
     <string name="title_hint_support">Bir soru ya da bir probleminiz varsa, lütfen yardım almak için destek menüsünü kullanın</string>
     <string name="title_hint_message_actions">Çöp kutusu için sola kaydırın; arşivlemek için sağa kaydırın (eğer varsa)</string>
     <string name="title_hint_message_selection">Birden çok mesaj seçmeye başlamak için bir mesaja uzun basın</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Bağlantıyı aç</string>
     <string name="title_updated">Sürüm %1$s için bir güncelleştirme mevcut</string>
     <string name="title_issue">Bir sorunuz ya da probleminiz mi var?</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5ce3b7470f..afe10ee397 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -204,8 +204,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -276,7 +277,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 20970734a7..09789ca5a7 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -261,7 +262,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b66552418e..42042a351c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">丢弃草稿？</string>
     <string name="title_ask_spam">确定将邮件标为垃圾邮件吗？</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">修复</string>
-    <string name="title_compose">撰写 %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">发件人：</string>
     <string name="title_to">收件人：</string>
     <string name="title_reply_to">回复：</string>
@@ -261,7 +262,7 @@
     <string name="title_hint_support">如果您要提问或有问题，请使用支持选项获取帮助</string>
     <string name="title_hint_message_actions">向左滑至垃圾箱；向右滑归档(如果可用)</string>
     <string name="title_hint_message_selection">长按一则邮件以开始选择多则邮件</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">打开链接</string>
     <string name="title_updated">有新的版本%1$s可用</string>
     <string name="title_issue">您要提问或有问题吗？</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 20970734a7..09789ca5a7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>
@@ -261,7 +262,7 @@
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>
     <string name="title_hint_message_actions">Swipe left to trash; swipe right to archive (if available)</string>
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
-    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might be responding slower.</string>
+    <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a16bedd254..8e0818fd7d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -226,7 +226,7 @@
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
 
-    <string name="title_compose">Compose %1$s</string>
+    <string name="title_compose">Compose</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>