diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 9d433a4249..ddcb517ae8 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -72,6 +72,9 @@
     </plurals>
     <string name="title_ask_spam_who">%1$s göndərən mesaj spam hesab edilsin?</string>
     <string name="title_junk_hint">Spamların filtrlənməsinə görə e-poçt təchizatçınız məsuliyyət daşıyır. Bir e-poçt tətbiqi, bunu təhlükəsiz olaraq etmək üçün lazım olan bütün verilənlərə sahib deyil.</string>
+    <string name="title_junk_pop_hint">        Əngəllənmiş göndərənlərdən gələn mesajlar endirilməyəcək.
+        \"Mesajları serverdə burax\" seçimi fəal deyilsə, bu mesajlar birdəfəlik itəcək!
+    </string>
     <string name="title_block">%1$s əngəllə</string>
     <string name="title_block_sender">Göndərəni əngəllə</string>
     <string name="title_block_sender_domain">\"%1$s\" domenini əngəllə</string>
@@ -156,6 +159,7 @@
     <string name="title_setup_gmail_password">Bir hesaba bir şifrə ilə səlahiyyət vermək istəyirəm</string>
     <string name="title_setup_office_auth">\'AUTHENTICATE failed\' xətası, sistem administratorunun IMAP/SMTP-ni sıradan çıxartdığı üçün baş verə bilər</string>
     <string name="title_setup_oauth_rationale">%1$s hesabınıza müraciət üçün səlahiyyət verin</string>
+    <string name="title_setup_oauth_update">Mövcud bir hesaba yenidən səlahiyyət verin (əks halda yeni bir hesab yaradın)</string>
     <string name="title_setup_oauth_updated">Hesab səlahiyyətləndirmə yeniləndi</string>
     <string name="title_setup_oauth_authorize">Səlahiyyət ver</string>
     <string name="title_setup_select_account">Hesab seç</string>
@@ -848,6 +852,7 @@
     <string name="title_edit_contact">Əlaqəyə düzəliş et</string>
     <string name="title_contact_email">E-poçt</string>
     <string name="title_contact_name">Ad</string>
+    <string name="title_contact_group">Qrup</string>
     <string name="title_import_contacts"> vCard-ları idxal et</string>
     <string name="title_export_contacts">vCard-ları ixrac et</string>
     <string name="title_create_sub_folder">Alt qovluq yarat</string>
@@ -975,6 +980,7 @@
     <string name="title_eml_remark">Mesajları yönləndirmək üçün, xam (orijinal) mesajlar, e-poçt serverindən endirilməlidir. Bu, internet bağlantısı tələb edir və mesajlar, e-poçt serverdə saxlanılacaq.</string>
     <string name="title_eml_option">Bunun qarşısı, bağlantı tənzimləmələrində xam mesajlarının endirilməsi həmişəlik fəallaşdırılaraq alına bilər</string>
     <string name="title_eml_downloaded">Xam mesajlar endirildi: %1$s</string>
+    <string name="title_auto_confirm">Bir neçə saniyə sonra avtomatik təsdiqlənsin</string>
     <string name="title_buttons">Düymələri seçin</string>
     <string name="title_buttons_hint">Aktual əməliyyatlar, hesab növündən və konfiqurasiyadan asılıdır</string>
     <string name="title_button_search">Mesajlarda axtar</string>
@@ -1369,6 +1375,7 @@
     <string name="title_rule_answer_subject">Şablon adını mövzu olaraq istifadə et</string>
     <string name="title_rule_original_text">Orijinal mesaj mətnini daxil et</string>
     <string name="title_rule_forward_to">Yönləndir</string>
+    <string name="title_rule_resend">Təkrar göndər</string>
     <string name="title_rule_cc">CC ünvanlarını cavabla</string>
     <string name="title_rule_with_attachments">Qoşmalar ilə</string>
     <string name="title_rule_answer_remark">Cavab dövrlərinin qarşısını almaq üçün istənilən danışıq üçün yalnız bir cavab göndəriləcək</string>
@@ -1836,9 +1843,9 @@
         <item>Çox böyük</item>
     </string-array>
     <string-array name="contactTypes">
-        <item>Alan</item>
+        <item>Alıcı</item>
         <item>Göndərən</item>
         <item>Əngəlləndi</item>
-        <item>Not blocked</item>
+        <item>Əngəllənmədi</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 53d2812394..89a874e556 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -990,7 +990,7 @@
     <string name="title_eml_remark">Za prosljeđivanje poruka, izvorne (raw) poruke se trebaju prvo preuzeti s e-mail servera. Ovo zahtijeva internet konekciju i poruke se još uvijek moraju čuvati na e-mail serveru.</string>
     <string name="title_eml_option">Ovo se može spriječiti uključivanjem opcije \'uvijek preuzimaj datoteke raw poruka\' u postavkama konekcije</string>
     <string name="title_eml_downloaded">Preuzetih raw poruka: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Automatski potvrdi nakon par sekundi</string>
+    <string name="title_auto_confirm">Automatski potvrdi nakon par sekundi</string>
     <string name="title_buttons">Izaberi dugmad</string>
     <string name="title_buttons_hint">Aktualne radnje su dostupne u zavisnosti od vrste i podešavanja računa</string>
     <string name="title_button_search">Pretraži u porukama</string>
@@ -1145,6 +1145,7 @@
     <string name="title_style_font_default">Zadani</string>
     <string name="title_style_blockquote">Blokiraj citate</string>
     <string name="title_style_indentation">Uvlačenje</string>
+    <string name="title_style_mark">Markiraj</string>
     <string name="title_style_strikethrough">Precrtano</string>
     <string name="title_style_clear">Očisti formatiranje</string>
     <string name="title_style_link">Ubaci link</string>
@@ -1385,6 +1386,7 @@
     <string name="title_rule_answer_subject">Koristi naziv šablona kao predmet</string>
     <string name="title_rule_original_text">Uvrsti tekst izvorne poruke</string>
     <string name="title_rule_forward_to">Proslijedi za</string>
+    <string name="title_rule_resend">Ponovljeno slanje</string>
     <string name="title_rule_cc">Odgovori na CC adrese</string>
     <string name="title_rule_with_attachments">S prilozima</string>
     <string name="title_rule_answer_remark">Samo jedan odgovor će se poslati za bilo koju konverzaciju, radi sprječavanja zapetljavanja odgovora</string>
@@ -1538,6 +1540,7 @@
     <string name="title_hint_support">Ukoliko imate pitanje ili problem, molimo da koristite meni za podršku i pomoć</string>
     <string name="title_hint_message_actions">Prevucite lijevo za otpad; Prevucite desno za arhiviranje (ukoliko postoji); Radnje prevlačenja mogu se podesiti u postavkama računa</string>
     <string name="title_hint_message_selection">Dugim dodirom na poruku pokreće se višestruko označavanje poruka; Držite i prevlačite gore ili dolje za označavanje više poruka</string>
+    <string name="title_hint_message_junk">Ove poruke su u spam folderu na e-mail serveru. Očigledno, aplikacija ne može spriječiti spam poruke da Vam se ne šalju.</string>
     <string name="title_hint_important">Važno</string>
     <string name="title_hint_sync">Preuzimanje poruka može potrajati neko vrijeme, a to zavisi od brzine provajdera, internet konekcije, samog uređaja te broja poruka. Prilikom preuzimanja poruka aplikacija će možda sporije reagovati.</string>
     <string name="title_hint_sync_note">Po zadanom, sve poruke neće biti preuzete da bi se ograničili zauzeće prostora, potrošnja baterije i podataka. Ovo možete promijeniti dugim dodirom na folder sa spiska i biranjem opcije \'Sinhronizuj više\'.</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 0e2577a7e6..40ee3f0509 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1389,6 +1389,7 @@
     <string name="title_rule_answer_subject">Použít název šablony jako předmět</string>
     <string name="title_rule_original_text">Zahrnout text původní zprávy</string>
     <string name="title_rule_forward_to">Přeposlat na</string>
+    <string name="title_rule_resend">Odeslat znovu</string>
     <string name="title_rule_cc">Odpovědět na adresy kopie</string>
     <string name="title_rule_with_attachments">S přílohami</string>
     <string name="title_rule_answer_remark">Aby se zabránilo smyčkám odpovědí, bude na každou konverzaci odeslána pouze jedna odpověď</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 8acd5f7c12..0a1bc91ef3 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -980,7 +980,7 @@
     <string name="title_eml_remark">Beskedvideresendelse kræver download af de rå (originale) beskeder fra e-mailserveren. Dette kræver Internetforbindelse, og beskederne skal stadig lagres på e-mailserveren.</string>
     <string name="title_eml_option">Dette kan forhindres ved i forbindelsesindstillingerne at aktivere Download altid rå beskedfiler</string>
     <string name="title_eml_downloaded">Rå beskeder downloadet: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Auto-bekræft efter et par sekunder</string>
+    <string name="title_auto_confirm">Auto-bekræft efter et par sekunder</string>
     <string name="title_buttons">Vælg knapper</string>
     <string name="title_buttons_hint">De faktisk tilgængelige handlinger afhænger af kontotype og opsætning</string>
     <string name="title_button_search">Søg i beskeder</string>
@@ -1135,6 +1135,7 @@
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Blokcitat</string>
     <string name="title_style_indentation">Indrykning</string>
+    <string name="title_style_mark">Særlige punkter</string>
     <string name="title_style_strikethrough">Gennemstreget</string>
     <string name="title_style_clear">Ryd formatering</string>
     <string name="title_style_link">Indsæt link</string>
@@ -1375,6 +1376,7 @@
     <string name="title_rule_answer_subject">Brug skabelonnavn som emne</string>
     <string name="title_rule_original_text">Medtag oprindelig beskedtekst</string>
     <string name="title_rule_forward_to">Videresend til</string>
+    <string name="title_rule_resend">Send igen</string>
     <string name="title_rule_cc">Svar til Cc-adresser</string>
     <string name="title_rule_with_attachments">Med vedhæftninger</string>
     <string name="title_rule_answer_remark">For at undgå svarsløjfer, sendes kun ét svar til en given samtale</string>
@@ -1528,6 +1530,7 @@
     <string name="title_hint_support">Har du et spørgsmål eller problem, så benyt venligst supportmenuen for at få hjælp</string>
     <string name="title_hint_message_actions">Stryg til venstre for Papirkurv; Stryg til højre for at arkivere (hvis tilgængeligt); Strygehandlingerne kan opsættes i kontoindstillingerne</string>
     <string name="title_hint_message_selection">Langt tryk på en besked for at tilgå valg af flere beskeder; Hold og stryg op/ned for at vælge flere beskeder</string>
+    <string name="title_hint_message_junk">Disse beskeder befinder i e-mailserverens Spam-mappen. Appen ikke selvfølgelig ikke forhindre, at nogen sender dig spambeskeder.</string>
     <string name="title_hint_important">Vigtigt</string>
     <string name="title_hint_sync">Download af beskeder kan tage noget tid afhængigt af hastigheden hos udbyderen, dataforbindelsen, enheden samt beskedantallet. Under besked-download kan app\'en muligvis reagerer langsommere.</string>
     <string name="title_hint_sync_note">For at begrænse lagerplads- samt batteri- og dataforbrug, downloades ikke alle beskeder som standard. Dette kan ændres med at langt tryk på en mappe i mappelisten, vælg dernæst \'Synkronisér flere\'.</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index af70c4ca8c..3789b8c3b8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -976,7 +976,7 @@
     <string name="title_eml_remark">Um Nachrichten weiterzuleiten, müssen die ursprünglichen Nachrichten vom E-Mail-Server heruntergeladen werden. Dazu ist eine Internetverbindung erforderlich und die Nachrichten müssen noch auf dem E-Mail-Server verfügbar sein.</string>
     <string name="title_eml_option">Das kann verhindert werden, indem in den Verbindungseinstellungen „Rohnachrichtendateien herunterladen“ eingeschaltet wird</string>
     <string name="title_eml_downloaded">Rohnachrichten heruntergeladen: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Nach ein paar Sekunden automatisch bestätigen</string>
+    <string name="title_auto_confirm">Nach ein paar Sekunden automatisch bestätigen</string>
     <string name="title_buttons">Schaltflächen auswählen</string>
     <string name="title_buttons_hint">Die aktuell möglichen Aktionen hängen vom Kontotyp und der Konfiguration ab</string>
     <string name="title_button_search">In Nachrichten suchen</string>
@@ -1129,6 +1129,7 @@
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Zitatblock</string>
     <string name="title_style_indentation">Einrückung</string>
+    <string name="title_style_mark">Hervorheben</string>
     <string name="title_style_strikethrough">Durchgestrichen</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link einfügen</string>
@@ -1370,6 +1371,7 @@
     <string name="title_rule_answer_subject">Namen der Vorlage als Betreff verwenden</string>
     <string name="title_rule_original_text">Ursprünglichen Nachrichtentext einschließen</string>
     <string name="title_rule_forward_to">Weiterleiten an</string>
+    <string name="title_rule_resend">Umleiten</string>
     <string name="title_rule_cc">Den CC-Adressen antworten</string>
     <string name="title_rule_with_attachments">Mit Anhängen</string>
     <string name="title_rule_answer_remark">Für jede Unterhaltung wird per Antwortregel nur eine Antwort gesendet, um Antwortschleifen zu vermeiden</string>
@@ -1523,6 +1525,7 @@
     <string name="title_hint_support">Wenn Sie eine Frage oder ein Problem haben, verwenden Sie bitte die Hilfe im Menü</string>
     <string name="title_hint_message_actions">Standard: Wische links zum Papierkorb; Wische rechts zum Archiv (falls verfügbar); Diese Wischgesten können aber in den Kontoeinstellungen auch individuell anders konfiguriert werden</string>
     <string name="title_hint_message_selection">Um mehrere Nachrichten auszuwählen, drücken Sie zunächst lange auf eine Nachricht, halten und wischen Sie sodann nach oben oder unten, um weitere Nachrichten auszuwählen</string>
+    <string name="title_hint_message_junk">Diese Nachrichten wurden im Spam-Ordner des E-Mail-Servers abgelegt. Allerdings kann die App nicht verhindern, dass Ihnen Spam-Nachrichten gesendet werden.</string>
     <string name="title_hint_important">Wichtig</string>
     <string name="title_hint_sync">Das Herunterladen von E-Mails kann einige Zeit in Anspruch nehmen, abhängig von der Geschwindigkeit des Providers, der Internetverbindung, des Gerätes und von der Anzahl der E-Mails. Beim Herunterladen der E-Mails kann die App träge reagieren.</string>
     <string name="title_hint_sync_note">Standardmäßig werden nicht alle Nachrichten heruntergeladen, um den Speicherplatz und die Akku- und Datennutzung zu begrenzen. Sie können das ändern, indem Sie einen Ordner in der Ordnerliste lange drücken und »Weitere Nachrichten synchronisieren« auswählen.</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 26ebc2b64a..56722d248a 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -976,7 +976,7 @@
     <string name="title_eml_remark">Για να προωθήσετε μηνύματα, τα ακατέργαστα (αρχικά) μηνύματα πρέπει να κατέβουν από τον διακομιστή ηλεκτρονικού ταχυδρομείου. Απαιτείται σύνδεση στο διαδίκτυο για αυτό και τα μηνύματα πρέπει να εξακολουθούν να είναι αποθηκευμένα στον διακομιστή ηλ. ταχυδρομείου.</string>
     <string name="title_eml_option">Αυτό μπορεί να αποφευχθεί, ενεργοποιώντας να γίνεται πάντα λήψη των αρχείων αρχικών μηνυμάτων στις ρυθμίσεις σύνδεσης</string>
     <string name="title_eml_downloaded">Αρχικά μηνύματα που κατέβηκαν: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Αυτόματη επιβεβαίωση μετά από μερικά δευτερόλεπτα</string>
+    <string name="title_auto_confirm">Αυτόματη επιβεβαίωση μετά από μερικά δευτερόλεπτα</string>
     <string name="title_buttons">Επιλέξτε κουμπιά</string>
     <string name="title_buttons_hint">Οι όντως διαθέσιμες ενέργειες εξαρτώνται από τον τύπο και τη ρύθμιση του λογαριασμού</string>
     <string name="title_button_search">Αναζήτηση στα μηνύματα</string>
@@ -1129,6 +1129,7 @@
     <string name="title_style_font_default">Προεπιλογή</string>
     <string name="title_style_blockquote">Παράθεμα με εσοχή</string>
     <string name="title_style_indentation">Εσοχή</string>
+    <string name="title_style_mark">Επισήμανση</string>
     <string name="title_style_strikethrough">Διακριτή διαγραφή</string>
     <string name="title_style_clear">Εκκαθάριση μορφοποίησης</string>
     <string name="title_style_link">Εισαγωγή συνδέσμου</string>
@@ -1369,6 +1370,7 @@
     <string name="title_rule_answer_subject">Να χρησιμοποιηθεί το όνομα του προτύπου ως θέμα</string>
     <string name="title_rule_original_text">Να συμπεριληφθεί το κείμενο του αρχικού μηνύματος</string>
     <string name="title_rule_forward_to">Προώθηση σε</string>
+    <string name="title_rule_resend">Επαναποστολή</string>
     <string name="title_rule_cc">Απάντηση στις διευθύνσεις Κοιν.</string>
     <string name="title_rule_with_attachments">Με συνημμένα</string>
     <string name="title_rule_answer_remark">Θα αποστέλλεται μόνο μία απάντηση ανά συζήτηση, για να αποφευχθεί ένας ατέρμονος κύκλος απαντήσεων</string>
@@ -1522,6 +1524,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_message_junk">Τα μηνύματα αυτά βρίσκονται στον φάκελο ανεπιθύμητων του διακομιστή ηλ. ταχυδρομείου. Προφανώς, η εφαρμογή δεν μπορεί να εμποδίσει την αποστολή ανεπιθύμητων μηνυμάτων προς εσάς.</string>
     <string name="title_hint_important">Σημαντικό</string>
     <string name="title_hint_sync">Το κατέβασμα των μηνυμάτων μπορεί να διαρκέσει κάποιο διάστημα, ανάλογα με την ταχύτητα του παρόχου, της σύνδεσης, της συσκευής και τον αριθμό των μηνυμάτων. Ενόσω κατεβαίνουν τα μηνύματα, η εφαρμογή ίσως να ανταποκρίνεται πιο αργά.</string>
     <string name="title_hint_sync_note">Από προεπιλογή, δεν θα κατέβουν όλα τα μηνύματα, για περιορισμό αποθηκευτικού χώρου και χρήσης μπαταρίας και δεδομένων. Μπορείτε να αλλάξετε αυτή τη ρύθμιση, με παρατεταμένο πάτημα πάνω σε έναν φάκελο στη λίστα φακέλων και επιλέγοντας «Συγχρονισμός περισσοτέρων».</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d5f0b0bd80..008bb3d245 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -978,7 +978,7 @@
     <string name="title_eml_remark">Para reenviar mensajes, los mensajes sin procesar (originales) deben ser descargados desde el servidor de correo electrónico. Esto requiere una conexión a Internet y los mensajes deben estar aún almacenados en el servidor de correo electrónico.</string>
     <string name="title_eml_option">Esto se puede prevenir al habilitar siempre la descarga de archivos de mensajes sin procesar en la configuración de la conexión</string>
     <string name="title_eml_downloaded">Mensajes sin procesar descargados: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmar automáticamente después de unos segundos</string>
+    <string name="title_auto_confirm">Confirmar automáticamente después de unos segundos</string>
     <string name="title_buttons">Seleccionar botones</string>
     <string name="title_buttons_hint">Las acciones disponibles dependen del tipo de cuenta y configuración</string>
     <string name="title_button_search">Buscar en mensajes</string>
@@ -1131,6 +1131,7 @@
     <string name="title_style_font_default">Por defecto</string>
     <string name="title_style_blockquote">Citar en bloque</string>
     <string name="title_style_indentation">Sangría</string>
+    <string name="title_style_mark">En destaque</string>
     <string name="title_style_strikethrough">Tachado</string>
     <string name="title_style_clear">Quitar formato</string>
     <string name="title_style_link">Insertar enlace</string>
@@ -1370,6 +1371,7 @@
     <string name="title_rule_answer_subject">Usar nombre de plantilla como asunto</string>
     <string name="title_rule_original_text">Incluir el texto del mensaje original</string>
     <string name="title_rule_forward_to">Reenviar a</string>
+    <string name="title_rule_resend">Reenviar</string>
     <string name="title_rule_cc">Responder a direcciones en CC</string>
     <string name="title_rule_with_attachments">Con adjuntos</string>
     <string name="title_rule_answer_remark">Sólo se enviará una respuesta por conversación, para evitar bucles de respuesta</string>
@@ -1523,6 +1525,7 @@
     <string name="title_hint_support">Si tiene una pregunta o problema, por favor use el menú de soporte para obtener ayuda</string>
     <string name="title_hint_message_actions">Desliza a la izquierda para enviar a la papelera; Desliza a la derecha para archivar (si está disponible); las acciones de deslizamiento pueden configurarse en la configuración de la cuenta</string>
     <string name="title_hint_message_selection">Mantenga pulsado un mensaje para empezar a seleccionar varios mensajes; mantenga pulsado y deslice hacia arriba o abajo para seleccionar más mensajes</string>
+    <string name="title_hint_message_junk">Estos mensajes están en la carpeta de correo no deseado del servidor de correo electrónico. Obviamente, la aplicación no puede evitar que se le envíen mensajes no deseados.</string>
     <string name="title_hint_important">Importante</string>
     <string name="title_hint_sync">Descargar mensajes puede llevar algún tiempo, dependiendo de la velocidad del proveedor, la conexión a internet, dispositivo y el número de mensajes. Mientras se descargan mensajes, la aplicación puede responder más lentamente.</string>
     <string name="title_hint_sync_note">Por defecto, no todos los mensajes serán descargados para limitar el uso de espacio de almacenamiento, batería y datos. Puede cambiar esto manteniendo pulsado sobre una carpeta en la lista de carpetas y seleccionando \'Sincronizar más\'.</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 0e45117c7f..f098050efd 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -675,7 +675,7 @@
     <string name="title_download_all">دانلود همه</string>
     <string name="title_save_all">ذخیره همه</string>
     <string name="title_save_eml">ذخیره پرونده خام پیام</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">پس از چند ثانیه به طور خودکار تایید کن</string>
+    <string name="title_auto_confirm">پس از چند ثانیه به طور خودکار تایید کن</string>
     <string name="title_trash">سطل آشغال</string>
     <string name="title_copy">کپی &#8230;</string>
     <string name="title_copy_to">کپی به &#8230;</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 2e92b87ac9..2578b01698 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1355,6 +1355,7 @@
     <string name="title_rule_answer_subject">Käytä viestipohjan nimeä otsikkona</string>
     <string name="title_rule_original_text">Sisällytä alkuperäinen viestin teksti</string>
     <string name="title_rule_forward_to">Lähetä edelleen vastaanottajalle</string>
+    <string name="title_rule_resend">Uudelleenlähetä</string>
     <string name="title_rule_cc">Vastaa kopio-osoitteisiin</string>
     <string name="title_rule_with_attachments">Liitteiden kanssa</string>
     <string name="title_rule_answer_remark">Vain yksi vastaus lähetetään yhteen keskusteluun, jotta voidaan välttää vastausten loputon toistaminen</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 762df603c1..b6d989bbbb 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -981,7 +981,7 @@
     <string name="title_eml_remark">Pour transférer des messages, les messages bruts (originaux) doivent être téléchargés depuis le serveur de messagerie. Ceci nécessite une connexion Internet et les messages doivent toujours être stockés sur le serveur de messagerie.</string>
     <string name="title_eml_option">Ceci peut être évité en activant le téléchargement systématique des fichiers de messages originaux dans les paramètres de connexion</string>
     <string name="title_eml_downloaded">Messages originaux téléchargés : %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmer automatiquement après quelques secondes</string>
+    <string name="title_auto_confirm">Confirmer automatiquement après quelques secondes</string>
     <string name="title_buttons">Sélectionner les boutons</string>
     <string name="title_buttons_hint">Les actions réellement disponibles dépendent du type de compte et de la configuration</string>
     <string name="title_button_search">Rechercher dans les messages</string>
@@ -1136,6 +1136,7 @@
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_blockquote">Bloc de citation</string>
     <string name="title_style_indentation">Retrait</string>
+    <string name="title_style_mark">Mettre en surbrillance</string>
     <string name="title_style_strikethrough">Barré</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
@@ -1376,6 +1377,7 @@
     <string name="title_rule_answer_subject">Utiliser le nom du modèle comme objet</string>
     <string name="title_rule_original_text">Inclure le texte du message original</string>
     <string name="title_rule_forward_to">Transférer à</string>
+    <string name="title_rule_resend">Envoyer à nouveau</string>
     <string name="title_rule_cc">Répondre aux adresses Cc</string>
     <string name="title_rule_with_attachments">Avec pièces jointes</string>
     <string name="title_rule_answer_remark">Une seule réponse par conversation sera envoyée afin d\'éviter les réponses en boucle</string>
@@ -1529,6 +1531,7 @@
     <string name="title_hint_support">Si vous avez une question ou un problème, veuillez utiliser le menu « Assistance » pour obtenir de l’aide</string>
     <string name="title_hint_message_actions">Balayer vers la gauche pour mettre à la corbeille; balayer vers la droite pour archiver (si disponible); les actions de balayage peuvent être configurées dans les paramètres du compte</string>
     <string name="title_hint_message_selection">Appuyez longuement sur un message pour activer la sélection multiple; maintenez et faites glisser vers le haut ou vers le bas pour sélectionner davantage de messages</string>
+    <string name="title_hint_message_junk">Ces messages se trouvent dans le dossier spam sur le serveur de messagerie. Évidemment, l\'application ne peut pas empêcher que des messages indésirables vous soient envoyés.</string>
     <string name="title_hint_important">Important</string>
     <string name="title_hint_sync">Le téléchargement des messages peut prendre un certain temps selon la vitesse du fournisseur, de la connexion Internet, de l’appareil ainsi que du nombre de messages. Pendant le téléchargement des messages, l’application peut répondre plus lentement.</string>
     <string name="title_hint_sync_note">Par défaut, tous les messages ne seront pas téléchargés pour limiter l\'espace de stockage et l\'utilisation de la pile et des données. Vous pouvez modifier ceci en appuyant longuement sur un dossier dans la liste des dossiers et en sélectionnant « Synchroniser plus ».</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1bc9df4033..9468e1f01a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -981,7 +981,7 @@
     <string name="title_eml_remark">Pour transférer des messages, les messages bruts (originaux) doivent être téléchargés depuis le serveur de messagerie. Ceci nécessite une connexion Internet et les messages doivent cependant être stockés sur le serveur de messagerie.</string>
     <string name="title_eml_option">Ceci peut être évité en activant le téléchargement systématique des fichiers de messages originaux dans les paramètres de connexion</string>
     <string name="title_eml_downloaded">Messages originaux téléchargés : %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmer automatiquement après quelques secondes</string>
+    <string name="title_auto_confirm">Confirmer automatiquement après quelques secondes</string>
     <string name="title_buttons">Sélectionner les boutons</string>
     <string name="title_buttons_hint">Les actions réellement disponibles dépendent du type de compte et de la configuration</string>
     <string name="title_button_search">Rechercher dans les messages</string>
@@ -1136,6 +1136,7 @@
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_blockquote">Bloc de citation</string>
     <string name="title_style_indentation">Retrait</string>
+    <string name="title_style_mark">Mettre en surbrillance</string>
     <string name="title_style_strikethrough">Barré</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
@@ -1376,6 +1377,7 @@
     <string name="title_rule_answer_subject">Utiliser le nom du modèle comme objet</string>
     <string name="title_rule_original_text">Inclure le texte du message original</string>
     <string name="title_rule_forward_to">Transférer à</string>
+    <string name="title_rule_resend">Envoyer à nouveau</string>
     <string name="title_rule_cc">Répondre aux adresses Cc</string>
     <string name="title_rule_with_attachments">Avec pièces jointes</string>
     <string name="title_rule_answer_remark">Une seule réponse par conversation sera envoyée afin d\'éviter les réponses en boucle</string>
@@ -1529,6 +1531,7 @@
     <string name="title_hint_support">Si vous avez une question ou un problème, veuillez utiliser le menu « Assistance » pour obtenir de l’aide</string>
     <string name="title_hint_message_actions">Balayez vers la gauche pour mettre à la corbeille ; balayez vers la droite pour archiver (si disponible) ; les actions de balayage peuvent être configurées dans les paramètres du compte</string>
     <string name="title_hint_message_selection">Appuyez longuement sur un message pour activer la sélection multiple ; maintenez et faites glisser vers le haut ou vers le bas pour sélectionner davantage de messages</string>
+    <string name="title_hint_message_junk">Ces messages se trouvent dans le dossier spam sur le serveur de messagerie. Évidemment, l\'application ne peut pas empêcher que des messages indésirables vous soient envoyés.</string>
     <string name="title_hint_important">Important</string>
     <string name="title_hint_sync">Le téléchargement des messages peut prendre un certain temps selon la vitesse du fournisseur, de la connexion Internet, de l’appareil ainsi que du nombre de messages. Pendant le téléchargement des messages, l’application peut répondre plus lentement.</string>
     <string name="title_hint_sync_note">Par défaut, tous les messages ne seront pas téléchargés pour limiter l\'espace de stockage et l\'utilisation de la batterie et des données. Vous pouvez modifier ceci en appuyant longuement sur un dossier dans la liste des dossiers et en sélectionnant « Synchroniser plus ».</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 2e76eb1e5b..630f927f7b 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1347,6 +1347,7 @@
     <string name="title_rule_answer_subject">Usar o nome do patrón como asunto</string>
     <string name="title_rule_original_text">Incluír o texto orixinal da mensaxe</string>
     <string name="title_rule_forward_to">Reenviar a</string>
+    <string name="title_rule_resend">Reenviar</string>
     <string name="title_rule_cc">Responder a enderezos CC</string>
     <string name="title_rule_with_attachments">Con anexos</string>
     <string name="title_rule_answer_remark">Enviarase só unha resposta para cada conversa, co fin de evitar bucles de respostas</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 8617a8e113..400939d654 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1321,6 +1321,7 @@
     <string name="title_rule_identity">Identitás</string>
     <string name="title_rule_template">Válaszsablon</string>
     <string name="title_rule_forward_to">Továbbítás neki...</string>
+    <string name="title_rule_resend">Újraküldés</string>
     <string name="title_rule_cc">Válasz a másolatok címzetteinek</string>
     <string name="title_rule_with_attachments">Mellékletekkel</string>
     <string name="title_rule_answer_remark">A válaszhurkok elkerülése érdekében minden beszélgetéshez csak egy válasz lesz elküldve</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 272c858435..32dfb21490 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1277,6 +1277,7 @@ Memformat ulang pesan perlu waktu, tergantung dari ukuran pesan dan keceoatan pe
     <string name="title_rule_identity">Identitas</string>
     <string name="title_rule_template">Balas dengan template</string>
     <string name="title_rule_forward_to">Diteruskan kepada</string>
+    <string name="title_rule_resend">Kirim ulang</string>
     <string name="title_rule_cc">Balas ke alamat CC</string>
     <string name="title_rule_with_attachments">Dengan lampiran</string>
     <string name="title_rule_answer_remark">Hanya satu balasan yang akan dikirim ke percakapan manapun, untuk menghindari berputarnya balasan</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index cb357497ed..a6b0d71e7a 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -981,7 +981,7 @@
     <string name="title_eml_remark">Per inoltrare i messaggi, quelli non elaborati (originali) devono esser scaricati dal server email. Questo richiede una connessione a Internet e i messaggi devono ancora esser memorizzati sul server email.</string>
     <string name="title_eml_option">Questo può esser impedito abilitando sempre il download dei file dei messaggi non elaborati nelle impostazioni di connessione</string>
     <string name="title_eml_downloaded">Messaggi non elaborati scaricati: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Conferma automaticamente dopo alcuni secondi</string>
+    <string name="title_auto_confirm">Conferma automaticamente dopo alcuni secondi</string>
     <string name="title_buttons">Seleziona i pulsanti</string>
     <string name="title_buttons_hint">Le azioni effettive disponibili dipendono dal tipo di profilo e dalla configurazione</string>
     <string name="title_button_search">Cerca nei messaggi</string>
@@ -1136,6 +1136,7 @@
     <string name="title_style_font_default">Predefinito</string>
     <string name="title_style_blockquote">Citazione in blocco</string>
     <string name="title_style_indentation">Rientro</string>
+    <string name="title_style_mark">Evidenzia</string>
     <string name="title_style_strikethrough">Barrato</string>
     <string name="title_style_clear">Cancella formattazione</string>
     <string name="title_style_link">Inserisci link</string>
@@ -1376,6 +1377,7 @@
     <string name="title_rule_answer_subject">Usa il nome del modello come oggetto</string>
     <string name="title_rule_original_text">Includi il testo del messaggio originale</string>
     <string name="title_rule_forward_to">Inoltra a</string>
+    <string name="title_rule_resend">Reinvia</string>
     <string name="title_rule_cc">Rispondi agli indirizzi CC</string>
     <string name="title_rule_with_attachments">Con allegati</string>
     <string name="title_rule_answer_remark">Sarà inviata solo una risposta per ogni conversazione, per evitarne ripetizioni</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 2eda1ba9a7..9bd129aa75 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -1000,6 +1000,7 @@
     <string name="title_eml_remark">כדי להעביר הודעה, יש להוריד את ההודעות (המקוריות) הגולמיות משרת הדוא״ל. פעולה זו דורשת חיבור לאינטרנט ושההודעה תהיה מאוחסת בשרת הדוא״ל.</string>
     <string name="title_eml_option">אפשר למנוע את זה באמצעות הפעלת הורדת קובצי הודעות גולמיות תמיד בהגדרות החיבור</string>
     <string name="title_eml_downloaded">הודעות גולמיות התקבלו: %1$s</string>
+    <string name="title_auto_confirm">לאשר אוטומטית לאחר מספר שניות</string>
     <string name="title_buttons">בחירת כפתורים</string>
     <string name="title_buttons_hint">הפעולות שזמינות בפועל תלויות בסוג החשבון וההגדרות</string>
     <string name="title_button_search">חיפוש בהודעות</string>
@@ -1154,6 +1155,7 @@
     <string name="title_style_font_default">ברירת מחדל</string>
     <string name="title_style_blockquote">ציטוט</string>
     <string name="title_style_indentation">הזחה</string>
+    <string name="title_style_mark">הדגשה</string>
     <string name="title_style_strikethrough">קו חוצה</string>
     <string name="title_style_clear">הסרת עיצוב</string>
     <string name="title_style_link">הוספת קישור</string>
@@ -1394,6 +1396,7 @@
     <string name="title_rule_answer_subject">להשתמש בשם התבנית כנושא</string>
     <string name="title_rule_original_text">לכלול את תוכן ההודעה המקורית</string>
     <string name="title_rule_forward_to">העברה אל</string>
+    <string name="title_rule_resend">שליחה מחדש</string>
     <string name="title_rule_cc">להגיב לכתובות של עותק</string>
     <string name="title_rule_with_attachments">עם קבצים מצורפים</string>
     <string name="title_rule_answer_remark">יישלח מענה אחד לכל דיון, כדי להימנע מלולאות מענה</string>
@@ -1547,6 +1550,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_message_junk">ההודעות האלו נמצאות בתיקיית הספאם בשרת הדוא״ל. כמובן שהיישומון לא יכול למנוע מהודעות ספאם להישלח אליך.</string>
     <string name="title_hint_important">חשוב</string>
     <string name="title_hint_sync">משיכת הודעות עשויה לארוך זמן מה כתלות במהירות הספק, חיבור האינטרנט, המכשיר ומספר ההודעות. היישומון עשוי להגיב בכבדות בזמן משיכת ההודעות.</string>
     <string name="title_hint_sync_note">כבררת מחדל, לא כל ההודעות תימשכנה כדי להגביל את ניצולת האחסון והסוללה. אפשר לשנות את זה בלחיצה ארוכה על תיקייה ברשימת התיקיות ובחירה ב‚סנכרון עוד’.</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 0b9317b0d2..d726a0fbea 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -970,6 +970,7 @@
     <string name="title_eml_remark">メッセージを転送するには、メールサーバーから元のメッセージをダウンロードする必要があります。これにはインターネットへの接続が必要で、元のメッセージがメールサーバーに保存されている必要があります。</string>
     <string name="title_eml_option">接続設定で常に元のメッセージファイルをダウンロードすることで、これを防ぐことができます。</string>
     <string name="title_eml_downloaded">元のメッセージをダウンロード: %1$s</string>
+    <string name="title_auto_confirm">数秒後に自動で確認</string>
     <string name="title_buttons">ボタンを選択</string>
     <string name="title_buttons_hint">実際に利用可能なアクションは、アカウントの種類と構成によって異なります</string>
     <string name="title_button_search">メッセージを検索</string>
@@ -1364,6 +1365,7 @@
     <string name="title_rule_answer_subject">テンプレート名を件名として使用</string>
     <string name="title_rule_original_text">元のメッセージ本文を含める</string>
     <string name="title_rule_forward_to">転送先</string>
+    <string name="title_rule_resend">再送</string>
     <string name="title_rule_cc">CC アドレスへ返信</string>
     <string name="title_rule_with_attachments">添付ファイルも含める</string>
     <string name="title_rule_answer_remark">自動返信のループを回避するために、それぞれの会話に対して 1 度だけ返信します</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 00d28f616f..28041858f7 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -463,6 +463,7 @@
     <string name="title_add_keyword">키워드 추가</string>
     <string name="title_download_all">모두 다운로드</string>
     <string name="title_save_all">모두 저장</string>
+    <string name="title_auto_confirm">몇 초 후 자동으로 확인 처리됩니다</string>
     <string name="title_buttons">선택 버튼</string>
     <string name="title_trash">휴지통</string>
     <string name="title_copy">&#8230; 복사</string>
@@ -543,6 +544,7 @@
     <string name="title_style_font_default">기본</string>
     <string name="title_style_blockquote">긴 인용문</string>
     <string name="title_style_indentation">들여쓰기</string>
+    <string name="title_style_mark">강조</string>
     <string name="title_style_strikethrough">취소선</string>
     <string name="title_style_clear">서식 지우기</string>
     <string name="title_style_link">링크 삽입</string>
@@ -673,6 +675,7 @@
     <string name="title_rule_identity">ID</string>
     <string name="title_rule_template">답장 템플릿</string>
     <string name="title_rule_forward_to">전달</string>
+    <string name="title_rule_resend">재전송</string>
     <string name="title_rule_folder_missing">폴더 없음</string>
     <string name="title_rule_keyword_missing">키워드 누락</string>
     <string name="title_rule_delete_hint">영구 삭제는 되돌릴 수 없으므로, 규칙 조건이 올바른지 확인하십시오!</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index c7988c9c00..ba5e6e2655 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -976,7 +976,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_eml_remark">Om berichten door te sturen, moeten de ruwe (originele) berichten worden gedownload van de mailserver. Dit vereist een internetverbinding en de berichten dienen nog opgeslagen te zijn op de mailserver.</string>
     <string name="title_eml_option">Dit kan worden voorkomen door het altijd downloaden van ruwe berichtbestanden in de verbindingsinstellingen in te schakelen</string>
     <string name="title_eml_downloaded">Ruwe berichten om te downloaden: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Automatisch bevestigen na enkele seconden</string>
+    <string name="title_auto_confirm">Automatisch bevestigen na enkele seconden</string>
     <string name="title_buttons">Selecteer knoppen</string>
     <string name="title_buttons_hint">De daadwerkelijk beschikbare acties hangen af van het accounttype en de configuratie</string>
     <string name="title_button_search">Zoeken in berichten</string>
@@ -1129,6 +1129,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_style_font_default">Standaard</string>
     <string name="title_style_blockquote">Blokcitaat</string>
     <string name="title_style_indentation">Inspringing</string>
+    <string name="title_style_mark">Markeer</string>
     <string name="title_style_strikethrough">Doorhalen</string>
     <string name="title_style_clear">Opmaak wissen</string>
     <string name="title_style_link">Koppeling invoegen</string>
@@ -1366,6 +1367,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_rule_answer_subject">Sjabloonnaam als onderwerp gebruiken</string>
     <string name="title_rule_original_text">Voeg de oorspronkelijke berichttekst toe</string>
     <string name="title_rule_forward_to">Doorsturen naar</string>
+    <string name="title_rule_resend">Verstuur opnieuw</string>
     <string name="title_rule_cc">Antwoord op CC adressen</string>
     <string name="title_rule_with_attachments">Met bijlagen</string>
     <string name="title_rule_answer_remark">Slechts één antwoord zal worden verzonden voor elk gesprek, om lussen te voorkomen</string>
@@ -1519,6 +1521,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_hint_support">Als u een vraag of een probleem heeft, gebruik dan het menu ondersteuning om hulp te krijgen</string>
     <string name="title_hint_message_actions">Veeg naar links om weg te gooien; Veeg naar rechts om te archiveren (indien beschikbaar); De veegacties kunnen worden geconfigureerd in de accountinstellingen</string>
     <string name="title_hint_message_selection">Druk lang op een bericht om meerdere berichten te selecteren; Hou vast en veeg omhoog of omlaag om meer berichten te selecteren</string>
+    <string name="title_hint_message_junk">Deze berichten bevinden zich in de spammap van de mailserver. Uiteraard kan de app niet voorkomen dat er spamberichten naar u worden verzonden.</string>
     <string name="title_hint_important">Belangrijk</string>
     <string name="title_hint_sync">Het downloaden van berichten kan enige tijd duren, afhankelijk van de snelheid van de provider, de internet-verbinding en het apparaat en van het aantal berichten. Tijdens het downloaden van berichten kan de app trager reageren.</string>
     <string name="title_hint_sync_note">Standaard worden niet alle berichten gedownload om de opslagruimte en het batterij- en gegevensgebruik te beperken. U kunt dit wijzigen door lang op een map in de mappenlijst te drukken en \'Meer synchroniseren\' te selecteren.</string>
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index e4d8a3bc5e..61e9059d34 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -380,7 +380,7 @@
     <string name="title_pin">ସର୍ଟକଟ୍ ଯୋଡ଼ନ୍ତୁ</string>
     <string name="title_raw_send_message">ବାର୍ତ୍ତା</string>
     <string name="title_raw_send_thread">ବାର୍ତ୍ତାଳାପ</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">କିଛି ସେକେଣ୍ଡ ପରେ ସ୍ୱତଃସ୍ପୃତ ଭାବେ ନିଶ୍ଚିତ କରିବା</string>
+    <string name="title_auto_confirm">କିଛି ସେକେଣ୍ଡ ପରେ ସ୍ୱତଃସ୍ପୃତ ଭାବେ ନିଶ୍ଚିତ କରିବା</string>
     <string name="title_trash">ଆବର୍ଜନା ପାତ୍ର</string>
     <string name="title_delete">ବିଲୋପ</string>
     <string name="title_delete_all">ସବୁ ବିଲୋପ କରନ୍ତୁ</string>
@@ -435,6 +435,7 @@
     <string name="title_style_font">ଫଣ୍ଟ</string>
     <string name="title_style_font_default">ଡିଫଲ୍ଟ</string>
     <string name="title_style_indentation">ଇଣ୍ଡେଣ୍ଟେସନ୍</string>
+    <string name="title_style_mark">ହାଇଲାଇଟ୍ କର</string>
     <string name="title_style_link">ଲିଙ୍କ୍ ସନ୍ନିବେଶ କର</string>
     <string name="title_add_image">ପ୍ରତିଛବି ଯୋଡ଼ନ୍ତୁ</string>
     <string name="title_add_image_inline">ସନ୍ନିବେଶ କର</string>
@@ -529,6 +530,7 @@
     <string name="title_rule_template">ପ୍ରତ୍ୟୁତ୍ତର ଟେମ୍ପଲେଟ୍</string>
     <string name="title_rule_answer_subject">ଟେମ୍ପଲେଟ୍ ନା‍ଁକୁ ବିଷୟ ଭାବେ ବ୍ୟବହାର କରିବା</string>
     <string name="title_rule_original_text">ମୂଳ ବାର୍ତ୍ତାର ପାଠ୍ୟ ଅନ୍ତର୍ଭୂକ୍ତ କରିବା</string>
+    <string name="title_rule_resend">ପୁନଃପ୍ରେରଣ</string>
     <string name="title_rule_name_missing">ନିୟମର ନାମ ନିଖୋଜ</string>
     <string name="title_rule_identity_missing">ପରିଚୟ ନିଖୋଜ</string>
     <string name="title_rule_delete_hint">ସବୁଦିନ ପାଇଁ ବିଲୋପ କରିବା ଅପରିବର୍ତ୍ତନୀୟ ଅଟେ, ତେଣୁ ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ନିୟମ ସର୍ତ୍ତ ସବୁ ଠିକ୍ ଅଛି!</string>
@@ -564,6 +566,7 @@
     <string name="title_legend_n">ପରବର୍ତ୍ତୀ</string>
     <string name="title_legend_p">ପୂର୍ବବର୍ତ୍ତୀ</string>
     <string name="title_legend_r">ପ୍ରତ୍ୟୁତ୍ତର</string>
+    <string name="title_hint_message_junk">ଏଇ ବାର୍ତ୍ତାଗୁଡ଼ିକ ଇମେଲ୍ ସର୍ଭରର ସ୍ପାମ୍ ଫୋଲ୍ଡରରେ ଅଛି। ଅବଶ୍ୟ, ଆପ୍ ସ୍ପାମ୍ ବାର୍ତ୍ତାଗୁଡ଼ିକୁ ଆପଣଙ୍କ ପାଖକୁ ପଠାଯିବାରୁ ତ ରୋକିପାରିବ ନାହିଁ।</string>
     <string name="title_remark_owner"><a href="https://ipinfo.io/">ipinfo.io</a>ରୁ ସୂଚନା ଆଦୟ କରାଯିବ</string>
     <string name="title_updated">ସଂସ୍କରଣ %1$s କୁ ଅପଡେଟ୍ ଉପଲବ୍ଧ ଅଛି</string>
     <string name="title_undo">ପୂର୍ବବତ୍</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index ce7700938a..6717d4dbaa 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -998,7 +998,7 @@
     <string name="title_eml_remark">Aby przesyłać wiadomości, należy pobrać surowe (oryginalne) wiadomości z serwera e-mail. To wymaga połączenia z Internetem, a wiadomości muszą być nadal przechowywane na serwerze e-mail.</string>
     <string name="title_eml_option">Można temu zapobiec poprzez włączanie \"Pobierz nieprzetworzone pliki wiadomości\" w ustawieniach połączenia</string>
     <string name="title_eml_downloaded">Pobrano nieprzetworzone wiadomości: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Potwierdź automatycznie po kilku sekundach</string>
+    <string name="title_auto_confirm">Potwierdź automatycznie po kilku sekundach</string>
     <string name="title_buttons">Wybierz przyciski</string>
     <string name="title_buttons_hint">Dostępne działania zależą od typu konta i konfiguracji</string>
     <string name="title_button_search">Szukaj w wiadomościach</string>
@@ -1151,6 +1151,7 @@
     <string name="title_style_font_default">Domyślny</string>
     <string name="title_style_blockquote">Zablokuj cytat</string>
     <string name="title_style_indentation">Wcięcie</string>
+    <string name="title_style_mark">Podświetl</string>
     <string name="title_style_strikethrough">Przekreślenie</string>
     <string name="title_style_clear">Wyczyść formatowanie</string>
     <string name="title_style_link">Wstaw link</string>
@@ -1392,6 +1393,7 @@
     <string name="title_rule_answer_subject">Użyj nazwy szablonu jako tematu</string>
     <string name="title_rule_original_text">Dołącz oryginalny tekst wiadomości</string>
     <string name="title_rule_forward_to">Przekaż do</string>
+    <string name="title_rule_resend">Wyślij ponownie</string>
     <string name="title_rule_cc">Odpowiedz na adresy CC</string>
     <string name="title_rule_with_attachments">Z załącznikami</string>
     <string name="title_rule_answer_remark">Dla każdej rozmowy zostanie wysłana tylko jedna odpowiedź, aby uniknąć zapętlenia odpowiedzi</string>
@@ -1545,6 +1547,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, aby wyrzucić do kosza; Przesuń w prawo, aby zarchiwizować (jeśli dostępne); Działania przeciągnięcia można skonfigurować w ustawieniach konta</string>
     <string name="title_hint_message_selection">Naciśnij długo wiadomość, aby rozpocząć wybieranie wielu wiadomości; Przytrzymaj i przeciągnij w górę lub w dół, aby wybrać więcej wiadomości</string>
+    <string name="title_hint_message_junk">Wiadomości te znajdują się w folderze spamu na serwerze poczty e-mail. Oczywiście aplikacja nie może zapobiec wysyłaniu do użytkownika wiadomości spamowych.</string>
     <string name="title_hint_important">Ważne</string>
     <string name="title_hint_sync">Pobieranie wiadomości może trochę potrwać, zależnie od prędkości dostawcy, połączenie internetowego i urządzenia oraz liczby wiadomości. Podczas pobierania wiadomości aplikacja może odpowiadać wolniej.</string>
     <string name="title_hint_sync_note">Domyślnie nie wszystkie wiadomości zostaną pobrane w celu ograniczenia przestrzeni dyskowej oraz użycia baterii i danych. Możesz to zmienić przez długie naciśnięcie folderu na liście folderów i wybranie opcji \'Synchronizuj więcej\'.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2fdfb33d7a..d6f0f2fd01 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -978,7 +978,7 @@
     <string name="title_eml_remark">Para encaminhar mensagens, as mensagens brutas (originais) precisam ser baixadas do servidor de e-mail. Isso requer uma conexão com a internet e as mensagens ainda devem ser armazenadas no servidor de e-mail.</string>
     <string name="title_eml_option">Isso pode ser impedido ao ativar sempre baixar arquivos de mensagens brutas nas configurações de conexão</string>
     <string name="title_eml_downloaded">Mensagens não baixadas: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmar automaticamente após alguns segundos</string>
+    <string name="title_auto_confirm">Confirmar automaticamente após alguns segundos</string>
     <string name="title_buttons">Selecionar botões</string>
     <string name="title_buttons_hint">As ações disponíveis dependem do tipo de conta e configuração</string>
     <string name="title_button_search">Buscar nas mensagens</string>
@@ -1132,6 +1132,7 @@
     <string name="title_style_font_default">Padrão</string>
     <string name="title_style_blockquote">Citação em bloco</string>
     <string name="title_style_indentation">Indentação</string>
+    <string name="title_style_mark">Realçar</string>
     <string name="title_style_strikethrough">Riscar</string>
     <string name="title_style_clear">Limpar formatação</string>
     <string name="title_style_link">Inserir link</string>
@@ -1372,6 +1373,7 @@
     <string name="title_rule_answer_subject">Usar o nome do modelo como assunto</string>
     <string name="title_rule_original_text">Incluir texto original da mensagem</string>
     <string name="title_rule_forward_to">Encaminhar para</string>
+    <string name="title_rule_resend">Reenviar</string>
     <string name="title_rule_cc">Resposta para endereços CC</string>
     <string name="title_rule_with_attachments">Com anexos</string>
     <string name="title_rule_answer_remark">Apenas uma resposta será enviada para qualquer conversa, para evitar repetição de resposta</string>
@@ -1525,6 +1527,7 @@
     <string name="title_hint_support">Se você tiver uma pergunta ou um problema, por favor, use o menu de suporte para obter ajuda</string>
     <string name="title_hint_message_actions">Deslize para a esquerda para a lixeira; Deslize para a direita para o arquivo (se disponível); As ações de deslize podem ser configuradas nas configurações da conta</string>
     <string name="title_hint_message_selection">Pressione uma mensagem para começar a selecionar múltiplas mensagens; segure e deslize para cima ou para baixo para selecionar mais mensagens</string>
+    <string name="title_hint_message_junk">Estas mensagens estão na pasta de spam do servidor de e-mail. Obviamente, o aplicativo não pode impedir que mensagens de spam sejam enviadas para você.</string>
     <string name="title_hint_important">Importante</string>
     <string name="title_hint_sync">Baixar mensagens pode levar algum tempo, dependendo da velocidade do provedor, da conexão de internet e do dispositivo, e o número de mensagens. Enquanto estiver baixando as mensagens o app pode responder mais devagar.</string>
     <string name="title_hint_sync_note">Por padrão, nem todas as mensagens serão baixadas para limitar o espaço de armazenamento e o uso de bateria e dados. Você pode alterar isso pressionando longamente uma pasta na lista de pastas e selecionando \'Sincronizar mais\'.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index aa00030733..0eec2da6ad 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -794,7 +794,7 @@
     <string name="title_eml_remark">Para encaminhar mensagens, as mensagens (originais) precisam de ser descarregadas do servidor de e-mail. Requer uma ligação à internet e as mensagens devem ser armazenadas no servidor de e-mail.</string>
     <string name="title_eml_option">Isto pode ser prevenido activando, nas definições de ligação, a opção de transferir os ficheiros de mensagem em bruto</string>
     <string name="title_eml_downloaded">Download de mensagens originais: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmar automaticamente após alguns segundos</string>
+    <string name="title_auto_confirm">Confirmar automaticamente após alguns segundos</string>
     <string name="title_buttons">Seleccionar botões</string>
     <string name="title_buttons_hint">As acções actualmente disponíveis dependem do tipo de conta e da configuração</string>
     <string name="title_button_search">Pesquisar em mensagens</string>
@@ -850,8 +850,14 @@
     <string name="title_attachment_saved">Anexo guardado</string>
     <string name="title_attachments_saved">Anexos guardados</string>
     <string name="title_ask_save">Guardar as alterações?</string>
+    <string name="title_ask_delete">Eliminar mensagem permanentemente?</string>
+    <string name="title_ask_delete_accept">Entendo que a eliminação permanente de mensagens é irreversível</string>
+    <string name="title_ask_delete_answer">Eliminar permanentemente o modelo de resposta?</string>
+    <string name="title_ask_delete_rule">Eliminar a regra definitivamente?</string>
     <string name="title_ask_delete_attachments">Remover todos os anexos?</string>
     <string name="title_ask_discard">Descartar o rascunho?</string>
+    <string name="title_ask_show_html">Mostrar a mensagem original pode resultar na fuga de informação confidencial</string>
+    <string name="title_ask_show_image">Mostrar as imagens pode resultar na fuga de informação confidencial</string>
     <string name="title_ask_show_image_hint">Imagens reconhecidas como imagens de monitorização não serão mostradas</string>
     <string name="title_ask_show_amp">Mostrar a variante AMP da mensagem?</string>
     <string name="title_ask_show_amp_hint">As mensagens AMP são concebidas para serem dinâmicas e para interagirem com a internet e, portanto, podem ser usadas por definição para o acompanhar</string>
@@ -911,6 +917,7 @@
     <string name="title_style_font_default">Predefinido</string>
     <string name="title_style_blockquote">Citação em destaque</string>
     <string name="title_style_indentation">Recuo</string>
+    <string name="title_style_mark">Destacar</string>
     <string name="title_style_strikethrough">Riscado</string>
     <string name="title_style_clear">Limpar formatação</string>
     <string name="title_style_link">Inserir hiperligação</string>
@@ -1126,6 +1133,7 @@
     <string name="title_rule_answer_subject">Utilizar o nome do modelo como assunto</string>
     <string name="title_rule_original_text">Inserir o texto original da mensagem</string>
     <string name="title_rule_forward_to">Encaminhar para</string>
+    <string name="title_rule_resend">Reenviar</string>
     <string name="title_rule_with_attachments">Com anexos</string>
     <string name="title_rule_answer_remark">Apenas uma resposta será enviada em cada conversação, para evitar respostas repetidas</string>
     <string name="title_rule_folder_missing">Pasta em falta</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 890f2cadcf..ff10516f30 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -169,6 +169,7 @@
     <string name="title_setup_gmail_password">Vreau să autorizez un cont cu o parolă</string>
     <string name="title_setup_office_auth">Eroarea \'Autentificare eșuată\' poate fi cauzată de dezactivarea administrativă a IMAP/SMTP</string>
     <string name="title_setup_oauth_rationale">Autorizare acces la contul %1$s</string>
+    <string name="title_setup_oauth_update">Autorizați din nou un cont existent (în caz contrar, creați un cont nou)</string>
     <string name="title_setup_oauth_updated">Autorizarea contului a fost actualizată</string>
     <string name="title_setup_oauth_authorize">Autorizare</string>
     <string name="title_setup_select_account">Selectare cont</string>
@@ -987,6 +988,7 @@
     <string name="title_eml_remark">Pentru a redirecționa mesajele, mesajele brute (originale) trebuie să fie descărcate de pe serverul de e-mail. Acest lucru necesită o conexiune la internet, iar mesajele trebuie să fie stocate în continuare pe serverul de e-mail.</string>
     <string name="title_eml_option">Acest lucru poate fi prevenit prin activarea funcției de descărcare permanentă a fișierelor de mesaje brute în setările de conectare</string>
     <string name="title_eml_downloaded">Mesaje brute descărcate: %1$s</string>
+    <string name="title_auto_confirm">Confirmare automată după câteva secunde</string>
     <string name="title_buttons">Selectare butoane</string>
     <string name="title_buttons_hint">Acțiunile reale disponibile depind de tipul contului și de configurație</string>
     <string name="title_button_search">Căutați în mesaje</string>
@@ -1379,6 +1381,7 @@
     <string name="title_rule_answer_subject">Utilizați numele șablonului ca subiect</string>
     <string name="title_rule_original_text">Includeți textul original al mesajului</string>
     <string name="title_rule_forward_to">Redirecţionează către</string>
+    <string name="title_rule_resend">Retrimite</string>
     <string name="title_rule_cc">Răspuns la adresa CC</string>
     <string name="title_rule_with_attachments">Cu atașamente</string>
     <string name="title_rule_answer_remark">Doar un singur răspuns va fi trimis pentru orice conversație, pentru a evita bucle de răspuns</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 1f6a8cf45f..7c291a8d65 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1000,7 +1000,7 @@
     <string name="title_eml_remark">Для пересылки исходные (оригинальные) сообщения необходимо загрузить с сервера электронной почты. Это требует подключения к интернету, а сами сообщения должны храниться на сервере.</string>
     <string name="title_eml_option">Это можно предотвратить, включив загрузку исходных сообщений в настройках подключения</string>
     <string name="title_eml_downloaded">Загружены исходные сообщения: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Автоматическое подтверждение через несколько секунд</string>
+    <string name="title_auto_confirm">Автоматическое подтверждение через несколько секунд</string>
     <string name="title_buttons">Выбрать кнопки</string>
     <string name="title_buttons_hint">Доступные действия зависят от типа учётной записи и конфигурации</string>
     <string name="title_button_search">Поиск в сообщениях</string>
@@ -1154,6 +1154,7 @@
     <string name="title_style_font_default">По умолчанию</string>
     <string name="title_style_blockquote">Блок цитаты</string>
     <string name="title_style_indentation">Отступ</string>
+    <string name="title_style_mark">Выделение</string>
     <string name="title_style_strikethrough">Зачёркнутый</string>
     <string name="title_style_clear">Очистить форматирование</string>
     <string name="title_style_link">Вставить ссылку</string>
@@ -1394,6 +1395,7 @@
     <string name="title_rule_answer_subject">Использовать имя шаблона в качестве темы</string>
     <string name="title_rule_original_text">Включить текст исходного сообщения</string>
     <string name="title_rule_forward_to">Переслать</string>
+    <string name="title_rule_resend">Перенаправить</string>
     <string name="title_rule_cc">Ответить на адреса копий (CC)</string>
     <string name="title_rule_with_attachments">С вложениями</string>
     <string name="title_rule_answer_remark">Только один ответ будет отправлен в каждый диалог, чтобы избежать петель ответов</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 62dcfb978d..2cd6c50c04 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1374,6 +1374,7 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     <string name="title_rule_answer_subject">Uviesť názov šablóny v poli predmet</string>
     <string name="title_rule_original_text">Zahrnúť text pôvodnej správy</string>
     <string name="title_rule_forward_to">Preposlať na</string>
+    <string name="title_rule_resend">Znovu odoslať</string>
     <string name="title_rule_cc">Odpovedať na adresy v poli kópia</string>
     <string name="title_rule_with_attachments">S prílohami</string>
     <string name="title_rule_answer_remark">Len jedna odpoveď bude odoslaná pre ľubovoľnú konverzáciu aby sa zamedzilo odpovedacím slučkám</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f4364d48c0..99c7e1a598 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -975,7 +975,7 @@
     <string name="title_eml_remark">För att vidarebefordra meddelanden, måste de råa (ursprungliga) meddelandena laddas ner från e-postservern. Detta kräver en internetanslutning och meddelandena måste fortfarande lagras på e-postservern.</string>
     <string name="title_eml_option">Detta kan förhindras genom att alltid välja att ladda ner råa meddelandefiler i anslutningsinställningarna</string>
     <string name="title_eml_downloaded">Råa meddelanden nedladdade: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Bekräfta automatiskt efter några sekunder</string>
+    <string name="title_auto_confirm">Bekräfta automatiskt efter några sekunder</string>
     <string name="title_buttons">Välj knappar</string>
     <string name="title_buttons_hint">De faktiska åtgärder som är tillgängliga beror på kontotyp och konfiguration</string>
     <string name="title_button_search">Sök i meddelanden</string>
@@ -1128,6 +1128,7 @@
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Block</string>
     <string name="title_style_indentation">Indrag</string>
+    <string name="title_style_mark">Markera</string>
     <string name="title_style_strikethrough">Genomstruken</string>
     <string name="title_style_clear">Rensa formatering</string>
     <string name="title_style_link">Infoga länk</string>
@@ -1368,6 +1369,7 @@
     <string name="title_rule_answer_subject">Använd mallens namn som ämne</string>
     <string name="title_rule_original_text">Inkludera ursprunglig meddelandetext</string>
     <string name="title_rule_forward_to">Vidarebefordra till</string>
+    <string name="title_rule_resend">Skicka igen</string>
     <string name="title_rule_cc">Svar till CC-adresser</string>
     <string name="title_rule_with_attachments">Med bilagor</string>
     <string name="title_rule_answer_remark">Endast ett svar kommer att skickas för någon konversation, för att undvika svarsloopar</string>
@@ -1521,6 +1523,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">Dra åt vänster för att kasta; Svep åt höger för att arkivera (om tillgängligt); Svepåtgärderna kan konfigureras i kontoinställningarna</string>
     <string name="title_hint_message_selection">Långt tryck på ett meddelande för att börja välja flera meddelanden; håll och svep uppåt eller nedåt för att välja fler meddelanden</string>
+    <string name="title_hint_message_junk">Dessa meddelanden finns i e-postserverns skräppostmapp. Appen kan naturligtvis inte förhindra att skräppostmeddelanden skickas till dig.</string>
     <string name="title_hint_important">Viktigt</string>
     <string name="title_hint_sync">Hämtning av meddelanden kan ta lite tid, beroende på leverantörens hastighet, internetanslutning och enhet och på antalet meddelanden. När du hämtar meddelanden kan appen svara långsammare.</string>
     <string name="title_hint_sync_note">Som standard laddas inte alla meddelanden ner för att begränsa lagringsutrymme och batteri- och dataanvändning. Du kan ändra detta genom att länge trycka på en mapp i mapplistan och välja \"Synkronisera mer\".</string>
@@ -1731,7 +1734,7 @@
         <item>Gå till nästa konversation</item>
     </string-array>
     <string-array name="resizeNames">
-        <item>Extra small</item>
+        <item>Extra liten</item>
         <item>Liten</item>
         <item>Mellan</item>
         <item>Stor</item>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 6b524e4a85..67be2c2acc 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -976,7 +976,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_eml_remark">Mesajları iletmek için ham (orijinal) mesajların e-posta sunucusundan indirilmesi gerekir. Bunun için internet bağlantısı gerekir ve mesajların yine de e-posta sunucusunda saklanması gerekir.</string>
     <string name="title_eml_option">Bu, bağlantı ayarlarında her zaman ham mesaj dosyalarının indirilmesini etkinleştirerek önlenebilir</string>
     <string name="title_eml_downloaded">İndirilen ham iletiler: %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Birkaç saniye sonra otomatik olarak onayla</string>
+    <string name="title_auto_confirm">Birkaç saniye sonra otomatik olarak onayla</string>
     <string name="title_buttons">Seçim düğmeleri</string>
     <string name="title_buttons_hint">Gerçek eylemler, hesap türüne ve yapılandırmaya bağlıdır</string>
     <string name="title_button_search">Mesajlarda ara</string>
@@ -1369,6 +1369,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_rule_answer_subject">Konu olarak şablon adını kullan</string>
     <string name="title_rule_original_text">Orijinal mesaj metnini dahil et</string>
     <string name="title_rule_forward_to">İlet</string>
+    <string name="title_rule_resend">Tekrar gönder</string>
     <string name="title_rule_cc">CC adreslerini yanıtlayın</string>
     <string name="title_rule_with_attachments">Eklerle Birlikte</string>
     <string name="title_rule_answer_remark">Cevap döngülerinden kaçınmak için herhangi bir konuşma için yalnızca bir cevap gönderilecektir</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 055574f1dd..eae01478f0 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1388,6 +1388,7 @@
     <string name="title_rule_answer_subject">Використати назву шаблона як тему</string>
     <string name="title_rule_original_text">Включати текст оригінального повідомлення</string>
     <string name="title_rule_forward_to">Переслати</string>
+    <string name="title_rule_resend">Перевідправити</string>
     <string name="title_rule_cc">Відповісти на адреси CC</string>
     <string name="title_rule_with_attachments">З вкладеннями</string>
     <string name="title_rule_answer_remark">Для будь-якої розмови буде надіслано тільки одна відповідь, щоб уникнути циклів відповіді</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 33141eff50..a064154072 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1358,6 +1358,7 @@
     <string name="title_rule_answer_subject">Sử dụng tên mẫu làm chủ đề</string>
     <string name="title_rule_original_text">Bao gồm văn bản thư gốc</string>
     <string name="title_rule_forward_to">Chuyển tiếp đến</string>
+    <string name="title_rule_resend">Gửi lại</string>
     <string name="title_rule_cc">Trả lời đến các địa chỉ CC</string>
     <string name="title_rule_with_attachments">Có tệp đính kèm</string>
     <string name="title_rule_answer_remark">Chỉ có một thư trả lời sẽ được gửi đối với bất kỳ cuộc hội thoại nào, để tránh các vòng lặp trả lời</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 491b8c96d3..839c17f5de 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -966,7 +966,7 @@
     <string name="title_eml_remark">若要转发消息，需要从电子邮件服务器下载原始 (原始) 消息。 这需要互联网连接，且消息必须仍存储在电子邮件服务器上。</string>
     <string name="title_eml_option">可通过在连接设置中启用“始终下载原始消息文件”防止发生这种情况</string>
     <string name="title_eml_downloaded">已下载原始消息： %1$s</string>
-    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">几秒后自动确认</string>
+    <string name="title_auto_confirm">几秒后自动确认</string>
     <string name="title_buttons">选择按钮</string>
     <string name="title_buttons_hint">实际操作可行性取决于账户类型和配置</string>
     <string name="title_button_search">搜索消息</string>
@@ -1119,6 +1119,7 @@
     <string name="title_style_font_default">默认</string>
     <string name="title_style_blockquote">引用块</string>
     <string name="title_style_indentation">缩进</string>
+    <string name="title_style_mark">高亮</string>
     <string name="title_style_strikethrough">删除线</string>
     <string name="title_style_clear">清除格式</string>
     <string name="title_style_link">插入链接</string>
@@ -1359,6 +1360,7 @@
     <string name="title_rule_answer_subject">使用模板名称作为主题</string>
     <string name="title_rule_original_text">包含原始消息文本</string>
     <string name="title_rule_forward_to">转发给</string>
+    <string name="title_rule_resend">重新发送</string>
     <string name="title_rule_cc">回信给邮件抄送地址</string>
     <string name="title_rule_with_attachments">含附件</string>
     <string name="title_rule_answer_remark">(设置自动回复后)任何会话将仅发送一个回复，以避免回复循环</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3e85b666de..1141707609 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1304,6 +1304,7 @@
     <string name="title_rule_identity">身分</string>
     <string name="title_rule_template">回覆模板</string>
     <string name="title_rule_forward_to">轉寄至</string>
+    <string name="title_rule_resend">重新寄出</string>
     <string name="title_rule_cc">回覆至副本地址</string>
     <string name="title_rule_with_attachments">包含附件</string>
     <string name="title_rule_answer_remark">對於任一會話，僅有一個回覆會被傳送以避免回覆循環</string>