diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 12af74193f..7020829bf5 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_search">FairEmail търсене</string>
     <string name="app_changelog">Списък с промени</string>
     <string name="app_welcome">FairEmail е приложение за електронна поща с отворен код, фокусирано върху поверителността и сигурността. Поради тази причина някои функции могат да работят различно от това с което сте свикнали. Превод на български plimboster.</string>
-    <string name="app_limitations">Например, съобщенията винаги ще се преформатират, за да се премахнат опасни елементи и да се подобри четенето и връзките за отваряне трябва да бъдат потвърдени за безопасност.</string>
+    <string name="app_limitations">Например, съобщенията винаги ще се преформатират, за да се премахнат опасни елементи и да се подобри четенето, както и връзките за отваряне трябва да бъдат потвърдени за безопасност.</string>
     <string name="app_crash">FairEmail не се поддържа на това устройство поради срив, причинен от грешка в Android</string>
     <string name="app_exit">Натиснете отново \"назад\", за изход</string>
     <string name="channel_service">Услуга</string>
@@ -956,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Няма</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>PGP само подписване</item>
+        <item>PGP подписване+криптиране</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index b459475c8a..69928f8fd5 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -977,7 +977,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Žádný</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>Pouze PGP podpis</item>
+        <item>PGP podpis+šifrovat</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index a0c108e568..50b207d77b 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -568,6 +568,7 @@
     <string name="title_send_via">Send via</string>
     <string name="title_send_with_options">Send &#8230;</string>
     <string name="title_send_at">Sendt kl. &#8230;</string>
+    <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
     <string name="title_no_server">Ingen server fundet på \'%1$s\'</string>
     <string name="title_style_bold">Fed</string>
@@ -604,11 +605,14 @@
     <string name="title_ask_send_via">Send besked til %1$s via %2$s?</string>
     <string name="title_queued">Afsender besked</string>
     <string name="title_queued_at">Besked afsendes omkring kl. %1$s</string>
+    <string name="title_sign">Signér</string>
     <string name="title_encrypt">Kryptér</string>
     <string name="title_decrypt">Dekryptér</string>
     <string name="title_resync">Synkronisér igen</string>
     <string name="title_no_openpgp">OpenKeychain ikke fundet</string>
+    <string name="title_not_encrypted">Besked er ikke signeret eller krypteret</string>
     <string name="title_reset_sign_key">Nulstil sign key</string>
+    <string name="title_import_encrypt_key">Importér krypteringsnøgle</string>
     <string name="title_signature_none">Besked ikke signeret</string>
     <string name="title_signature_valid">Beskedsignatur gyldig</string>
     <string name="title_signature_unconfirmed">Beskedsignatur gyldig, men ubekræftet</string>
@@ -727,6 +731,7 @@
     <string name="title_legend_draft">Har kladde</string>
     <string name="title_legend_priority">Har høj prioritet</string>
     <string name="title_legend_priority_low">Har lav prioritet</string>
+    <string name="title_legend_signed">Er signeret</string>
     <string name="title_legend_encrypted">Er krypteret</string>
     <string name="title_legend_auth">Godkendelse mislykkedes</string>
     <string name="title_legend_snoozed">Er udsat</string>
@@ -947,4 +952,9 @@
         <item>Mellem</item>
         <item>Stor</item>
     </string-array>
+    <string-array name="encryptNames">
+        <item>Ingen</item>
+        <item>Kun PGP-signering</item>
+        <item>PGP-signering + kryptering</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c104ff397f..667ccdf79a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -954,7 +954,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     </string-array>
     <string-array name="encryptNames">
         <item>Keine Verschlüsselung</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>PGP nur unterschreiben</item>
+        <item>PGP unterschreiben + verschlüsseln</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2547f1cc8e..2d5d4d9017 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -569,6 +569,7 @@
     <string name="title_send_via">Enviar vía</string>
     <string name="title_send_with_options">Enviar &#8230;</string>
     <string name="title_send_at">Enviar a &#8230;</string>
+    <string name="title_send_encryption">Cifrado</string>
     <string name="title_send_priority">Prioridad</string>
     <string name="title_no_server">No se encontró ningún servidor en \'%1$s\'</string>
     <string name="title_style_bold">Negrita</string>
@@ -605,11 +606,14 @@
     <string name="title_ask_send_via">¿Enviar mensaje a %1$s vía %2$s?</string>
     <string name="title_queued">Enviando mensaje</string>
     <string name="title_queued_at">El mensaje será enviado alrededor de %1$s</string>
+    <string name="title_sign">Firmar</string>
     <string name="title_encrypt">Cifrar</string>
     <string name="title_decrypt">Descifrar</string>
     <string name="title_resync">Resincronizar</string>
     <string name="title_no_openpgp">OpenKeychain no encontrado</string>
+    <string name="title_not_encrypted">El mensaje no está firmado ni cifrado</string>
     <string name="title_reset_sign_key">Restablecer clave de firma</string>
+    <string name="title_import_encrypt_key">Importar clave de cifrado</string>
     <string name="title_signature_none">Mensaje no firmado</string>
     <string name="title_signature_valid">Firma de mensaje válida</string>
     <string name="title_signature_unconfirmed">Firma del mensaje válida pero no confirmada</string>
@@ -728,6 +732,7 @@
     <string name="title_legend_draft">Tiene borrador</string>
     <string name="title_legend_priority">Tiene prioridad alta</string>
     <string name="title_legend_priority_low">Tiene prioridad baja</string>
+    <string name="title_legend_signed">Está firmado</string>
     <string name="title_legend_encrypted">Está cifrado</string>
     <string name="title_legend_auth">Error de autenticación</string>
     <string name="title_legend_snoozed">Está postergado</string>
@@ -949,4 +954,9 @@
         <item>Mediano</item>
         <item>Grande</item>
     </string-array>
+    <string-array name="encryptNames">
+        <item>Ninguno</item>
+        <item>Sólo firmar con PGP</item>
+        <item>Firmar y cifrar con PGP</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index e9866747ac..ba1aafffd0 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -956,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Bat ere ez</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>PGP sinadura soilik</item>
+        <item>PGP sinadura eta enkriptatzea</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index d3cbbee9bd..a690265ae8 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -956,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Ei mitään</item>
-        <item>PGP sign-only</item>
+        <item>PGP vain allekirjoita</item>
         <item>PGP sign+encrypt</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 66dce5ac20..c4c5478cb7 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -384,6 +384,7 @@
     <string name="title_primary_identity">Principal (identité par défaut)</string>
     <string name="title_leave_on_server">Laisser les messages sur le serveur</string>
     <string name="title_keep_alive_interval">Intervalle de maintien de connexion (minutes)</string>
+    <string name="title_use_date">Utiliser l\'heure d\'envoi dans l\'entête au lieu de l\'heure de réception sur le serveur</string>
     <string name="title_related_identity">Ajouter une identité liée</string>
     <string name="title_check">Vérifier</string>
     <string name="title_no_name">Nom manquant</string>
@@ -955,8 +956,8 @@
         <item>Grande</item>
     </string-array>
     <string-array name="encryptNames">
-        <item>Aucune</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>Aucun</item>
+        <item>Signer PGP uniquement</item>
+        <item>Signer &amp; chiffrer PGP</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index fc1e0877a7..f54d43104e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -383,6 +383,7 @@
     <string name="title_primary_identity">Principale (identità predefinita)</string>
     <string name="title_leave_on_server">Lascia i messaggi sul server</string>
     <string name="title_keep_alive_interval">Intervallo resta-attivo/sondaggio (minuti)</string>
+    <string name="title_use_date">Usa la data nell\'intestazione di invio al posto di quella del server di ricezione</string>
     <string name="title_related_identity">Aggiungi identità correlata</string>
     <string name="title_check">Controlla</string>
     <string name="title_no_name">Nome mancante</string>
@@ -955,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Nulla</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>PGP solo firma</item>
+        <item>PGP firma e crittografia</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 1c14ff6c21..1a92d86bd7 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -384,6 +384,7 @@
     <string name="title_primary_identity">Primaire identiteit (standaard identiteit)</string>
     <string name="title_leave_on_server">Berichten op server laten</string>
     <string name="title_keep_alive_interval">Keep-alive/periodieke controle interval (minuten)</string>
+    <string name="title_use_date">Gebruik datum header verzendtijd in plaats van server ontvangen tijd</string>
     <string name="title_related_identity">Voeg gerelateerde identiteit toe</string>
     <string name="title_check">Controleer</string>
     <string name="title_no_name">Naam ontbreekt</string>
@@ -597,7 +598,7 @@
     <string name="title_to_missing">Ontvanger ontbreekt</string>
     <string name="title_subject_reminder">Onderwerp is leeg</string>
     <string name="title_text_reminder">Bericht is leeg</string>
-    <string name="title_attachment_keywords">bijlage, bijlagen</string>
+    <string name="title_attachment_keywords">bijlage,bijlagen</string>
     <string name="title_attachment_reminder">Was u van plan een bijlage toe te voegen?</string>
     <string name="title_attachments_missing">Niet alle bijlagen zijn gedownload</string>
     <string name="title_send_dialog_hint">Dit dialoogvenster is nog steeds beschikbaar via het driepuntsoverloopmenu in de actiebalk</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 07e87abe75..1fce23d6f3 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -956,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Ingen</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>Bare PGP-signering</item>
+        <item>PGP signer+krypter</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 07e87abe75..1fce23d6f3 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -956,7 +956,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Ingen</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>Bare PGP-signering</item>
+        <item>PGP signer+krypter</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 342d828693..eea8db19d9 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -579,6 +579,7 @@
     <string name="title_send_via">Trimite prin</string>
     <string name="title_send_with_options">Trimite &#8230;</string>
     <string name="title_send_at">Trimite la &#8230;</string>
+    <string name="title_send_encryption">Criptare</string>
     <string name="title_send_priority">Prioritate</string>
     <string name="title_no_server">Nu există un server la \'%1$s\'</string>
     <string name="title_style_bold">Îngroșat</string>
@@ -615,11 +616,14 @@
     <string name="title_ask_send_via">Trimite mesajul către %1$s via %2$s?</string>
     <string name="title_queued">Expediere mesaj</string>
     <string name="title_queued_at">Mesajul va fi trimis în aproximativ %1$s</string>
+    <string name="title_sign">Semnează</string>
     <string name="title_encrypt">Criptare</string>
     <string name="title_decrypt">Decriptare</string>
     <string name="title_resync">Resincronizare</string>
     <string name="title_no_openpgp">OpenKeychain nu a fost găsit</string>
+    <string name="title_not_encrypted">Mesajul nu este semnat sau criptat</string>
     <string name="title_reset_sign_key">Resetare cheie de semnare</string>
+    <string name="title_import_encrypt_key">Importă cheie de criptare</string>
     <string name="title_signature_none">Mesaj nesemnat</string>
     <string name="title_signature_valid">Semnătura mesaj validă</string>
     <string name="title_signature_unconfirmed">Semnătura mesajului este validă dar nu este confirmată</string>
@@ -738,6 +742,7 @@
     <string name="title_legend_draft">Are ciornă</string>
     <string name="title_legend_priority">Prioritate ridicată</string>
     <string name="title_legend_priority_low">Are prioritate redusă</string>
+    <string name="title_legend_signed">Este semnat</string>
     <string name="title_legend_encrypted">Este criptat</string>
     <string name="title_legend_auth">Autentificare eșuată</string>
     <string name="title_legend_snoozed">Este amânat</string>
@@ -959,4 +964,9 @@
         <item>Medie</item>
         <item>Mare</item>
     </string-array>
+    <string-array name="encryptNames">
+        <item>Fără</item>
+        <item>Doar semnare PGP</item>
+        <item>Semnare+criptare PGP</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index ca24d1f62d..84e4557326 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -384,6 +384,7 @@
     <string name="title_primary_identity">Birincil (varsayılan kimlik)</string>
     <string name="title_leave_on_server">Mesajları sunucuda bırak</string>
     <string name="title_keep_alive_interval">Canlı tutma/yoklama aralığı (dakika)</string>
+    <string name="title_use_date">Sunucu alma zamanı yerine tarih başlığındaki gönderme zamanını kullan</string>
     <string name="title_related_identity">İlgili kimliği ekle</string>
     <string name="title_check">Kontrol et</string>
     <string name="title_no_name">İsim eksik</string>
@@ -956,7 +957,7 @@
     </string-array>
     <string-array name="encryptNames">
         <item>Hiçbiri</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>PGP sadece imzala</item>
+        <item>PGP imzala ve şifrele</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0f8494c881..ac42ff986b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -372,6 +372,7 @@
     <string name="title_primary_identity">主身份(默认身份)</string>
     <string name="title_leave_on_server">把消息留在服务器上</string>
     <string name="title_keep_alive_interval">保持激活/轮询时间间隔(分钟)</string>
+    <string name="title_use_date">使用日期头发送时间而非服务器接收时间</string>
     <string name="title_related_identity">添加相关身份</string>
     <string name="title_check">检查</string>
     <string name="title_no_name">缺少名称</string>
@@ -943,7 +944,7 @@ FairEmail会显示一条消息来提醒您这一点，这条消息在您购买
     </string-array>
     <string-array name="encryptNames">
         <item>无</item>
-        <item>PGP sign-only</item>
-        <item>PGP sign+encrypt</item>
+        <item>仅PGP签名</item>
+        <item>PGP 签名+加密</item>
     </string-array>
 </resources>