diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f46586bd..db654b8949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
 
 ### [Acantholipan](https://en.wikipedia.org/wiki/Acantholipan)
 
-### Next version
+### 1.2222 - 2024-08-16
 
 * Fixed bug in JavaMail causing iCloud move issues
 * Added reply/forward header template option
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index a709f09c31..d86f4ca567 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -420,6 +420,7 @@
     <string name="title_advanced_prefix_count">Prefiksi cavablandırmaq üçün sayğac əlavə et</string>
     <string name="title_advanced_separate_reply">Cavablama/yönləndirmə başlığından əvvəl üfüqi bir xətt əlavə et</string>
     <string name="title_advanced_extended_reply">Genişləndirilmiş cavablama/yönləndirmə başlığı istifadə et</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Cavabla/yönləndir başlıq şablonu</string>
     <string name="title_advanced_write_above">Göndərən mətninin üstünə yaz</string>
     <string name="title_advanced_write_below">Göndərən mətninin altına yaz</string>
     <string name="title_advanced_quote_reply">Cavablanan mətndən sitat gətir</string>
@@ -521,7 +522,7 @@
     <string name="title_advanced_threading_unread">Danışıqda oxunmamış mesaj sayını göstər</string>
     <string name="title_advanced_indentation">Danışıqlarda alınan/göndərilən mesajların sol/sağ boşluğu</string>
     <string name="title_advanced_highlight_unread">Oxunmamış mesajları vurğula</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Rəngli bir zolaq və ya rəngli nöqtə göstər</string>
+    <string name="title_advanced_account_color">Rəngli bir zolaq və ya rəngli nöqtə göstər</string>
     <string name="title_advanced_color_stripe_wide">Geniş rəng zolağı istifadə et</string>
     <string name="title_advanced_avatars">Əlaqə fotolarını göstər</string>
     <string name="title_advanced_bimi">Mesaj İdentifikasiyası üçün Marka İndikatorlarını (BIMI) göstər</string>
@@ -844,6 +845,7 @@
     <string name="title_advanced_send_reminders_hint">Mesaj mətni və ya mövzu boş olanda və ya bir qoşma əskik olanda bir xəbərdarlıq göstər</string>
     <string name="title_advanced_reply_move_hint">E-poçt serveri, mesajları yenə də göndərilən mesaj qovluğuna əlavə edə bilər</string>
     <string name="title_advanced_compose_color_hint">Çox açıq və ya çox tünd rənglər, alıcının mesajları oxuya bilməməsi ilə nəticələnir</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML-ə icazə verilir. Mövcud placeholder: %1$s</string>
     <string name="title_advanced_write_below_hint">Alıcı, məsələn uzun mesaj kəsiləndə cavabınızı buraxa bilər</string>
     <string name="title_advanced_attach_new_hint">Əks halda, paylaşılan ünvanları və ya faylları hazırkı qaralama mesajına əlavə edin</string>
     <string name="title_advanced_usenet_hint">Mətn və imza arasına \'-- \' əlavə et</string>
@@ -2314,8 +2316,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Heç biri</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Zolaq</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Nöqtə</item>
+        <item>Zolaq</item>
+        <item>Nöqtə</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Alıcı</item>
diff --git a/app/src/main/res/values-be-rBY/strings.xml b/app/src/main/res/values-be-rBY/strings.xml
index 2081ab4589..9246e6fa75 100644
--- a/app/src/main/res/values-be-rBY/strings.xml
+++ b/app/src/main/res/values-be-rBY/strings.xml
@@ -2340,8 +2340,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Нічога</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Атрымальнік</item>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 91284b9475..68f57ebb92 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -520,7 +520,7 @@
     <string name="title_advanced_threading_unread">Показване на броя на непрочетените съобщения в разговорите</string>
     <string name="title_advanced_indentation">Ляв/десен отстъп на получени/изпратени съобщения в разговори</string>
     <string name="title_advanced_highlight_unread">Маркирай непрочетените съобщения</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Показване на цветна ивица или точка</string>
+    <string name="title_advanced_account_color">Показване на цветна ивица или точка</string>
     <string name="title_advanced_color_stripe_wide">Употреба на широка гама цветове</string>
     <string name="title_advanced_avatars">Показване на снимки на контакт</string>
     <string name="title_advanced_bimi">Показване на „Brand Indicators for Message Identification“ (BIMI)</string>
@@ -2318,8 +2318,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Нищо</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Ивица</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Точка</item>
+        <item>Ивица</item>
+        <item>Точка</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Получател</item>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index c7906b8ec4..1d590203f0 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -2325,8 +2325,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Nijedno</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Primalac</item>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index cdb7cd889e..dde39fd080 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1531,8 +1531,8 @@ Ambdues opcions es poden desactivar si es desitja.</string>
     </string-array>
     <string-array name="accountColorNames">
         <item>Cap</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatari</item>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4628e93ab4..4b8f28b6c2 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -549,7 +549,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_threading_unread">Zobrazit počet nepřečtených zpráv v konverzacích</string>
     <string name="title_advanced_indentation">Levé/pravé odsazení přijatých/odeslaných zpráv v konverzacích</string>
     <string name="title_advanced_highlight_unread">Zvýraznit nepřečtené zprávy</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Zobrazit barevný pruh nebo barevný bod</string>
+    <string name="title_advanced_account_color">Zobrazit barevný pruh nebo barevný bod</string>
     <string name="title_advanced_color_stripe_wide">Použít široký barevný pruh</string>
     <string name="title_advanced_avatars">Zobrazit fotografie kontaktů</string>
     <string name="title_advanced_bimi">Zobrazit Brand Indicators for Message Identification (BIMI)</string>
@@ -2348,8 +2348,8 @@ v prohlížeči ze všech Google účtů.</string>
     </string-array>
     <string-array name="accountColorNames">
         <item>Žádné</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Pruh</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Tečka</item>
+        <item>Pruh</item>
+        <item>Tečka</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Příjemce</item>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 24a0da4ff5..35b9d50bfc 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -521,7 +521,7 @@
     <string name="title_advanced_threading_unread">Vis antal ulæste beskeder i samtaler</string>
     <string name="title_advanced_indentation">Venstre-/-højreindryk modtagne/sendte beskeder i samtaler</string>
     <string name="title_advanced_highlight_unread">Fremhæv ulæste beskeder</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Vis en farvestribe eller farveprik</string>
+    <string name="title_advanced_account_color">Vis en farvestribe eller farveprik</string>
     <string name="title_advanced_color_stripe_wide">Benyt bred farvestribe</string>
     <string name="title_advanced_avatars">Vis kontaktfotos</string>
     <string name="title_advanced_bimi">Vis Brand Indicators for Message Identification (BIMI)</string>
@@ -2322,8 +2322,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ingen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stribe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Prik</item>
+        <item>Stribe</item>
+        <item>Prik</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Modtager</item>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index eae1af7f69..ac623d0027 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -421,6 +421,7 @@
     <string name="title_advanced_prefix_count">Zähler zum Antwortpräfix hinzufügen</string>
     <string name="title_advanced_separate_reply">Eine horizontale Linie vor einer Antwort/Weiterleitung einfügen</string>
     <string name="title_advanced_extended_reply">Erweiterte Antwort-/Weiterleitungs-Kopfzeile verwenden</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Kopfzeilenvorlage für Antworten/Weiterleiten</string>
     <string name="title_advanced_write_above">Oberhalb des zitierten Textes des Absenders schreiben</string>
     <string name="title_advanced_write_below">Unter dem zitierten Text des Absenders schreiben</string>
     <string name="title_advanced_quote_reply">Beantworteten Text zitieren</string>
@@ -522,7 +523,7 @@
     <string name="title_advanced_threading_unread">Anzahl ungelesener Nachrichten in Unterhaltungen anzeigen</string>
     <string name="title_advanced_indentation">Empfangene/gesendete Nachrichten im Themenbaum links/rechts einrücken</string>
     <string name="title_advanced_highlight_unread">Ungelesene Nachrichten hervorheben</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Farbstreifen oder Farbpunkt anzeigen</string>
+    <string name="title_advanced_account_color">Farbstreifen oder Farbpunkt anzeigen</string>
     <string name="title_advanced_color_stripe_wide">Breite Farbstreifen verwenden</string>
     <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
     <string name="title_advanced_bimi">Brand Indicators for Message Identification (BIMI) anzeigen</string>
@@ -846,6 +847,7 @@
     <string name="title_advanced_send_reminders_hint">Eine Warnung anzeigen, wenn der Nachrichtentext oder der Betreff leer ist oder wenn ein Anhang zu fehlen scheint</string>
     <string name="title_advanced_reply_move_hint">Der E-Mail-Server könnte die Nachrichten trotzdem in den Ordner für gesendete Nachrichten hinzufügen</string>
     <string name="title_advanced_compose_color_hint">Sehr helle oder sehr dunkle Farben führen zu unleserlichen Nachrichten auf der Seite des Empfängers</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML ist erlaubt. Verfügbare Platzhalter: %1$s</string>
     <string name="title_advanced_write_below_hint">Ein Empfänger könnte Ihre Antwort verpassen, wenn zum Beispiel eine längere Nachricht abgeschnitten wird</string>
     <string name="title_advanced_attach_new_hint">Anderenfalls dem aktuellen Nachrichtenentwurf freigegebene Adressen oder Dateien hinzufügen</string>
     <string name="title_advanced_usenet_hint">Signaturtrenner »-- « zwischen Text und Signatur einfügen</string>
@@ -2323,8 +2325,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Keine</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Streifen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Punkt</item>
+        <item>Streifen</item>
+        <item>Punkt</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Empfänger</item>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 3f33b48ec6..7202d4f405 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -520,7 +520,7 @@
     <string name="title_advanced_threading_unread">Προβολή αριθμού μη αναγνωσμένων μηνυμάτων στις συζητήσεις</string>
     <string name="title_advanced_indentation">Αριστερή/δεξιά εσοχή ειλημμένων/απεσταλμένων μηνυμάτων στις συζητήσεις</string>
     <string name="title_advanced_highlight_unread">Να επισημαίνονται τα μη αναγνωσμένα μηνύματα</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Προβολή μιας χρωματιστής λωρίδας ή μιας χρωματιστής κουκκίδας</string>
+    <string name="title_advanced_account_color">Προβολή μιας χρωματιστής λωρίδας ή μιας χρωματιστής κουκκίδας</string>
     <string name="title_advanced_color_stripe_wide">Χρήση φαρδιάς λωρίδας χρώματος</string>
     <string name="title_advanced_avatars">Προβολή φωτογραφιών επαφών</string>
     <string name="title_advanced_bimi">Προβολή των Brand Indicators for Message Identification (BIMI)</string>
@@ -2316,8 +2316,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Καμία</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Λωρίδα</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Κουκκίδα</item>
+        <item>Λωρίδα</item>
+        <item>Κουκκίδα</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Παραλήπτης</item>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index aa736d823e..953c0c71d4 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -49,7 +49,7 @@
     <string name="title_advanced_tabular_background">Use card colour as background colour when using tabular style</string>
     <string name="title_advanced_cards_shadow_highlight">Use highlight colour instead of accent colour</string>
     <string name="title_advanced_tabular_unread_bg">Use a grey background colour for unread messages when using table style</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Show a colour stripe or colour dot</string>
+    <string name="title_advanced_account_color">Show a colour stripe or colour dot</string>
     <string name="title_advanced_color_stripe_wide">Use wide colour stripe</string>
     <string name="title_advanced_color_threshold">Threshold letter colour: %1$s %%</string>
     <string name="title_advanced_highlight_color">Highlight colour</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2f6776f4f9..1348b30775 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -419,6 +419,7 @@
     <string name="title_advanced_prefix_count">Añadir contador a prefijo de respuesta</string>
     <string name="title_advanced_separate_reply">Insertar una línea horizontal antes de un encabezado de respuesta/reenvío</string>
     <string name="title_advanced_extended_reply">Usar encabezado de respuesta/reenvío extendido</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Plantilla de cabecera de respuesta/redirección</string>
     <string name="title_advanced_write_above">Escribir sobre el texto del remitente</string>
     <string name="title_advanced_write_below">Escribir debajo del texto del remitente</string>
     <string name="title_advanced_quote_reply">Citar texto a responder</string>
@@ -520,7 +521,7 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensajes no leídos en conversaciones</string>
     <string name="title_advanced_indentation">Sangría izquierda/derecha para mensajes recibidos/enviados en conversaciones</string>
     <string name="title_advanced_highlight_unread">Resaltar mensajes no leídos</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Mostrar línea de color o punto de color</string>
+    <string name="title_advanced_account_color">Mostrar línea de color o punto de color</string>
     <string name="title_advanced_color_stripe_wide">Usar banda de color ancha</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_bimi">Mostrar Brand Indicators for Message Identification (BIMI)</string>
@@ -843,6 +844,7 @@
     <string name="title_advanced_send_reminders_hint">Mostrar una advertencia cuando el texto del mensaje o el asunto estén vacíos o cuando un archivo adjunto pueda estar ausente</string>
     <string name="title_advanced_reply_move_hint">El servidor de correo electrónico todavía puede añadir los mensajes a la carpeta de mensajes enviados</string>
     <string name="title_advanced_compose_color_hint">Los colores muy claros o muy oscuros resultarán en mensajes ilegibles en el lado de los destinatarios</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML está permitido. Marcadores de posición disponibles: %1$s</string>
     <string name="title_advanced_write_below_hint">Un destinatario puede perderse su respuesta, por ejemplo cuando un mensaje más largo está siendo truncado</string>
     <string name="title_advanced_attach_new_hint">De lo contrario, añadir direcciones compartidas o archivos al mensaje de borrador actual</string>
     <string name="title_advanced_usenet_hint">Insertar \'-- \' entre el texto y la firma</string>
@@ -2316,8 +2318,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ninguna</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Línea</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Punto</item>
+        <item>Línea</item>
+        <item>Punto</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
index b50d7986df..8e74e2de26 100644
--- a/app/src/main/res/values-et-rEE/strings.xml
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -2302,8 +2302,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Pole</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Saaja</item>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 048a8906be..b16ff05191 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1680,8 +1680,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Bat ere ez</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Hartzailea</item>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 349bfcde0e..e9254c81dd 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -369,6 +369,7 @@
     <string name="title_advanced_auto_identity">برای پیام‌های جدید، هویت را خودکار انتخاب کن</string>
     <string name="title_advanced_prefix_count">افزودن تعداد به پیشوند پاسخ</string>
     <string name="title_advanced_extended_reply">استفاده از هدر پاسخ/فوروارد توسعه یافته</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">پاسخ/فوروارد قالب عنوان</string>
     <string name="title_advanced_write_above">در بالای نوشته فرستنده بنویسید</string>
     <string name="title_advanced_write_below">در پایین نوشته فرستنده بنویسید</string>
     <string name="title_advanced_quote_reply">متن پاسخ نقل قول شده</string>
@@ -449,7 +450,7 @@
     <string name="title_advanced_threading_unread">شمار پیام‌های خوانده نشده را در گفتگوها نمایش بده</string>
     <string name="title_advanced_indentation">تورفتگی چپ/راست پیام‌های دریافت/فرستاده شده در مکالمات</string>
     <string name="title_advanced_highlight_unread">برجسته‌سازی پیام‌های خوانده نشده</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">نمایش یک نوار رنگی یا نقطه رنگی</string>
+    <string name="title_advanced_account_color">نمایش یک نوار رنگی یا نقطه رنگی</string>
     <string name="title_advanced_color_stripe_wide">استفاده از نوار رنگی پهن</string>
     <string name="title_advanced_avatars">نمایش تصویر مخاطبین</string>
     <string name="title_advanced_bimi">نمایش نشانگرهای برند برای شناسایی پیام (BIMI)</string>
@@ -640,6 +641,7 @@
     <string name="title_advanced_pull_all_hint">همزمان با پایین کشیدن لیست حساب‌ها یا پرونده‌ها</string>
     <string name="title_advanced_auto_identity_hint">این گزینه، آخرین هویت استفاده شده را به عنوان گیرنده پیام‌های جدید انتخاب خواهد کرد</string>
     <string name="title_advanced_send_reminders_hint">هنگامی که موضوع یا متن پیام خالی است یا یک پیوست ممکن است وجود نداشته باشد، یک هشدار نشان بده</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML مجاز است. جایبان‌های موجود: %1$s</string>
     <string name="title_advanced_usenet_hint">بین متن و امضا \'-- \' درج کنید</string>
     <string name="title_advanced_metered_hint">اتصال‌های حجمی عموما شبکه‌های موبایل یا یک هات اسپات غیر رایگان می‌باشند</string>
     <string name="title_advanced_metered_warning">غیرفعال‌سازی این گزینه، دریافت و فرستادن پیام‌ها را روی داده همراه غیرفعال خواهد کرد</string>
@@ -1665,8 +1667,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>هیچکدام</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">نوار</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">نقطه</item>
+        <item>نوار</item>
+        <item>نقطه</item>
     </string-array>
     <string-array name="contactTypes">
         <item>گیرنده</item>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 03b971a143..e8475d1cb4 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -2309,8 +2309,8 @@ Tämä voi epäonnistua, minkä takia vanha viesti siirretään roskakoriin talt
     </string-array>
     <string-array name="accountColorNames">
         <item>Ei mitään</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Vastaanottaja</item>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 52e05a2a09..a51e1a38be 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -420,6 +420,7 @@
     <string name="title_advanced_prefix_count">Ajouter le nombre de réponses au préfixe de réponse</string>
     <string name="title_advanced_separate_reply">Insérer une ligne horizontale avant l\'en-tête de réponse/transfert</string>
     <string name="title_advanced_extended_reply">Utiliser l\'en-tête étendu de réponse/transfert</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Modèle d\'en-tête de réponse / transfert</string>
     <string name="title_advanced_write_above">Écrire au-dessus du texte de l\'expéditeur</string>
     <string name="title_advanced_write_below">Écrire sous le texte de l\'expéditeur</string>
     <string name="title_advanced_quote_reply">Citer le texte répondu</string>
@@ -521,7 +522,7 @@
     <string name="title_advanced_threading_unread">Afficher le nombre de messages non lus dans les conversations</string>
     <string name="title_advanced_indentation">Mettre en retrait vers la gauche/droite les messages reçus/envoyés dans les conversations</string>
     <string name="title_advanced_highlight_unread">Afficher les messages non lus en surbrillance</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Afficher une bande de couleur ou un point de couleur</string>
+    <string name="title_advanced_account_color">Afficher une bande de couleur ou un point de couleur</string>
     <string name="title_advanced_color_stripe_wide">Utiliser une bande de couleur large</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_bimi">Afficher les indicateurs de marque pour l\'identification des messages (BIMI)</string>
@@ -845,6 +846,7 @@
     <string name="title_advanced_send_reminders_hint">Afficher un avertissement quand le texte du message ou l’objet sont vides ou quand une pièce jointe semble avoir été oubliée</string>
     <string name="title_advanced_reply_move_hint">Le serveur de messagerie pourrait tout de même ajouter les messages au dossier des messages envoyés</string>
     <string name="title_advanced_compose_color_hint">Les couleurs très claires ou très sombres rendront les messages illisibles par les destinataires</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML est autorisé. Espaces réservés disponibles : %1$s</string>
     <string name="title_advanced_write_below_hint">Un destinataire peut manquer votre réponse, par exemple lorsqu\'un message trop long est tronqué</string>
     <string name="title_advanced_attach_new_hint">Sinon, ajouter les adresses ou fichiers partagés au message brouillon actuel</string>
     <string name="title_advanced_usenet_hint">Insérer -- entre le texte et la signature</string>
@@ -2322,8 +2324,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Aucune</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Bande</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Point</item>
+        <item>Bande</item>
+        <item>Point</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinataire</item>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index c5241a0968..0414f43553 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -420,6 +420,7 @@
     <string name="title_advanced_prefix_count">Ajouter le nombre de réponses au préfixe de réponse</string>
     <string name="title_advanced_separate_reply">Insérer une ligne horizontale avant l\'en-tête de réponse/transfert</string>
     <string name="title_advanced_extended_reply">Utiliser l\'en-tête étendu de réponse/transfert</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Modèle d\'en-tête de réponse / transfert</string>
     <string name="title_advanced_write_above">Écrire au-dessus du texte de l\'expéditeur</string>
     <string name="title_advanced_write_below">Écrire sous le texte de l\'expéditeur</string>
     <string name="title_advanced_quote_reply">Citer le texte répondu</string>
@@ -521,7 +522,7 @@
     <string name="title_advanced_threading_unread">Afficher le nombre de messages non lus dans les conversations</string>
     <string name="title_advanced_indentation">Mettre en retrait vers la gauche/droite les messages reçus/envoyés dans les conversations</string>
     <string name="title_advanced_highlight_unread">Afficher les messages non lus en surbrillance</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Afficher une bande de couleur ou un point de couleur</string>
+    <string name="title_advanced_account_color">Afficher une bande de couleur ou un point de couleur</string>
     <string name="title_advanced_color_stripe_wide">Utiliser une bande de couleur large</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_bimi">Afficher les indicateurs de marque pour l\'identification des messages (BIMI)</string>
@@ -845,6 +846,7 @@
     <string name="title_advanced_send_reminders_hint">Afficher un avertissement quand le texte du message ou l’objet sont vides ou quand une pièce jointe semble avoir été oubliée</string>
     <string name="title_advanced_reply_move_hint">Le serveur de messagerie pourrait tout de même ajouter les messages au dossier des messages envoyés</string>
     <string name="title_advanced_compose_color_hint">Les couleurs très claires ou très sombres rendront les messages illisibles par les destinataires</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML est autorisé. Espaces réservés disponibles : %1$s</string>
     <string name="title_advanced_write_below_hint">Un destinataire peut manquer votre réponse, par exemple lorsqu\'un message trop long est tronqué</string>
     <string name="title_advanced_attach_new_hint">Sinon, ajouter les adresses ou fichiers partagés au message brouillon actuel</string>
     <string name="title_advanced_usenet_hint">Insérer \'-- \' entre le texte et la signature</string>
@@ -2322,8 +2324,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Aucun</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Bande</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Point</item>
+        <item>Bande</item>
+        <item>Point</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinataire</item>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 0f71817631..bf4c6d6ec9 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -519,7 +519,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_threading_unread">Net-lêzen berjochten yn petearen toane</string>
     <string name="title_advanced_indentation">Links/rjochts ynspringe fan ûntfongen/ferstjoerde berjochten yn petearen</string>
     <string name="title_advanced_highlight_unread">Net-lêzen berjochten markearje</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">In kleurestreek of kleurestip toane</string>
+    <string name="title_advanced_account_color">In kleurestreek of kleurestip toane</string>
     <string name="title_advanced_color_stripe_wide">Brede kleurestreep brûke</string>
     <string name="title_advanced_avatars">Kontaktfoto’s toane</string>
     <string name="title_advanced_bimi">Brand Indicators for Message Identification (BIMI) toane</string>
@@ -2313,8 +2313,8 @@ https://en.wikipedia.org/wiki/ASCII</string>
     </string-array>
     <string-array name="accountColorNames">
         <item>Gjin</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Streek</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Stip</item>
+        <item>Streek</item>
+        <item>Stip</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Untfanger</item>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 0ed549a883..6fb060dd14 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1928,8 +1928,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ningún</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index a35947af59..23c419523b 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1904,8 +1904,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Nijedan</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Primatelj</item>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 84ea756622..5603b2b83b 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -418,6 +418,7 @@
     <string name="title_advanced_prefix_count">Számláló hozzáadása a válasz előtaghoz</string>
     <string name="title_advanced_separate_reply">Fekvő vonal elhelyezése a válasz/továbbítás fejléc előtt</string>
     <string name="title_advanced_extended_reply">Kiterjesztett válasz/továbbítás fejléc használata</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Válasz/továbbítás címzés sablon</string>
     <string name="title_advanced_write_above">Írás a küldő szövege fölé</string>
     <string name="title_advanced_write_below">Írás a küldő szövege alatt</string>
     <string name="title_advanced_quote_reply">Megválaszolt szöveg idézése</string>
@@ -519,7 +520,7 @@
     <string name="title_advanced_threading_unread">Olvasatlan üzenetek számának mutatása beszélgetésekben</string>
     <string name="title_advanced_indentation">Beérkezett/elküldött üzenetek balra/jobbra tördelése a beszélgetésekben</string>
     <string name="title_advanced_highlight_unread">Olvasatlan üzenetek kiemelése</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Színes sáv, vagy pötty mutatása</string>
+    <string name="title_advanced_account_color">Színes sáv, vagy pötty mutatása</string>
     <string name="title_advanced_color_stripe_wide">Széles színcsík használata</string>
     <string name="title_advanced_avatars">Névjegyzék fényképeinek megjelenítése</string>
     <string name="title_advanced_bimi">Mutassa a Márkajelzést Üzenetazonosításhoz (BIMI)</string>
@@ -841,6 +842,7 @@
     <string name="title_advanced_send_reminders_hint">Figyelmeztetés megjelenítése, ha az üzenet szövege vagy a tárgy üres, illetve ha a melléklet feltehetőleg hiányzik</string>
     <string name="title_advanced_reply_move_hint">Az e-mail szerver továbbra is felveheti az üzeneteket az elküldött üzenetek mappájába</string>
     <string name="title_advanced_compose_color_hint">Nagyon világos vagy sötét szín választása a címzett számára olvashatatlan üzenetet eredményezhet</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML használható. Elérhető helyőrzők: %1$s</string>
     <string name="title_advanced_write_below_hint">A címzett így lemaradhat az ön válaszáról, például ha hosszú üzenetváltást rövidebbre metszenek</string>
     <string name="title_advanced_attach_new_hint">Vagy, a megosztás során kapott címet vagy fájlokat adja hozzá a jelenlegi vázlathoz</string>
     <string name="title_advanced_usenet_hint">Elválasztó \'--\' beillesztése a szövegtörzs és az aláírás közé</string>
@@ -2313,8 +2315,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Egyik sem</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Címzett</item>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 1ca227e041..64c8b9fbba 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -505,7 +505,7 @@ Kata sandi diperlukan untuk mengimpor kembali pengaturan, harap jangan sampai lu
     <string name="title_advanced_threading_unread">Tampilkan jumlah pesan yang belum dibaca dalam obrolan</string>
     <string name="title_advanced_indentation">Indentasi kiri/kanan menerima/mengirim pesan dalam sebuah obrolan</string>
     <string name="title_advanced_highlight_unread">Sorot pesan yang belum dibaca</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Menampilkan garis warna atau titik warna</string>
+    <string name="title_advanced_account_color">Menampilkan garis warna atau titik warna</string>
     <string name="title_advanced_color_stripe_wide">Gunakan garis warna lebar</string>
     <string name="title_advanced_avatars">Tampilkan kontak foto</string>
     <string name="title_advanced_bimi">Tampilkan Indikator Merek untuk Identifikasi Pesan (BIMI)</string>
@@ -2296,8 +2296,8 @@ Kunci dan sertifikat umumnya dapat ditemukan di menu Lanjutan - Enkripsi dan kre
     </string-array>
     <string-array name="accountColorNames">
         <item>Tidak ada</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Garis</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Titik</item>
+        <item>Garis</item>
+        <item>Titik</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Penerima</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 32286e5782..e406ccbdfc 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -420,6 +420,7 @@
     <string name="title_advanced_prefix_count">Aggiungi conteggio al prefisso di risposta</string>
     <string name="title_advanced_separate_reply">Inserisci una riga orizzontale prima di un\'intestazione di risposta/inoltro</string>
     <string name="title_advanced_extended_reply">Usa intestazione estesa di risposto/inoltro</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Modello intestazione risposta/inoltro</string>
     <string name="title_advanced_write_above">Scrivi sopra al testo del mittente</string>
     <string name="title_advanced_write_below">Scrivi sotto il testo del mittente</string>
     <string name="title_advanced_quote_reply">Cita il testo risposto</string>
@@ -521,7 +522,7 @@
     <string name="title_advanced_threading_unread">Mostra il numero di messaggi non letti nelle conversazioni</string>
     <string name="title_advanced_indentation">Messaggi ricevuti/inviati con rientro a sinistra/destra nelle conversazioni</string>
     <string name="title_advanced_highlight_unread">Evidenzia i messaggi non letti</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Mostra una striscia colorata o un punto colorato</string>
+    <string name="title_advanced_account_color">Mostra una striscia colorata o un punto colorato</string>
     <string name="title_advanced_color_stripe_wide">Usa un\'ampia striscia di colore</string>
     <string name="title_advanced_avatars">Mostra le foto di contatto</string>
     <string name="title_advanced_bimi">Mostra il logo del mittente (BIMI, Brand Indicators for Message Identification)</string>
@@ -790,10 +791,10 @@
     <string name="title_advanced_openai_moderation">Moderazione dei contenuti</string>
     <string name="title_advanced_gemini">Integrazione di Gemini</string>
     <string name="title_advanced_multi_modal">Multimodale</string>
-    <string name="title_advanced_summarize_prompt">Invito per riassumere</string>
-    <string name="title_advanced_answer_prompt">Invito per rispondere</string>
+    <string name="title_advanced_summarize_prompt">Comando per riassumere</string>
+    <string name="title_advanced_answer_prompt">Comando per rispondere</string>
     <string name="title_advanced_system_instructions">Istruzioni di sistema</string>
-    <string name="title_advanced_default_prompt">Invito di default</string>
+    <string name="title_advanced_default_prompt">Comando predefinito</string>
     <string name="title_advanced_entered_text">Testo inserito</string>
     <string name="title_advanced_sdcard">Desidero usare una scheda sd</string>
     <string name="title_advanced_watchdog">Verifica periodicamente se FairEmail è ancora attivo</string>
@@ -845,6 +846,7 @@
     <string name="title_advanced_send_reminders_hint">Mostra un avviso quando il testo o l\'oggetto del messaggio sono vuoti o quando un allegato potrebbe mancare</string>
     <string name="title_advanced_reply_move_hint">Il server email potrebbe ancora aggiungere i messaggi alla cartella dei messaggi inviati</string>
     <string name="title_advanced_compose_color_hint">Colori molto chiari o molto scuri renderanno i messaggi illeggibili dai destinatari</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML consentito. Segnaposti disponibili: %1$s</string>
     <string name="title_advanced_write_below_hint">Un destinatario potrebbe perdere la risposta, ad esempio quando un messaggio più lungo viene troncato</string>
     <string name="title_advanced_attach_new_hint">Altrimenti, aggiungi gli indirizzi o file condivisi al messaggio di bozza corrente</string>
     <string name="title_advanced_usenet_hint">Inserisci \'--\' tra il testo e la firma</string>
@@ -853,7 +855,7 @@
     <string name="title_advanced_metered_warning">Disabilitare quest\'opzione disabiliterà la ricezione e l\'invio dei messaggi su connessioni internet mobili</string>
     <string name="title_advanced_rlah_hint">Presumi che non ci sia roaming nell\'UE</string>
     <string name="title_advanced_usage_hint">Questo aumenterà l\'uso di batteria, dati e spazio d\'archiviazione</string>
-    <string name="title_advanced_plain_hint">Abilitarlo limiterà l\'uso dei dati ma i messaggi saranno mostrati senza stile e senza immagini</string>
+    <string name="title_advanced_plain_hint">Abilitarlo limiterà l\'uso dei dati, ma i messaggi saranno mostrati senza stili e senza immagini</string>
     <string name="title_advanced_plain_remark">La parte in testo semplice non contiene sempre il messaggio completo!</string>
     <string name="title_advanced_tcp_keep_alive_hint">Abilitarlo può causare problemi di connessione su alcuni dispositivi e può aumentare l\'uso della batteria</string>
     <string name="title_advanced_validate_hint">Questo può risultare nel non sincronizzare i messaggi, ad esempio usando una VPN, ma anche altre situazioni</string>
@@ -873,8 +875,8 @@
     <string name="title_advanced_indentation_hint">Soltanto per lo stile della carta</string>
     <string name="title_advanced_highlight_hint">Il colore secondario del tema sarà usato per l\'evidenziazione</string>
     <string name="title_advanced_free">Questo servizio cloud è gratuito da usare</string>
-    <string name="title_advanced_free_tier">Questo servizio cloud è limitato da usare gratuitamente</string>
-    <string name="title_advanced_paid_service">Questo servizio cloud richiede pagamento</string>
+    <string name="title_advanced_free_tier">Questo servizio cloud ha un uso gratuito limitato</string>
+    <string name="title_advanced_paid_service">Questo servizio cloud richiede il pagamento</string>
     <string name="title_advanced_privacy_risk">Potrebbe esistere un rischio per la privacy</string>
     <string name="title_advanced_name_email_hint">I nomi saranno mostrati solo quando disponibili</string>
     <string name="title_advanced_preview_hint">Disponibile solo quando il testo del messaggio è stato scaricato</string>
@@ -942,7 +944,7 @@
     <string name="title_identity_name">Il tuo nome</string>
     <string name="title_identity_email">Il tuo indirizzo email</string>
     <string name="title_identity_tenant_hint">Questo campo dovrebbe esser vuoto in gran parte dei casi</string>
-    <string name="title_identity_receive_first_hint">Raramente è necessario attivare questa opzione e inoltre, l\'utilizzo dei dati aumenterà!</string>
+    <string name="title_identity_receive_first_hint">Raramente è necessario attivare questa opzione e inoltre l\'utilizzo dei dati aumenterà!</string>
     <string name="title_identity_color_hint">I colori dell\'identità hanno la precedenza sui colori della cartella e del profilo</string>
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo del mittente</string>
     <string name="title_advanced_sender_name">Usa il nome quando l\'indirizzo del mittente è modificato</string>
@@ -1012,12 +1014,12 @@
     <string name="title_primary_identity">Principale (identità predefinita)</string>
     <string name="title_self_identity">Rimuovi l\'indirizzo email alla risposta</string>
     <string name="title_leave_on_server">Lascia i messaggi sul server</string>
-    <string name="title_leave_on_server_hint">Dopo aver scaricato messaggi dal server, questi rimangono sul server</string>
+    <string name="title_leave_on_server_hint">Dopo aver scaricato i messaggi dal server, questi rimangono sul server</string>
     <string name="title_client_delete">Elimina attivamente i messaggi dopo il download</string>
     <string name="title_leave_deleted">Lascia i messaggi eliminati sul server</string>
-    <string name="title_leave_deleted_hint">Dopo aver eliminato messaggi dal dispositivo, questi rimarranno sul server</string>
+    <string name="title_leave_deleted_hint">Dopo aver eliminato i messaggi dal dispositivo, questi rimarranno sul server</string>
     <string name="title_leave_on_device">Lascia messaggi sul dispositivo</string>
-    <string name="title_leave_on_device_hint">Eliminando messaggi dal server, questi rimangono sul dispositivo</string>
+    <string name="title_leave_on_device_hint">Quando si eliminano i messaggi dal server, questi rimangono sul dispositivo</string>
     <string name="title_max_messages">Numero massimo di messaggi da scaricare (vuoto per tutti)</string>
     <string name="title_max_messages_keep">Questo è il numero massimo di messaggi che verranno mantenuti sul dispositivo</string>
     <string name="title_max_messages_remark">        Inserisci un numero positivo per scaricare i messaggi al termine (più comune)
@@ -1110,7 +1112,7 @@
     <string name="title_expunge_remark">Questo eliminerà permanentemente tutti i messaggi contrassegnati per l\'eliminazione</string>
     <string name="title_empty_trash">Svuota il cestino</string>
     <string name="title_empty_spam">Svuota lo spam</string>
-    <string name="title_edit_color">Modifica colore</string>
+    <string name="title_edit_color">Modifica il colore</string>
     <string name="title_edit_properties">Modifica le proprietà</string>
     <string name="title_edit_rules">Modifica le regole</string>
     <string name="title_execute_rules">Esegui le regole</string>
@@ -1369,9 +1371,9 @@
     <string name="title_ask_show_html">Mostrare il messaggio originale potrebbe causare una fuga di informazioni sensibili sulla privacy</string>
     <string name="title_ask_show_html_remark">Mostrare il messaggio originale su uno sfondo scuro è impossibile poiché potrebbe rendere i testi e le immagini scuri invisibili</string>
     <string name="title_ask_show_html_images">Mostra sempre le immagini mostrando i messaggi originali</string>
-    <string name="title_ask_show_html_always">Mostra i messaggi originali di default</string>
+    <string name="title_ask_show_html_always">Mostra sempre i messaggi originali</string>
     <string name="title_ask_show_image">Mostrare le immagini potrebbe causare una fuga di informazioni sensibili sulla privacy</string>
-    <string name="title_ask_show_images_always">Mostra le immagini di default</string>
+    <string name="title_ask_show_images_always">Mostra sempre le immagini</string>
     <string name="title_ask_show_image_hint">Le immagini riconosciute come di monitoraggio non saranno mostrate</string>
     <string name="title_ask_show_amp">Mostrare la variante AMP del messaggio?</string>
     <string name="title_ask_show_amp_hint">I messaggi AMP sono progettati per esser dinamici e interagire con l\'Internet e possono dunque, per definizione, esser usati per monitorarti</string>
@@ -1389,10 +1391,10 @@
     <string name="title_third_party">Stai usando una versione di terze parti</string>
     <string name="title_expand_warning">Espandere questo messaggio scaricherà %1$s</string>
     <string name="title_download_message">Scaricando&#8230;</string>
-    <string name="title_reformatted">        Questa è la visualizzazione di messaggio sicuro e riformattato.
+    <string name="title_reformatted">        Questa è la visualizzazione sicura del messaggio riformattato.
         Puoi toccare l\'icona &#x26F6; per visualizzare il messaggio originale meno sicuro e nascondere questo.
         La riformattazione dei messaggi richiede un po\' di tempo, in base alla dimensione del messaggio e alla velocità del tuo dispositivo.
-        A volte, il messaggio originale deve essere visualizzato per vedere i codici QR.
+        A volte il messaggio originale deve essere visualizzato per vedere i codici QR.
     </string>
     <string name="title_compose">Scrivi</string>
     <string name="title_submitter">Inviato da:</string>
@@ -1545,7 +1547,7 @@
     <string name="title_dsn_reminder">Gli hard bounce danneggiano la reputazione dell\'email del mittente originale!</string>
     <string name="title_size_reminder">Messaggio (%1$s) più grande del limite del server (%2$s)</string>
     <string name="title_attachments_missing">Non tutti gli allegati sono stati scaricati</string>
-    <string name="title_download_attachments">Scarica allegati</string>
+    <string name="title_download_attachments">Scarica gli allegati</string>
     <string name="title_attachments_download">Allegati scaricati: %1$s</string>
     <string name="title_attachments_no_download">Questo non sarà più mostrato e gli allegati non saranno più scaricati automaticamente</string>
     <string name="title_dialog_hint">Questa finestra è riabilitabile tramite il menu a tre puntini nella barra d\'azione superiore</string>
@@ -2322,8 +2324,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Nessuna</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Striscia</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Punto</item>
+        <item>Striscia</item>
+        <item>Punto</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index f5210f6708..844477bf44 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -549,7 +549,7 @@
     <string name="title_advanced_threading_unread">הצגת מספר ההודעות שלא נקראו בדיונים</string>
     <string name="title_advanced_indentation">הזחה שמאלית/ימנית להודעות שהתקבלו/נשלחו בדיונים</string>
     <string name="title_advanced_highlight_unread">הדגשת הודעות שלא נקראו</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">הצגת פס או נקודת צבע</string>
+    <string name="title_advanced_account_color">הצגת פס או נקודת צבע</string>
     <string name="title_advanced_color_stripe_wide">להשתמש בפס צבע רחב</string>
     <string name="title_advanced_avatars">הצגת תמונות אנשי קשר</string>
     <string name="title_advanced_bimi">הצגת בוררי מיתוג לזיהוי הודעה (BIMI)</string>
@@ -2344,8 +2344,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>בלי</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">פס</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">נקודה</item>
+        <item>פס</item>
+        <item>נקודה</item>
     </string-array>
     <string-array name="contactTypes">
         <item>נמען</item>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ee6edd1101..10361e857f 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -2305,8 +2305,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>なし</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>宛先</item>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index fe00ddb415..948d4e228c 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1692,8 +1692,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>없음</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>받는사람</item>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 8b36a1ccf3..25d8c2f36e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1512,8 +1512,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ingen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b7d6dbb049..caf7cebe87 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -418,6 +418,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_prefix_count">Aantal toevoegen aan antwoord voorvoegsel</string>
     <string name="title_advanced_separate_reply">Voeg een horizontale lijn in voor een antwoord/doorsturen kop</string>
     <string name="title_advanced_extended_reply">Gebruik uitgebreide kop bij antwoorden/doorsturen</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Antwoord/doorsturen sjabloon</string>
     <string name="title_advanced_write_above">Schrijf boven de tekst van de afzender</string>
     <string name="title_advanced_write_below">Schrijf onder de tekst van de afzender</string>
     <string name="title_advanced_quote_reply">Haal beantwoorde tekst aan</string>
@@ -519,7 +520,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_threading_unread">Toon aantal ongelezen berichten in gesprekken</string>
     <string name="title_advanced_indentation">Links/rechts inspringen van ontvangen/verzonden berichten in gesprekken</string>
     <string name="title_advanced_highlight_unread">Ongelezen berichten markeren</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Een kleurenstreep of kleurstip weergeven</string>
+    <string name="title_advanced_account_color">Een kleurenstreep of kleurstip weergeven</string>
     <string name="title_advanced_color_stripe_wide">Gebruik brede kleurenstreep</string>
     <string name="title_advanced_avatars">Toon foto\'s contacten</string>
     <string name="title_advanced_bimi">Toon Brand Indicators for Message Identification (BIMI)</string>
@@ -841,6 +842,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_send_reminders_hint">Toon een waarschuwing wanneer de berichttekst of het onderwerp leeg is of wanneer een bijlage zou kunnen ontbreken</string>
     <string name="title_advanced_reply_move_hint">De e-mailserver kan de berichten nog steeds toevoegen aan de map met verzonden berichten</string>
     <string name="title_advanced_compose_color_hint">Zeer lichte of zeer donkere kleuren leiden tot onleesbare berichten aan de kant van de ontvanger</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML is toegestaan. Beschikbare plaatsvervangers: %1$s</string>
     <string name="title_advanced_write_below_hint">Een ontvanger mist mogelijk uw antwoord, bijvoorbeeld wanneer een langer bericht wordt ingekort</string>
     <string name="title_advanced_attach_new_hint">Voeg anders gedeelde adressen of bestanden toe aan het huidige conceptbericht</string>
     <string name="title_advanced_usenet_hint">Voeg \'-- \' in tussen de tekst en de handtekening</string>
@@ -2307,8 +2309,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     </string-array>
     <string-array name="accountColorNames">
         <item>Geen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Streep</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Stip</item>
+        <item>Streep</item>
+        <item>Stip</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Ontvanger</item>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 9b03e4aaff..507c1802c3 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -1512,8 +1512,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ingen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 8b36a1ccf3..25d8c2f36e 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -1512,8 +1512,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ingen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index 5011371970..df6d0220ce 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -946,8 +946,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>କିଛି ନୁହେଁ</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>ପ୍ରାପ୍ତେସୁ</item>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index edd89b034c..1e6c1ece98 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -447,6 +447,7 @@
     <string name="title_advanced_prefix_count">Dodaj liczbę do prefiksu odpowiedzi</string>
     <string name="title_advanced_separate_reply">Wstaw poziomą linię przed nagłówkiem odpowiedzi/przekazania</string>
     <string name="title_advanced_extended_reply">Użyj rozszerzonego nagłówka odpowiedzi/przesyłania dalej</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Odpowiedz/przekaż nagłówek szablonu</string>
     <string name="title_advanced_write_above">Napisz powyżej tekstu nadawcy</string>
     <string name="title_advanced_write_below">Napisz poniżej tekstu nadawcy</string>
     <string name="title_advanced_quote_reply">Cytuj treść w odpowiedzi</string>
@@ -548,7 +549,7 @@
     <string name="title_advanced_threading_unread">Pokaż liczbę nieprzeczytanych wiadomości w konwersacjach</string>
     <string name="title_advanced_indentation">Otrzymane/wysłane wiadomości z lewej/prawej strony konwersacji</string>
     <string name="title_advanced_highlight_unread">Podświetl nieprzeczytane wiadomości</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Pokaż kolorowy pasek lub kolorową kropkę</string>
+    <string name="title_advanced_account_color">Pokaż kolorowy pasek lub kolorową kropkę</string>
     <string name="title_advanced_color_stripe_wide">Użyj szerokiego kolorowego paska</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_bimi">Pokazuj \"Brand Indicators for Message Identification (BIMI)\"</string>
@@ -871,6 +872,7 @@
     <string name="title_advanced_send_reminders_hint">Pokaż ostrzeżenie, gdy tekst wiadomości lub temat jest pusty lub gdy może brakować załącznika</string>
     <string name="title_advanced_reply_move_hint">Serwer e-mail może nadal dodawać wiadomości do folderu wysłanych wiadomości</string>
     <string name="title_advanced_compose_color_hint">Bardzo jasne lub bardzo ciemne kolory spowodują, że wiadomości po stronie odbiorcy będą nieczytelne</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML jest dozwolony. Dostępne symbole zastępcze: %1$s</string>
     <string name="title_advanced_write_below_hint">Odbiorca może przegapić Twoją odpowiedź, np. gdy dłuższa wiadomość zostanie skrócona</string>
     <string name="title_advanced_attach_new_hint">W innym przypadku dodaj udostępniane adresy lub pliki do aktualnej wersji roboczej wiadomości</string>
     <string name="title_advanced_usenet_hint">Wstaw \'-- \' między tekstem a podpisem</string>
@@ -2347,8 +2349,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Żaden</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Pasek</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Kropka</item>
+        <item>Pasek</item>
+        <item>Kropka</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Adresat</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b3e3b2ac16..0ae96bea00 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -520,7 +520,7 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensagens não lidas nas conversas</string>
     <string name="title_advanced_indentation">Indentatação esquerda/direita para mensagens recebido/enviado em conversas</string>
     <string name="title_advanced_highlight_unread">Destacar mensagens não lidas</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Mostrar uma faixa colorida ou um ponto colorido</string>
+    <string name="title_advanced_account_color">Mostrar uma faixa colorida ou um ponto colorido</string>
     <string name="title_advanced_color_stripe_wide">Use faixa de cores largas</string>
     <string name="title_advanced_avatars">Mostrar fotos de contatos</string>
     <string name="title_advanced_bimi">Mostrar Indicadores de Marca para Identificação de Mensagens (BIMI)</string>
@@ -2317,8 +2317,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Nenhuma</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Listra</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Ponto</item>
+        <item>Listra</item>
+        <item>Ponto</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatário</item>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ce25f1c548..4551dc3676 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -522,7 +522,7 @@
     <string name="title_advanced_threading_unread">Mostrar número de mensagens não lidas nas conversas</string>
     <string name="title_advanced_indentation">Indentação esquerda/direita para mensagens recebidas/enviadas em conversas</string>
     <string name="title_advanced_highlight_unread">Destacar mensagens não lidas</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Mostrar uma faixa de cor ou ponto de cor</string>
+    <string name="title_advanced_account_color">Mostrar uma faixa de cor ou ponto de cor</string>
     <string name="title_advanced_color_stripe_wide">Usar ampla faixa de cores</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_bimi">Mostrar indicadores de marca para identificação da mensagem (BIMI)</string>
@@ -2315,8 +2315,8 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     </string-array>
     <string-array name="accountColorNames">
         <item>Nenhuma</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Lista</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Ponto</item>
+        <item>Lista</item>
+        <item>Ponto</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatário</item>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5d36c9f6e0..bd0c549b5a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -534,7 +534,7 @@
     <string name="title_advanced_threading_unread">Arată numărul de mesaje necitite în conversații</string>
     <string name="title_advanced_indentation">Aliniere mesaje primite/trimise în stânga/dreapta în conversații</string>
     <string name="title_advanced_highlight_unread">Evidențiază mesajele necitite</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Arată o bandă de culoare sau un punct de culoare</string>
+    <string name="title_advanced_account_color">Arată o bandă de culoare sau un punct de culoare</string>
     <string name="title_advanced_color_stripe_wide">Utilizați bandă largă de culoare</string>
     <string name="title_advanced_avatars">Arată pozele contactelor</string>
     <string name="title_advanced_bimi">Arată Brand Indicators for Message Identification (BIMI)</string>
@@ -2332,8 +2332,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Fără</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Benzi</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Punct</item>
+        <item>Benzi</item>
+        <item>Punct</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatar</item>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 5672f6b332..ac66e5ad91 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -548,7 +548,7 @@
     <string name="title_advanced_threading_unread">Показывать количество непрочитанных сообщений в диалогах</string>
     <string name="title_advanced_indentation">Левый/правый отступ для полученных/отправленных сообщений в диалогах</string>
     <string name="title_advanced_highlight_unread">Выделять непрочитанные сообщения</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Показывать цветные полоски или точки</string>
+    <string name="title_advanced_account_color">Показывать цветные полоски или точки</string>
     <string name="title_advanced_color_stripe_wide">Использовать широкий диапазон цветов</string>
     <string name="title_advanced_avatars">Показывать фотографии контакта</string>
     <string name="title_advanced_bimi">Показывать индикаторы бренда для идентификации сообщений (BIMI)</string>
@@ -2351,8 +2351,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ничего</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Полоска</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Точка</item>
+        <item>Полоска</item>
+        <item>Точка</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Получатель</item>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 8911e9e7c4..a930efaa5b 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -2158,8 +2158,8 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     </string-array>
     <string-array name="accountColorNames">
         <item>Nič</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Adresát</item>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index d6379ce7f3..d6a8286f1d 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -2067,8 +2067,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Brez</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Prejemnik</item>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 1d434f08ad..eed7453527 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -1104,8 +1104,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ниједно</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Прималац</item>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 8753fb2944..194624408e 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -517,7 +517,7 @@
     <string name="title_advanced_threading_unread">Visa antal olästa meddelanden i konversationer</string>
     <string name="title_advanced_indentation">Vänster/höger indrag mottaget/skickade meddelanden i konversationer</string>
     <string name="title_advanced_highlight_unread">Markera olästa meddelanden</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Visa en färgrand eller färgpunkt</string>
+    <string name="title_advanced_account_color">Visa en färgrand eller färgpunkt</string>
     <string name="title_advanced_color_stripe_wide">Använd bred färgrand</string>
     <string name="title_advanced_avatars">Visa kontaktfoton</string>
     <string name="title_advanced_bimi">Visa varumärkesindikatorer för meddelandeidentifiering (BIMI)</string>
@@ -2300,8 +2300,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Ingen</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Färgrand</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Punkt</item>
+        <item>Färgrand</item>
+        <item>Punkt</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Mottagare</item>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index edd89b034c..1e6c1ece98 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -447,6 +447,7 @@
     <string name="title_advanced_prefix_count">Dodaj liczbę do prefiksu odpowiedzi</string>
     <string name="title_advanced_separate_reply">Wstaw poziomą linię przed nagłówkiem odpowiedzi/przekazania</string>
     <string name="title_advanced_extended_reply">Użyj rozszerzonego nagłówka odpowiedzi/przesyłania dalej</string>
+    <string name="title_advanced_template_reply" comment="title_advanced_template_reply&#10;Title for an option in the send settings tab page for defining a template of the reply header">Odpowiedz/przekaż nagłówek szablonu</string>
     <string name="title_advanced_write_above">Napisz powyżej tekstu nadawcy</string>
     <string name="title_advanced_write_below">Napisz poniżej tekstu nadawcy</string>
     <string name="title_advanced_quote_reply">Cytuj treść w odpowiedzi</string>
@@ -548,7 +549,7 @@
     <string name="title_advanced_threading_unread">Pokaż liczbę nieprzeczytanych wiadomości w konwersacjach</string>
     <string name="title_advanced_indentation">Otrzymane/wysłane wiadomości z lewej/prawej strony konwersacji</string>
     <string name="title_advanced_highlight_unread">Podświetl nieprzeczytane wiadomości</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Pokaż kolorowy pasek lub kolorową kropkę</string>
+    <string name="title_advanced_account_color">Pokaż kolorowy pasek lub kolorową kropkę</string>
     <string name="title_advanced_color_stripe_wide">Użyj szerokiego kolorowego paska</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_bimi">Pokazuj \"Brand Indicators for Message Identification (BIMI)\"</string>
@@ -871,6 +872,7 @@
     <string name="title_advanced_send_reminders_hint">Pokaż ostrzeżenie, gdy tekst wiadomości lub temat jest pusty lub gdy może brakować załącznika</string>
     <string name="title_advanced_reply_move_hint">Serwer e-mail może nadal dodawać wiadomości do folderu wysłanych wiadomości</string>
     <string name="title_advanced_compose_color_hint">Bardzo jasne lub bardzo ciemne kolory spowodują, że wiadomości po stronie odbiorcy będą nieczytelne</string>
+    <string name="title_advanced_template_reply_hint" comment="title_advanced_template_reply_hint&#10;Remarks for an option in the send settings tab page for defining a template of the reply header">HTML jest dozwolony. Dostępne symbole zastępcze: %1$s</string>
     <string name="title_advanced_write_below_hint">Odbiorca może przegapić Twoją odpowiedź, np. gdy dłuższa wiadomość zostanie skrócona</string>
     <string name="title_advanced_attach_new_hint">W innym przypadku dodaj udostępniane adresy lub pliki do aktualnej wersji roboczej wiadomości</string>
     <string name="title_advanced_usenet_hint">Wstaw \'-- \' między tekstem a podpisem</string>
@@ -2347,8 +2349,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Żaden</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Pasek</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Kropka</item>
+        <item>Pasek</item>
+        <item>Kropka</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Adresat</item>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index d8c7d115ad..b14557f7e5 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -2305,8 +2305,8 @@ Bu işlem başarısız olabileceği için eski mesaj çöp kutusuna taşınacak.
     </string-array>
     <string-array name="accountColorNames">
         <item>Şifreleme kapalı</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Alıcı</item>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 800a2ab49b..9f91acbd6d 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -549,7 +549,7 @@
     <string name="title_advanced_threading_unread">Показувати кількість непрочитаних повідомлень у розмовах</string>
     <string name="title_advanced_indentation">Відступати ліворуч чи праворуч для отриманих або надісланих повідомлень у розмовах</string>
     <string name="title_advanced_highlight_unread">Підсвічувати непрочитані повідомлення</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">Показувати кольорову смугу або кольорову крапку</string>
+    <string name="title_advanced_account_color">Показувати кольорову смугу або кольорову крапку</string>
     <string name="title_advanced_color_stripe_wide">Використовувати широку кольорову смугу</string>
     <string name="title_advanced_avatars">Показувати фото контактів</string>
     <string name="title_advanced_bimi">Показувати індикатори брендів для ідентифікації повідомлень (BIMI)</string>
@@ -2349,8 +2349,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Нічого</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Смуга</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Крапка</item>
+        <item>Смуга</item>
+        <item>Крапка</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Одержувач</item>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 30b42ecba5..aa393f45a4 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1914,8 +1914,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>Không có</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>Người nhận</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4620618950..018c5eaa8f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -506,7 +506,7 @@
     <string name="title_advanced_threading_unread">显示对话中未读邮件数</string>
     <string name="title_advanced_indentation">在对话中向左/向右缩进已收到/发送的邮件</string>
     <string name="title_advanced_highlight_unread">高亮未读邮件</string>
-    <string name="title_advanced_account_color" comment="title_advanced_account_color&#10;Title for an option in the display settings tab page to select none, color stripe or color dot">显示颜色条纹或颜色点</string>
+    <string name="title_advanced_account_color">显示颜色条纹或颜色点</string>
     <string name="title_advanced_color_stripe_wide">使用宽色条</string>
     <string name="title_advanced_avatars">显示联系人头像</string>
     <string name="title_advanced_bimi">显示消息识别的品牌指示器 (BIMI)</string>
@@ -2299,8 +2299,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>无</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">条纹</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">点</item>
+        <item>条纹</item>
+        <item>点</item>
     </string-array>
     <string-array name="contactTypes">
         <item>收件人</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 17afde58c5..ba1efa5c77 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2057,8 +2057,8 @@
     </string-array>
     <string-array name="accountColorNames">
         <item>無</item>
-        <item comment="accountColorNames&#10;Title for selecting a color stripe (display-settings tab page)">Stripe</item>
-        <item comment="accountColorNames&#10;Title for selecting a color dot (display-settings tab page)">Dot</item>
+        <item>Stripe</item>
+        <item>Dot</item>
     </string-array>
     <string-array name="contactTypes">
         <item>接收者</item>