diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 45b9502289..bd76d0c535 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -156,7 +156,6 @@
     <string name="title_recommended">موصى به</string>
     <string name="title_account_linked">الحساب المرتبط</string>
     <string name="title_account_name">اسم الحساب</string>
-    <string name="title_account_signature">نص التوقيع</string>
     <string name="title_color">اللون</string>
     <string name="title_account_left">مرر يسارا</string>
     <string name="title_account_right">مرر يمينا</string>
@@ -183,7 +182,6 @@
     <string name="title_drafts_required">مجلد للمسودات مطلوب لغرض إرسال رسائل</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
-    <string name="title_edit_html">تعديل كـ HTML</string>
     <string name="title_last_connected">آخر ربط: %1$s</string>
     <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
     <string name="title_synchronize_now">زامن الآن</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 45b9502289..bd76d0c535 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -156,7 +156,6 @@
     <string name="title_recommended">موصى به</string>
     <string name="title_account_linked">الحساب المرتبط</string>
     <string name="title_account_name">اسم الحساب</string>
-    <string name="title_account_signature">نص التوقيع</string>
     <string name="title_color">اللون</string>
     <string name="title_account_left">مرر يسارا</string>
     <string name="title_account_right">مرر يمينا</string>
@@ -183,7 +182,6 @@
     <string name="title_drafts_required">مجلد للمسودات مطلوب لغرض إرسال رسائل</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
-    <string name="title_edit_html">تعديل كـ HTML</string>
     <string name="title_last_connected">آخر ربط: %1$s</string>
     <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
     <string name="title_synchronize_now">زامن الآن</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 45b9502289..bd76d0c535 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -156,7 +156,6 @@
     <string name="title_recommended">موصى به</string>
     <string name="title_account_linked">الحساب المرتبط</string>
     <string name="title_account_name">اسم الحساب</string>
-    <string name="title_account_signature">نص التوقيع</string>
     <string name="title_color">اللون</string>
     <string name="title_account_left">مرر يسارا</string>
     <string name="title_account_right">مرر يمينا</string>
@@ -183,7 +182,6 @@
     <string name="title_drafts_required">مجلد للمسودات مطلوب لغرض إرسال رسائل</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
-    <string name="title_edit_html">تعديل كـ HTML</string>
     <string name="title_last_connected">آخر ربط: %1$s</string>
     <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
     <string name="title_synchronize_now">زامن الآن</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 228a06d7da..7bfa7599ab 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -222,7 +222,6 @@
     <string name="title_recommended">موصى به</string>
     <string name="title_account_linked">الحساب المرتبط</string>
     <string name="title_account_name">اسم الحساب</string>
-    <string name="title_account_signature">نص التوقيع</string>
     <string name="title_color">اللون</string>
     <string name="title_account_left">مرر يسارا</string>
     <string name="title_account_right">مرر يمينا</string>
@@ -249,7 +248,6 @@
     <string name="title_drafts_required">مجلد للمسودات مطلوب لغرض إرسال رسائل</string>
     <string name="title_account_delete">حذف هذا الحساب نهائيا؟</string>
     <string name="title_identity_delete">حذف هذه الهوية نهائيا؟</string>
-    <string name="title_edit_html">تعديل كـ HTML</string>
     <string name="title_last_connected">آخر ربط: %1$s</string>
     <string name="title_advanced_browse">تصفح الرسائل على الخادم</string>
     <string name="title_synchronize_now">زامن الآن</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 694af75b0e..abf22b23fd 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -171,7 +171,6 @@
     <string name="title_account_linked">Birləşdirilmiş hesablar</string>
     <string name="title_account_name">Hesab adı</string>
     <string name="title_account_name_hint">Qovluqları fərqləndirmək üçün istifadə edilir</string>
-    <string name="title_account_signature">İmza mətni</string>
     <string name="title_account_notify">Ayrı bildirişlər</string>
     <string name="title_domain">Domen adı</string>
     <string name="title_autoconfig">Tənzimləmələri al</string>
@@ -195,7 +194,6 @@
     <string name="title_no_idle">Bu təchizatçı ani mesajları dəstəkləmir. Bu, yeni mesajların alınmasını gecikdirəcək və batareyanın istifadəsini artıracaq.</string>
     <string name="title_account_delete">Bu hesab birdəfəlik silinsin?</string>
     <string name="title_identity_delete">Bu kimlik birdəfəlik silinsin?</string>
-    <string name="title_edit_html">HTML kimi düzəliş et</string>
     <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_synchronize_now">İndi eyniləşdir</string>
     <string name="title_delete_local">Yerli mesajları sil</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 289a8cb335..5b6b9dbf48 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Получени съобщения</string>
     <string name="title_advanced_when">Кога</string>
     <string name="title_advanced_always">Винаги синхронизирай тези профили</string>
-    <string name="title_advanced_optimize">Автоматично оптимизиране на настройките</string>
     <string name="title_advanced_schedule">График</string>
     <string name="title_advanced_unseen">Всички непрочетени съобщения</string>
     <string name="title_advanced_flagged">Всички съобщения със звезда</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d индексирани съобщения (%3$s)</string>
     <string name="title_advanced_english">Принудително на английски език</string>
     <string name="title_advanced_watchdog">Периодична проверка дали FairEmail е активен</string>
+    <string name="title_advanced_optimize">Автоматично оптимизиране на настройките</string>
     <string name="title_advanced_updates">Проверка за актуализация</string>
     <string name="title_advanced_experiments">Пробвай експерименталните функции</string>
     <string name="title_advanced_crash_reports">Изпрати репорт с грешки</string>
@@ -428,7 +428,6 @@
     <string name="title_account_name_hint">Използва се за разграничаване на папки</string>
     <string name="title_account_interval_hint">Честота на опресняване на връзката за push съобщения или честота на проверка за нови съобщения</string>
     <string name="title_account_partial_fetch_hint">Деактивирайте това само в случай на празни съобщения или повредени прикачени файлове</string>
-    <string name="title_account_signature">Текст на подписа</string>
     <string name="title_color">Цвят</string>
     <string name="title_account_ondemand">Синхронизирай ръчно</string>
     <string name="title_account_notify">Отделни известявания</string>
@@ -478,10 +477,9 @@
     <string name="title_drafts_required">За изпращане на съобщения е необходима папка за чернови</string>
     <string name="title_account_delete">Искате ли да изтриете този профил за постоянно?</string>
     <string name="title_identity_delete">Да се изтрие ли идентичността за постоянно?</string>
-    <string name="title_edit_html">Редактиране като HTML</string>
     <string name="title_sign_key">Ключ за подписване:%1$s</string>
     <string name="title_last_connected">Последна проверка: %1$s</string>
-    <string name="title_storage_quota">Използване на сървъра за съхранение: %1$s/%2$s</string>
+    <string name="title_storage_quota">Използвано място на сървъра: %1$s/%2$s</string>
     <string name="title_pop_support">POP3 протокола поддържа изтегляне и изтриване на съобщенията само във входяща поща. POP3 не може да маркира съобщенията като прочетени, не може да премества съобщения, т. н. POP3 използва повече батерия и данни от IMAP. Моля използвайте IMAP протокола когато е възможно.</string>
     <string name="title_oauth_support">OAuth не се поддържа</string>
     <string name="title_review">Преглед</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 5f482225ab..2117c54798 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -360,7 +360,6 @@
     <string name="title_account_name_hint">Emprat per diferenciar carpetes</string>
     <string name="title_account_interval_hint">Freqüència d’actualització de la connexió de missatges push o freqüència de comprovació de missatges nous</string>
     <string name="title_account_partial_fetch_hint">Desactiveu-ho només en cas de missatges buits o fitxers adjunts corruptes</string>
-    <string name="title_account_signature">Text de signatura</string>
     <string name="title_color">Color</string>
     <string name="title_account_ondemand">Sincronitza manualment</string>
     <string name="title_account_notify">Notificacions independents</string>
@@ -405,7 +404,6 @@
     <string name="title_drafts_required">Cal enviar una carpeta d\'esborranys per enviar missatges</string>
     <string name="title_account_delete">Esborrar aquest compte per sempre?</string>
     <string name="title_identity_delete">Esborrar aquesta identitat per sempre?</string>
-    <string name="title_edit_html">Edita com HTML</string>
     <string name="title_sign_key">Clau signada: %1$s</string>
     <string name="title_last_connected">Darrera connexió: %1$s</string>
     <string name="title_pop_support">El protocol POP3 només permet descarregar i esborrar missatges de la safata d\'entrada. No deixa marcar missatges com a llegits, moure missatges, etc. Com que POP3 també necessita més bateria i dades, pot ser preferible utilitzar el protocol IMAP.</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5be262f515..82de8973a5 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -448,7 +448,6 @@
     <string name="title_account_name_hint">Použito k odlišení složek</string>
     <string name="title_account_interval_hint">Četnost obnovy spojení pro okamžité zprávy nebo četnost kontroly nových zpráv</string>
     <string name="title_account_partial_fetch_hint">Vypnout pouze v případě prázdných zpráv nebo poškozených příloh</string>
-    <string name="title_account_signature">Text podpisu</string>
     <string name="title_color">Barva</string>
     <string name="title_account_ondemand">Synchronizovat ručně</string>
     <string name="title_account_notify">Samostatná oznámení</string>
@@ -498,7 +497,6 @@
     <string name="title_drafts_required">Složka konceptů je nutná pro odesílání zpráv</string>
     <string name="title_account_delete">Trvale smazat tento účet?</string>
     <string name="title_identity_delete">Trvale smazat tuto identitu?</string>
-    <string name="title_edit_html">Upravit jako HTML</string>
     <string name="title_sign_key">Podpisový klíč: %1$s</string>
     <string name="title_last_connected">Poslední připojení: %1$s</string>
     <string name="title_storage_quota">Využití úložiště serveru: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 2bfe66b296..7dccb082d4 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -427,7 +427,6 @@
     <string name="title_account_name_hint">Benyttes til mappedifferentiering</string>
     <string name="title_account_interval_hint">Opfriskningsfrekvensen af forbindelsen til push-beskeder eller frekvensen for tjek af nye beskeder</string>
     <string name="title_account_partial_fetch_hint">Deaktivér dette kun i tilfælde af tomme beskeder eller ødelagte vedhæftninger</string>
-    <string name="title_account_signature">Signaturtekst</string>
     <string name="title_color">Farve</string>
     <string name="title_account_ondemand">Synkronisér manuelt</string>
     <string name="title_account_notify">Separate notifikationer</string>
@@ -477,7 +476,6 @@
     <string name="title_drafts_required">Kladdemappe kræves for at kunne sende beskeder</string>
     <string name="title_account_delete">Slet denne konto permanent?</string>
     <string name="title_identity_delete">Slet denne identitet permanent?</string>
-    <string name="title_edit_html">Redigér som HTML</string>
     <string name="title_sign_key">Signér nøgle: %1$s</string>
     <string name="title_last_connected">Sidst forbundet: %1$s</string>
     <string name="title_storage_quota">Serverlagerpladsforbrug: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 140ae06545..cea67c51d8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -207,7 +207,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_receive">Empfang von Nachrichten</string>
     <string name="title_advanced_when">Wann</string>
     <string name="title_advanced_always">Diese Konten immer synchronisieren</string>
-    <string name="title_advanced_optimize">Einstellungen automatisch optimieren</string>
     <string name="title_advanced_schedule">Zeitplan</string>
     <string name="title_advanced_unseen">Alle ungelesenen Nachrichten</string>
     <string name="title_advanced_flagged">Alle markierten Nachrichten</string>
@@ -352,6 +351,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_fts_indexed">%1$d / %2$d Nachrichten indiziert (%3$s)</string>
     <string name="title_advanced_english">Englische Sprache erzwingen</string>
     <string name="title_advanced_watchdog">Regelmäßig prüfen, ob FairEmail noch aktiv ist</string>
+    <string name="title_advanced_optimize">Einstellungen automatisch optimieren</string>
     <string name="title_advanced_updates">Nach Aktualisierungen suchen</string>
     <string name="title_advanced_experiments">Experimentelle Funktionen ermöglichen</string>
     <string name="title_advanced_crash_reports">Fehlerberichte senden</string>
@@ -429,7 +429,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_account_name_hint">Wird verwendet, um Ordner zu unterscheiden</string>
     <string name="title_account_interval_hint">Häufigkeit der Aktualisierung der Verbindung für Push-Meldungen oder Häufigkeit der Überprüfung auf neue Nachrichten</string>
     <string name="title_account_partial_fetch_hint">Deaktivieren Sie dies nur bei Nachrichten ohne Inhalt oder beschädigten Anhängen</string>
-    <string name="title_account_signature">Signaturtext</string>
     <string name="title_color">Farbe</string>
     <string name="title_account_ondemand">Manuell synchronisieren</string>
     <string name="title_account_notify">Separate Benachrichtigungen</string>
@@ -717,6 +716,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_user_interaction">Übertragung zu OpenKeychain</string>
     <string name="title_signed_data">Überprüfen Sie die Signatur, um den Nachrichtentext anzuzeigen</string>
     <string name="title_not_encrypted">Nachricht ist nicht signiert oder verschlüsselt</string>
+    <string name="title_no_sign_key">Kein Signaturschlüssel ausgewählt</string>
     <string name="title_reset_sign_key">Sign-Schlüssel zurücksetzen</string>
     <string name="title_signature_none">Unsignierte Nachricht</string>
     <string name="title_signature_valid">Gültige Nachrichtensignatur</string>
@@ -762,6 +762,9 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_force_sync">Synchronisation erzwingen</string>
     <string name="title_previous">Vorherige</string>
     <string name="title_next">Nächste</string>
+    <string name="title_edit_signature">Signatur bearbeiten</string>
+    <string name="title_edit_signature_text">Signaturtext</string>
+    <string name="title_edit_signature_image">Bild einfügen</string>
     <string name="title_answer_caption">Vorlage bearbeiten</string>
     <string name="title_answer_reply">Antwortvorlage</string>
     <string name="title_answer_name">Vorlagenname</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index d269a781f9..36aef3c3b4 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -170,7 +170,6 @@
     <string name="title_leave_on_device">Αφήστε μηνύματα στη συσκευή</string>
     <string name="title_check">Έλεγχος</string>
     <string name="title_no_standard">Αυτός ο πάροχος χρησιμοποιεί ιδιόκτητο ηλεκτρονικό ταχυδρομείο και το πρωτόκολλο δεν επιτρέπει να χρησιμοποιήσετε ηλεκτρονικό ταχυδρομείο τρίτου μέρους</string>
-    <string name="title_edit_html">Επεξεργασία ως HTML</string>
     <string name="title_synchronize_enabled">Συγχρονισμός</string>
     <string name="title_edit_properties">Επεξεργασία ιδιοτήτων</string>
     <string name="title_edit_rules">Επεξεργασία κανόνων</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 391d7dbbbc..780ee34535 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Recibir mensajes</string>
     <string name="title_advanced_when">Cuando</string>
     <string name="title_advanced_always">Siempre sincronizar estas cuentas</string>
-    <string name="title_advanced_optimize">Optimizar automáticamente los ajustes</string>
     <string name="title_advanced_schedule">Programar</string>
     <string name="title_advanced_unseen">Todos los mensajes no leídos</string>
     <string name="title_advanced_flagged">Todos los mensajes destacados</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d mensajes indexados (%3$s)</string>
     <string name="title_advanced_english">Forzar idioma inglés</string>
     <string name="title_advanced_watchdog">Comprobar periódicamente si FairEmail sigue activo</string>
+    <string name="title_advanced_optimize">Optimizar automáticamente los ajustes</string>
     <string name="title_advanced_updates">Buscar actualizaciones</string>
     <string name="title_advanced_experiments">Probar características experimentales</string>
     <string name="title_advanced_crash_reports">Enviar informes de errores</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Usado para diferenciar carpetas</string>
     <string name="title_account_interval_hint">Frecuencia de actualizar la conexión para mensajes push o frecuencia de comprobación de nuevos mensajes</string>
     <string name="title_account_partial_fetch_hint">Desactivar esto sólo en caso de mensajes vacíos o adjuntos corruptos</string>
-    <string name="title_account_signature">Texto de la firma</string>
     <string name="title_color">Color</string>
     <string name="title_account_ondemand">Sincronizar manualmente</string>
     <string name="title_account_notify">Notificaciones separadas</string>
@@ -479,7 +478,6 @@
     <string name="title_drafts_required">Una carpeta de borradores es necesaria para enviar mensajes</string>
     <string name="title_account_delete">¿Eliminar esta cuenta permanentemente?</string>
     <string name="title_identity_delete">¿Eliminar esta identidad permanentemente?</string>
-    <string name="title_edit_html">Editar como HTML</string>
     <string name="title_sign_key">Clave de firma: %1$s</string>
     <string name="title_last_connected">Última conexión: %1$s</string>
     <string name="title_storage_quota">Uso de almacenamiento del servidor: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index f9059abb69..d68cd382bd 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -206,7 +206,6 @@
     <string name="title_advanced_receive">Jaso mezuak</string>
     <string name="title_advanced_when">Noiz</string>
     <string name="title_advanced_always">Sinkronizatu beti kontu hauek</string>
-    <string name="title_advanced_optimize">Optimizatu ezarpenak automatikoki</string>
     <string name="title_advanced_schedule">Egitaraua</string>
     <string name="title_advanced_unseen">Irakurri gabeko mezu guztiak</string>
     <string name="title_advanced_flagged">Izardun mezu guztiak</string>
@@ -351,6 +350,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d mezu indexatuak (%3$s)</string>
     <string name="title_advanced_english">Behartu hizkuntza ingelesa</string>
     <string name="title_advanced_watchdog">Aldiro egiaztatu FairEmail aktibo dagoen</string>
+    <string name="title_advanced_optimize">Optimizatu ezarpenak automatikoki</string>
     <string name="title_advanced_updates">Egiaztatu eguneraketarik dagoen</string>
     <string name="title_advanced_experiments">Probatu ezaugarri esperimentalak</string>
     <string name="title_advanced_crash_reports">Bidali errore txostenak</string>
@@ -427,7 +427,6 @@
     <string name="title_account_name_hint">Karpetak bereizteko erabilia</string>
     <string name="title_account_interval_hint">Mezu berrien arazketa freskatzeko maiztasuna</string>
     <string name="title_account_partial_fetch_hint">Ezgaitu hau mezu hutsak edo eranskinak hondatuta badaude</string>
-    <string name="title_account_signature">Sinaduraren testua</string>
     <string name="title_color">Kolorea</string>
     <string name="title_account_ondemand">Sinkronizatu eskuz</string>
     <string name="title_account_notify">Banatutako jakinarazpenak</string>
@@ -477,7 +476,6 @@
     <string name="title_drafts_required">Zirriborroen karpeta beharrezkoa da mezuak bidaltzeko</string>
     <string name="title_account_delete">Ezabatu kontu hau behin betiko?</string>
     <string name="title_identity_delete">Ezabatu identitate hau behin betiko?</string>
-    <string name="title_edit_html">Editatu HTML gisa</string>
     <string name="title_sign_key">Sinadura-gakoa: %1$s</string>
     <string name="title_last_connected">Azken konexioa: %1$s</string>
     <string name="title_storage_quota">Zerbitzariko biltegiratze erabilera: %1$s/%2$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 00b636ba4a..a1ebe3668c 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -115,7 +115,6 @@
     <string name="title_account_linked">حساب مرتبط</string>
     <string name="title_account_name">نام حساب</string>
     <string name="title_account_name_hint">برای افتراق پوشه‌ها استفاده می‌شود</string>
-    <string name="title_account_signature">متن امضا</string>
     <string name="title_account_notify">اعلانات جداگانه</string>
     <string name="title_account_left">کشیدن به چپ</string>
     <string name="title_account_right">کشیدن به راست</string>
@@ -146,7 +145,6 @@
     <string name="title_drafts_required">برای ارسال پیام‌ها به پوشه پیش‌نویس‌ها نیاز است</string>
     <string name="title_account_delete">حذف همیشگی این حساب؟</string>
     <string name="title_identity_delete">حذف همیشگی این هویت؟</string>
-    <string name="title_edit_html">ویرایش به صورت HTML</string>
     <string name="title_last_connected">آخرین اتصال: %1$s</string>
     <string name="title_advanced_browse">مرور پیام‌های روی سرور</string>
     <string name="title_synchronize_now">هم اکنون همگام سازی شود</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 263740b8d0..9d95ad33f9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -205,7 +205,6 @@
     <string name="title_advanced_receive">Vastaanota viestejä</string>
     <string name="title_advanced_when">Milloin</string>
     <string name="title_advanced_always">Synkronoi aina nämä tilit</string>
-    <string name="title_advanced_optimize">Optimoi asetukset automaattisesti</string>
     <string name="title_advanced_schedule">Aikataulu</string>
     <string name="title_advanced_unseen">Kaikki lukemattomat viestit</string>
     <string name="title_advanced_flagged">Kaikki tähdelliset viestit</string>
@@ -350,6 +349,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d viestiä indeksoitu (%3$s)</string>
     <string name="title_advanced_english">Pakota englannin kieli</string>
     <string name="title_advanced_watchdog">Tarkista toistuvasti, että FairEmail on edelleen aktiivinen</string>
+    <string name="title_advanced_optimize">Optimoi asetukset automaattisesti</string>
     <string name="title_advanced_updates">Päivitysten tarkastus</string>
     <string name="title_advanced_experiments">Käytä kokeellisia ominaisuuksia</string>
     <string name="title_advanced_crash_reports">Lähetä virheraportit</string>
@@ -427,7 +427,6 @@
     <string name="title_account_name_hint">Käytetään kansioiden tunnistamiseen</string>
     <string name="title_account_interval_hint">Push-viestien tai uusien viestien tarkistuksen aikaväli</string>
     <string name="title_account_partial_fetch_hint">Kytke tämä pois ainoastaan, jos ilmenee tyhjiä viestejä tai korruptoituneita liitteitä</string>
-    <string name="title_account_signature">Allekirjoituksen teksti</string>
     <string name="title_color">Väri</string>
     <string name="title_account_ondemand">Synkronoi manuaalisesti</string>
     <string name="title_account_notify">Erilliset ilmoitukset</string>
@@ -477,7 +476,6 @@
     <string name="title_drafts_required">Viestien lähettämiseen tarvitaan luonnoskansio</string>
     <string name="title_account_delete">Poistetaanko tämä tili pysyvästi?</string>
     <string name="title_identity_delete">Poistetaanko tämä identiteetti pysyvästi?</string>
-    <string name="title_edit_html">Muokkaa HTML-muodossa</string>
     <string name="title_sign_key">Allekirjoitusavain: %1$s</string>
     <string name="title_last_connected">Viimeksi yhdistetty: %1$s</string>
     <string name="title_storage_quota">Palvelimen tallennustilan käyttö: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 6bc10f6559..73ad628614 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Recevoir des messages</string>
     <string name="title_advanced_when">Quand</string>
     <string name="title_advanced_always">Toujours synchroniser ces comptes</string>
-    <string name="title_advanced_optimize">Optimiser automatiquement les paramètres</string>
     <string name="title_advanced_schedule">Planification</string>
     <string name="title_advanced_unseen">Tous les messages non lus</string>
     <string name="title_advanced_flagged">Tous les messages suivis</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d messages indexés (%3$s)</string>
     <string name="title_advanced_english">Forcer la langue anglaise</string>
     <string name="title_advanced_watchdog">Vérifier périodiquement si FairEmail est toujours actif</string>
+    <string name="title_advanced_optimize">Optimiser automatiquement les paramètres</string>
     <string name="title_advanced_updates">Vérifier les mises à jour</string>
     <string name="title_advanced_experiments">Essayer les fonctionnalités expérimentales</string>
     <string name="title_advanced_crash_reports">Envoyer des rapports d\'erreur</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Utilisé pour différencier les dossiers</string>
     <string name="title_account_interval_hint">Fréquence de rafraîchissement de la connexion pour les messages push ou la fréquence de vérification des nouveaux messages</string>
     <string name="title_account_partial_fetch_hint">Désactiver ceci seulement dans le cas de messages vides ou de pièces jointes corrompues</string>
-    <string name="title_account_signature">Texte de la signature</string>
     <string name="title_color">Couleur</string>
     <string name="title_account_ondemand">Synchroniser manuellement</string>
     <string name="title_account_notify">Notifications séparées</string>
@@ -717,6 +716,7 @@
     <string name="title_user_interaction">Transfert vers OpenKeychain</string>
     <string name="title_signed_data">Vérifier la signature pour afficher le texte du message</string>
     <string name="title_not_encrypted">Le message n\'est pas signé ou chiffré</string>
+    <string name="title_no_sign_key">Aucune clé de signature sélectionnée</string>
     <string name="title_reset_sign_key">Réinitialiser la clé de signature</string>
     <string name="title_signature_none">Message non signé</string>
     <string name="title_signature_valid">Signature de message valide</string>
@@ -762,6 +762,9 @@
     <string name="title_force_sync">Forcer la synchronisation</string>
     <string name="title_previous">Précédent</string>
     <string name="title_next">Suivant</string>
+    <string name="title_edit_signature">Modifier la signature</string>
+    <string name="title_edit_signature_text">Texte de la signature</string>
+    <string name="title_edit_signature_image">Insérer une image</string>
     <string name="title_answer_caption">Modifier le modèle</string>
     <string name="title_answer_reply">Modèle de réponse</string>
     <string name="title_answer_name">Nom du modèle</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 53cfa30f0f..c164ceb639 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -285,6 +285,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_contrast">Koristi visoki kontrast za tekst poruke</string>
     <string name="title_advanced_monospaced">Upotrijebiti font u jednolikim razmjerima za tekst poruke</string>
     <string name="title_advanced_text_color">Pokaži boje teksta</string>
+    <string name="title_advanced_text_size">Prikaži male i velike tekstove</string>
     <string name="title_advanced_collapse_quotes">Sažmi citirani tekst</string>
     <string name="title_advanced_images_inline">Automatski prikaz uključenih slika</string>
     <string name="title_advanced_seekbar">Prikaži relativni položaj razgovora s točkom</string>
@@ -358,6 +359,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_fts_indexed">%1$d / %2$d poruke indeksirane (%3$s)</string>
     <string name="title_advanced_english">Prisiliti engleski jezik</string>
     <string name="title_advanced_watchdog">Povremeno provjeriti je li je FairEmail još uvijek aktivan</string>
+    <string name="title_advanced_optimize">Postavke automatski optimizirati</string>
     <string name="title_advanced_updates">Provjeri ažuriranja</string>
     <string name="title_advanced_experiments">Probaj eksperimentalne značajke</string>
     <string name="title_advanced_crash_reports">Pošalji izvješća o pogrešci</string>
@@ -435,7 +437,6 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_account_name_hint">Koristi se za razlikovanje mapa</string>
     <string name="title_account_interval_hint">Učestalost osvježavanja veze za push poruke ili učestalost provjere novih poruka</string>
     <string name="title_account_partial_fetch_hint">Onemogućite ovo samo u slučaju praznih poruka ili oštećenih privitaka</string>
-    <string name="title_account_signature">Tekst potpisa</string>
     <string name="title_color">Boja</string>
     <string name="title_account_ondemand">Ručno sinkroniziranje</string>
     <string name="title_account_notify">Odvojene obavijesti</string>
@@ -475,6 +476,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_no_password">Nedostaje lozinka</string>
     <string name="title_no_inbox">Ulazni spremnik nije pronađen</string>
     <string name="title_no_primary_drafts">Nema primarnog računa ili mape skica</string>
+    <string name="title_no_identities">Za slanje e-poruka potreban je barem jedan identitet i mapa za skice</string>
     <string name="title_no_standard">Ovaj davatelj koristi vlasnički protokol e-pošte i stoga nije moguće koristiti klijente e-pošte trećih strana</string>
     <string name="title_no_idle">Ovaj davatelj usluga ne podržava push poruke. To će odgoditi prijem novih poruka i povećati potrošnju baterije.</string>
     <string name="title_no_utf8">Ovaj davatelj ne podržava UTF-8</string>
@@ -620,6 +622,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_no_search">Pretraživanje na poslužitelju nije dostupno za ovaj račun</string>
     <string name="title_too_large">Poruka je prevelika da bi se u potpunosti preoblikovala</string>
     <string name="title_truncated">Poruka je prevelika da bi se u potpunosti prikazala</string>
+    <string name="title_insufficient_memory">Poruka je prevelika da bi se uklopila u dostupnu memoriju</string>
     <string name="title_show_full">Prikaži cijelu poruku</string>
     <string name="title_unused_inline">Neiskorištene umetnute slike uklanjaju se prilikom slanja</string>
     <string name="title_accross_remark">Poruke prebačene preko računa ponovno će se preuzeti, što će rezultirati dodatnom upotrebom podataka</string>
@@ -728,6 +731,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_signature_unconfirmed_from">Potpis poruke je valjan, ali nije potvrđen: %1$s</string>
     <string name="title_signature_invalid">Nevažeći potpis poruke</string>
     <string name="title_signature_invalid_reason">Potpis poruke nije važeći: %1$s</string>
+    <string name="title_signature_key_missing">Nedostaje ključ za provjeru potpisa</string>
     <string name="title_signature_certificate_invalid">Lanac potvrda nije valjan</string>
     <string name="title_signature_sender">Adresa pošiljatelja</string>
     <string name="title_signature_email">Adresa potpisa</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index b23640df6b..57eb6794a0 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -411,7 +411,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_account_name_hint">Mappák elkülönítésére használatos</string>
     <string name="title_account_interval_hint">A push üzenetek fogadásának, vagy az új üzenetek ellenőrzésének gyakorisága</string>
     <string name="title_account_partial_fetch_hint">Csak hiányzó üzenet szövegek vagy hibás mellékletek esetén kapcsolja ki ezt az opciót</string>
-    <string name="title_account_signature">Aláírás szövege</string>
     <string name="title_color">Szín</string>
     <string name="title_account_ondemand">Manuális szinkronizálás</string>
     <string name="title_account_notify">Értesítések elkülönítése</string>
@@ -454,7 +453,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_drafts_required">Az üzenetek küldéséhez piszkozat mappa szükséges</string>
     <string name="title_account_delete">Véglegesen törli a fiókot?</string>
     <string name="title_identity_delete">Véglegesen törli az identitást?</string>
-    <string name="title_edit_html">Szerkesztés HTML-ként</string>
     <string name="title_sign_key">Aláíró kulcs: %1$s</string>
     <string name="title_last_connected">Utoljára csatlakozva: %1$s</string>
     <string name="title_storage_quota">Szerver tárhely használatban: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index cba4ab45a8..3f3b559ec2 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -206,7 +206,6 @@
     <string name="title_advanced_receive">Ricevi messaggi</string>
     <string name="title_advanced_when">Quando</string>
     <string name="title_advanced_always">Sincronizza sempre questi account</string>
-    <string name="title_advanced_optimize">Ottimizza automaticamente le impostazioni</string>
     <string name="title_advanced_schedule">Pianificazione</string>
     <string name="title_advanced_unseen">Tutti i messaggi non letti</string>
     <string name="title_advanced_flagged">Tutti i messaggi preferiti</string>
@@ -351,6 +350,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d messaggi indicizzati (%3$s)</string>
     <string name="title_advanced_english">Forza la lingua inglese</string>
     <string name="title_advanced_watchdog">Controlla periodicamente se FairEmail è ancora attiva</string>
+    <string name="title_advanced_optimize">Ottimizza automaticamente le impostazioni</string>
     <string name="title_advanced_updates">Controlla aggiornamenti</string>
     <string name="title_advanced_experiments">Prova le funzionalità sperimentali</string>
     <string name="title_advanced_crash_reports">Invia rapporti di errore</string>
@@ -428,7 +428,6 @@
     <string name="title_account_name_hint">Usato per differenziare le cartelle</string>
     <string name="title_account_interval_hint">Frequenza di aggiornamento della connessione per i messaggi push o frequenza di controllo per i nuovi messaggi</string>
     <string name="title_account_partial_fetch_hint">Disabilita questo solo in caso di messaggi vuoti o allegati corrotti</string>
-    <string name="title_account_signature">Testo della firma</string>
     <string name="title_color">Colore</string>
     <string name="title_account_ondemand">Sincronizza manualmente</string>
     <string name="title_account_notify">Notifiche separate</string>
@@ -715,6 +714,7 @@
     <string name="title_user_interaction">Trasferimento a OpenKeychain</string>
     <string name="title_signed_data">Verifica la firma per mostrare il testo del messaggio</string>
     <string name="title_not_encrypted">Il messaggio non è firmato o cifrato</string>
+    <string name="title_no_sign_key">Nessuna chiave di firma selezionata</string>
     <string name="title_reset_sign_key">Reimposta il tasto del segno</string>
     <string name="title_signature_none">Messaggio non firmato</string>
     <string name="title_signature_valid">Firma messaggio valida</string>
@@ -760,6 +760,9 @@
     <string name="title_force_sync">Forza sincronizzazione</string>
     <string name="title_previous">Precedente</string>
     <string name="title_next">Successivo</string>
+    <string name="title_edit_signature">Modifica firma</string>
+    <string name="title_edit_signature_text">Testo della firma</string>
+    <string name="title_edit_signature_image">Inserisci immagine</string>
     <string name="title_answer_caption">Modifica modello</string>
     <string name="title_answer_reply">Modello di risposta</string>
     <string name="title_answer_name">Nome del modello</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index c13cef02a2..3f083f7d62 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -337,6 +337,7 @@
     <string name="title_advanced_fts_indexed">%1$d/%2$d個のメッセージがインデックス付けされました(%3$s)</string>
     <string name="title_advanced_english">強制的に英語表示</string>
     <string name="title_advanced_watchdog">FairEmailがアクティブか定期的に確認</string>
+    <string name="title_advanced_optimize">設定を自動的に最適化する</string>
     <string name="title_advanced_updates">更新を確認</string>
     <string name="title_advanced_experiments">実験的な機能を試す</string>
     <string name="title_advanced_crash_reports">エラーレポートを送信</string>
@@ -413,7 +414,6 @@
     <string name="title_account_name_hint">フォルダを区別する為に使用</string>
     <string name="title_account_interval_hint">プッシュメッセージの接続を更新する頻度又は新しいメッセージを確認する頻度</string>
     <string name="title_account_partial_fetch_hint">空のメッセージ又は破損した添付ファイルの場合にのみ無効</string>
-    <string name="title_account_signature">署名のテキスト</string>
     <string name="title_color">カラー</string>
     <string name="title_account_ondemand">手動で同期</string>
     <string name="title_account_notify">個別の通知</string>
@@ -463,7 +463,6 @@
     <string name="title_drafts_required">メッセージを送信するには下書きフォルダが必要です</string>
     <string name="title_account_delete">このアカウントを完全に削除しますか？</string>
     <string name="title_identity_delete">このIDを完全に削除しますか？</string>
-    <string name="title_edit_html">HTMLとして編集</string>
     <string name="title_sign_key">署名キー:%1$s</string>
     <string name="title_last_connected">最終接続:%1$s</string>
     <string name="title_storage_quota">サーバストレージ使用量:%1$s/%2$s</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 13a5880fe5..3f09aef229 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Berichten ontvangen</string>
     <string name="title_advanced_when">Wanneer</string>
     <string name="title_advanced_always">Synchroniseer deze accounts altijd</string>
-    <string name="title_advanced_optimize">Automatisch instellingen optimaliseren</string>
     <string name="title_advanced_schedule">Schema</string>
     <string name="title_advanced_unseen">Alle ongelezen berichten</string>
     <string name="title_advanced_flagged">Alle berichten met een ster</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d berichten geïndexeerd (%3$s)</string>
     <string name="title_advanced_english">Forceer Engelse taal</string>
     <string name="title_advanced_watchdog">Periodiek controleren of FairEmail nog actief is</string>
+    <string name="title_advanced_optimize">Automatisch instellingen optimaliseren</string>
     <string name="title_advanced_updates">Controleren op updates</string>
     <string name="title_advanced_experiments">Probeer experimentele functies</string>
     <string name="title_advanced_crash_reports">Foutrapporten verzenden</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Wordt gebruikt voor het onderscheiden van mappen</string>
     <string name="title_account_interval_hint">Frequentie van het verversen van de verbinding voor push berichten of frequentie van het controleren op nieuwe berichten</string>
     <string name="title_account_partial_fetch_hint">Schakel dit alleen uit in het geval van lege berichten of corrupte bijlagen</string>
-    <string name="title_account_signature">Tekst handtekening</string>
     <string name="title_color">Kleur</string>
     <string name="title_account_ondemand">Handmatig synchroniseren</string>
     <string name="title_account_notify">Afzonderlijke meldingen</string>
@@ -479,7 +478,7 @@
     <string name="title_drafts_required">Een concepten map is vereist om berichten te verzenden</string>
     <string name="title_account_delete">Verwijder dit account definitief?</string>
     <string name="title_identity_delete">Verwijder deze identiteit definitief?</string>
-    <string name="title_edit_html">Bewerk HTML</string>
+    <string name="title_edit_html">Bewerk als HTML</string>
     <string name="title_sign_key">Tekensleutel: %1$s</string>
     <string name="title_last_connected">Laatst verbonden: %1$s</string>
     <string name="title_storage_quota">Opslaggebruik server: %1$s/%2$s</string>
@@ -717,6 +716,7 @@
     <string name="title_user_interaction">Overdragen naar OpenKeychain</string>
     <string name="title_signed_data">Verifieer de handtekening om de berichttekst te tonen</string>
     <string name="title_not_encrypted">Bericht is niet ondertekend of versleuteld</string>
+    <string name="title_no_sign_key">Geen tekensleutel geselecteerd</string>
     <string name="title_reset_sign_key">Reset tekensleutel</string>
     <string name="title_signature_none">Bericht niet ondertekend</string>
     <string name="title_signature_valid">Handtekening bericht geldig</string>
@@ -762,6 +762,9 @@
     <string name="title_force_sync">Forceer verversen</string>
     <string name="title_previous">Vorige</string>
     <string name="title_next">Volgende</string>
+    <string name="title_edit_signature">Handtekening bewerken</string>
+    <string name="title_edit_signature_text">Tekst handtekening</string>
+    <string name="title_edit_signature_image">Afbeelding invoegen</string>
     <string name="title_answer_caption">Bewerk sjabloon</string>
     <string name="title_answer_reply">Antwoord sjabloon</string>
     <string name="title_answer_name">Sjabloonnaam</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index f4165fa93b..5b0c481f00 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_always">Synkroniser alltid disse kontoene</string>
-    <string name="title_advanced_optimize">Optimaliser innstillinger automatisk</string>
     <string name="title_advanced_schedule">Tidsplan</string>
     <string name="title_advanced_unseen">Alle uleste meldinger</string>
     <string name="title_advanced_flagged">Alle stjernemerkede meldinger</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d meldinger indeksert (%3$s)</string>
     <string name="title_advanced_english">Tving bruk av engelsk</string>
     <string name="title_advanced_watchdog">Kontroller regelmessig om FairEmail fortsatt er aktiv</string>
+    <string name="title_advanced_optimize">Optimaliser innstillinger automatisk</string>
     <string name="title_advanced_updates">Se etter oppdateringer</string>
     <string name="title_advanced_experiments">Prøv eksperimentelle funksjoner</string>
     <string name="title_advanced_crash_reports">Send feilrapporter</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Brukes til å skille mellom mapper</string>
     <string name="title_account_interval_hint">Frekvens for å forfriske forbindelsen for push meldinger eller hyppigheten av å sjekke nye meldinger</string>
     <string name="title_account_partial_fetch_hint">Deaktiver kun dette ved tomme meldinger eller korrupte vedlegg</string>
-    <string name="title_account_signature">Signaturtekst</string>
     <string name="title_color">Farge</string>
     <string name="title_account_ondemand">Synkroniser manuelt</string>
     <string name="title_account_notify">Separate meldinger</string>
@@ -716,6 +715,7 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_user_interaction">Overfører til OpenKeychain</string>
     <string name="title_signed_data">Bekreft signaturen for å vise meldingsteksten</string>
     <string name="title_not_encrypted">Meldingen er ikke signert eller kryptert</string>
+    <string name="title_no_sign_key">Ingen signert nøkkel valgt</string>
     <string name="title_reset_sign_key">Tilbakestill signert nøkkel</string>
     <string name="title_signature_none">Melding ikke signert</string>
     <string name="title_signature_valid">Meldings signatur gyldig</string>
@@ -761,6 +761,9 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_force_sync">Tving synkronisering</string>
     <string name="title_previous">Forrige</string>
     <string name="title_next">Neste</string>
+    <string name="title_edit_signature">Rediger signatur</string>
+    <string name="title_edit_signature_text">Signaturtekst</string>
+    <string name="title_edit_signature_image">Sett inn bilde</string>
     <string name="title_answer_caption">Rediger mal</string>
     <string name="title_answer_reply">Svarmal</string>
     <string name="title_answer_name">Navn på mal</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index f4165fa93b..5b0c481f00 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_always">Synkroniser alltid disse kontoene</string>
-    <string name="title_advanced_optimize">Optimaliser innstillinger automatisk</string>
     <string name="title_advanced_schedule">Tidsplan</string>
     <string name="title_advanced_unseen">Alle uleste meldinger</string>
     <string name="title_advanced_flagged">Alle stjernemerkede meldinger</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d meldinger indeksert (%3$s)</string>
     <string name="title_advanced_english">Tving bruk av engelsk</string>
     <string name="title_advanced_watchdog">Kontroller regelmessig om FairEmail fortsatt er aktiv</string>
+    <string name="title_advanced_optimize">Optimaliser innstillinger automatisk</string>
     <string name="title_advanced_updates">Se etter oppdateringer</string>
     <string name="title_advanced_experiments">Prøv eksperimentelle funksjoner</string>
     <string name="title_advanced_crash_reports">Send feilrapporter</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Brukes til å skille mellom mapper</string>
     <string name="title_account_interval_hint">Frekvens for å forfriske forbindelsen for push meldinger eller hyppigheten av å sjekke nye meldinger</string>
     <string name="title_account_partial_fetch_hint">Deaktiver kun dette ved tomme meldinger eller korrupte vedlegg</string>
-    <string name="title_account_signature">Signaturtekst</string>
     <string name="title_color">Farge</string>
     <string name="title_account_ondemand">Synkroniser manuelt</string>
     <string name="title_account_notify">Separate meldinger</string>
@@ -716,6 +715,7 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_user_interaction">Overfører til OpenKeychain</string>
     <string name="title_signed_data">Bekreft signaturen for å vise meldingsteksten</string>
     <string name="title_not_encrypted">Meldingen er ikke signert eller kryptert</string>
+    <string name="title_no_sign_key">Ingen signert nøkkel valgt</string>
     <string name="title_reset_sign_key">Tilbakestill signert nøkkel</string>
     <string name="title_signature_none">Melding ikke signert</string>
     <string name="title_signature_valid">Meldings signatur gyldig</string>
@@ -761,6 +761,9 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_force_sync">Tving synkronisering</string>
     <string name="title_previous">Forrige</string>
     <string name="title_next">Neste</string>
+    <string name="title_edit_signature">Rediger signatur</string>
+    <string name="title_edit_signature_text">Signaturtekst</string>
+    <string name="title_edit_signature_image">Sett inn bilde</string>
     <string name="title_answer_caption">Rediger mal</string>
     <string name="title_answer_reply">Svarmal</string>
     <string name="title_answer_name">Navn på mal</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index f8a629b489..88666ff46c 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -449,7 +449,6 @@
     <string name="title_account_name_hint">Używany do odróżnienia folderów</string>
     <string name="title_account_interval_hint">Częstotliwość odświeżania połączenia dla wiadomości Push lub częstotliwość sprawdzania nowych wiadomości</string>
     <string name="title_account_partial_fetch_hint">Wyłącz to tylko w przypadku pustych wiadomości lub uszkodzonych załączników</string>
-    <string name="title_account_signature">Tekst podpisu</string>
     <string name="title_color">Kolor</string>
     <string name="title_account_ondemand">Synchronizuj ręcznie</string>
     <string name="title_account_notify">Oddzielne powiadomienia</string>
@@ -498,7 +497,6 @@
     <string name="title_drafts_required">Folder szkiców jest wymagany do wysyłania wiadomości</string>
     <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
     <string name="title_identity_delete">Usunąć tożsamość bezpowrotnie?</string>
-    <string name="title_edit_html">Edytuj jako HTML</string>
     <string name="title_sign_key">Klucz podpisu: %1$s</string>
     <string name="title_last_connected">Ostatnio połączony: %1$s</string>
     <string name="title_storage_quota">Wykorzystane miejsce: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2b21a08f7b..2f69121237 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -411,7 +411,6 @@
     <string name="title_account_name_hint">Usada para diferenciar pastas</string>
     <string name="title_account_interval_hint">Frequência de atualizar a conexão para mensagens push ou frequência de verificação de novas mensagens</string>
     <string name="title_account_partial_fetch_hint">Desativar isto somente em caso de mensagens vazias ou anexos corrompidos</string>
-    <string name="title_account_signature">Texto da assinatura</string>
     <string name="title_color">Cor</string>
     <string name="title_account_ondemand">Sincronizar manualmente</string>
     <string name="title_account_notify">Notificações separadas</string>
@@ -459,7 +458,6 @@
     <string name="title_drafts_required">Uma pasta de rascunhos é necessário para enviar mensagens</string>
     <string name="title_account_delete">Excluir esta conta permanentemente?</string>
     <string name="title_identity_delete">Excluir esta identidade permanentemente?</string>
-    <string name="title_edit_html">Editar como HTML</string>
     <string name="title_sign_key">Assinar chave: %1$s</string>
     <string name="title_last_connected">Última vez conectado: %1$s</string>
     <string name="title_storage_quota">Uso do armazenamento do servidor: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5809a6d109..1f378a9904 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -430,7 +430,6 @@
     <string name="title_account_name_hint">Folosit la diferențierea dosarelor</string>
     <string name="title_account_interval_hint">Frecvența de actualizare a conexiunii pentru mesaje push sau frecventa de verificare de mesaje noi</string>
     <string name="title_account_partial_fetch_hint">Dezactivați numai pentru mesaje goale sau atașamente corupte</string>
-    <string name="title_account_signature">Text semnătură</string>
     <string name="title_color">Culoare</string>
     <string name="title_account_ondemand">Sincronizare manuală</string>
     <string name="title_account_notify">Separă notificările</string>
@@ -479,7 +478,6 @@
     <string name="title_drafts_required">Un dosar de ciorne este necesar pentru a trimite mesaje</string>
     <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
     <string name="title_identity_delete">Ștergeți definitiv această identitate?</string>
-    <string name="title_edit_html">Editează ca HTML</string>
     <string name="title_sign_key">Cheie semnatură: %1$s</string>
     <string name="title_last_connected">Ultima conectare: %1$s</string>
     <string name="title_storage_quota">Spațiu utilizat pe server: %1$s/%2$s</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9f156dee8d..77a78e94d6 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -229,7 +229,6 @@
     <string name="title_advanced_receive">Получить сообщения</string>
     <string name="title_advanced_when">Когда</string>
     <string name="title_advanced_always">Всегда синхронизировать эти учётные записи</string>
-    <string name="title_advanced_optimize">Автоматически оптимизировать настройки</string>
     <string name="title_advanced_schedule">Расписание</string>
     <string name="title_advanced_unseen">Все непрочитанные сообщения</string>
     <string name="title_advanced_flagged">Все избранные сообщения</string>
@@ -374,6 +373,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d сообщений проиндексировано (%3$s)</string>
     <string name="title_advanced_english">Принудительно использовать английский язык</string>
     <string name="title_advanced_watchdog">Регулярно проверять, активен ли FairEmail</string>
+    <string name="title_advanced_optimize">Автоматически оптимизировать настройки</string>
     <string name="title_advanced_updates">Проверять наличие обновлений</string>
     <string name="title_advanced_experiments">Попробовать экспериментальные функции</string>
     <string name="title_advanced_crash_reports">Отправлять отчёты об ошибках</string>
@@ -451,7 +451,6 @@
     <string name="title_account_name_hint">Используется для разграничения папок</string>
     <string name="title_account_interval_hint">Частота обновления соединения для push-сообщений или частота проверки новых сообщений</string>
     <string name="title_account_partial_fetch_hint">Отключайте это только в случае пустых сообщений или повреждённых вложений</string>
-    <string name="title_account_signature">Текст подписи</string>
     <string name="title_color">Цвет</string>
     <string name="title_account_ondemand">Синхронизировать вручную</string>
     <string name="title_account_notify">Раздельные уведомления</string>
@@ -739,6 +738,7 @@
     <string name="title_user_interaction">Перенос в OpenKeychain</string>
     <string name="title_signed_data">Проверить подпись, чтобы показать текст сообщения</string>
     <string name="title_not_encrypted">Сообщение не подписано и не зашифровано</string>
+    <string name="title_no_sign_key">Ключ подписи не выбран</string>
     <string name="title_reset_sign_key">Сброс ключа подписи</string>
     <string name="title_signature_none">Сообщение не подписано</string>
     <string name="title_signature_valid">Подпись сообщения действительна</string>
@@ -784,6 +784,9 @@
     <string name="title_force_sync">Принудительная синхронизация</string>
     <string name="title_previous">Назад</string>
     <string name="title_next">Вперёд</string>
+    <string name="title_edit_signature">Изменить подпись</string>
+    <string name="title_edit_signature_text">Текст подписи</string>
+    <string name="title_edit_signature_image">Вставить изображение</string>
     <string name="title_answer_caption">Изменить шаблон</string>
     <string name="title_answer_reply">Шаблон ответа</string>
     <string name="title_answer_name">Название шаблона</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 88960f9d32..258c8e501a 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -368,7 +368,6 @@
     <string name="title_account_name_hint">Користи се да разликује фасцикле</string>
     <string name="title_account_interval_hint">Фреквенција освежавања везе за гурање порука или фреквенција проверавања за нове поруке</string>
     <string name="title_account_partial_fetch_hint">Искључите ово само у случају празних порука или оштећених прилога</string>
-    <string name="title_account_signature">Текст потписа</string>
     <string name="title_color">Боја</string>
     <string name="title_account_ondemand">Синхронизуј ручно</string>
     <string name="title_account_notify">Одвојена обавештења</string>
@@ -412,7 +411,6 @@
     <string name="title_drafts_required">За слање порука је потребна фасцикла нацрта</string>
     <string name="title_account_delete">Трајно избрисати овај налог?</string>
     <string name="title_identity_delete">Трајно избрисати овај идентитет?</string>
-    <string name="title_edit_html">Измени као HTML</string>
     <string name="title_sign_key">Кључ потписа: %1$s</string>
     <string name="title_last_connected">Последње повезан: %1$s</string>
     <string name="title_pop_support">POP3 протокол подржава преузимање и брисање порука само из пријемног сандучета. POP3 не може да означава поруке као прочитане, да премешта поруке, итд. POP3 ће више трошити батерију и користити више података него IMAP. Размислите да користите IMAP протокол кад год можете.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 55d129c665..a27eea1fc1 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -319,7 +319,6 @@
     <string name="title_account_name_hint">Används för att differentiera mappar</string>
     <string name="title_account_interval_hint">Frekvens för att uppdatera anslutningen för pushmeddelanden eller frekvens för att söka efter nya meddelanden</string>
     <string name="title_account_partial_fetch_hint">Inaktivera detta endast vid tomma meddelanden eller korrupta bilagor</string>
-    <string name="title_account_signature">Signaturtext</string>
     <string name="title_color">Färg</string>
     <string name="title_account_notify">Separera aviseringar</string>
     <string name="title_account_left">Svep åt vänster</string>
@@ -358,7 +357,6 @@
     <string name="title_drafts_required">En mapp för utkast krävs för att skicka meddelanden</string>
     <string name="title_account_delete">Ta bort detta konto permanent?</string>
     <string name="title_identity_delete">Ta bort denna identitet permanent?</string>
-    <string name="title_edit_html">Redigera som HTML</string>
     <string name="title_last_connected">Senast ansluten: %1$s</string>
     <string name="title_oauth_support">OAuth stöds inte</string>
     <string name="title_review">Granska</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 93f3059d73..d50e13bf17 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -207,7 +207,6 @@
     <string name="title_advanced_receive">Mesajları al</string>
     <string name="title_advanced_when">Ne zaman</string>
     <string name="title_advanced_always">Bu hesapları her zaman senkronize et</string>
-    <string name="title_advanced_optimize">Ayarları otomatik olarak optimize et</string>
     <string name="title_advanced_schedule">Program</string>
     <string name="title_advanced_unseen">Tüm okunmamış iletiler</string>
     <string name="title_advanced_flagged">Tüm yıldızlı iletiler</string>
@@ -352,6 +351,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d mesaj indekslendi (%3$s)</string>
     <string name="title_advanced_english">İngilizce Diline Zorla</string>
     <string name="title_advanced_watchdog">Düzenli aralıklarla FairEmail hala etkin mi diye kontrol et</string>
+    <string name="title_advanced_optimize">Ayarları otomatik olarak optimize et</string>
     <string name="title_advanced_updates">Güncellemelere bak</string>
     <string name="title_advanced_experiments">Deneysel özellikleri deneyin</string>
     <string name="title_advanced_crash_reports">Hata raporları gönder</string>
@@ -429,7 +429,6 @@
     <string name="title_account_name_hint">Klasörleri ayırt etmek için kullanılır</string>
     <string name="title_account_interval_hint">Anlık mesajlar için bağlantı yenileme frekansı ya da yeni mesajlar için kontrol etme frekansı</string>
     <string name="title_account_partial_fetch_hint">Bunu yalnızca boş iletiler veya bozuk ekler olması durumunda devre dışı bırakın</string>
-    <string name="title_account_signature">İmza Metni</string>
     <string name="title_color">Renk</string>
     <string name="title_account_ondemand">Manuel olarak senkronize et</string>
     <string name="title_account_notify">Ayrı bildirimler</string>
@@ -717,6 +716,7 @@
     <string name="title_user_interaction">OpenKeychain\'e gönderiliyor</string>
     <string name="title_signed_data">Mesaj metnini göstermek için imzayı doğrula</string>
     <string name="title_not_encrypted">Mesaj imzalı veya şifreli değil</string>
+    <string name="title_no_sign_key">Hiçbir imzalama anahtarı seçilmedi</string>
     <string name="title_reset_sign_key">İmzalama anahtarını sıfırla</string>
     <string name="title_signature_none">İleti imzalı değil</string>
     <string name="title_signature_valid">İleti imzası geçerli</string>
@@ -762,6 +762,9 @@
     <string name="title_force_sync">Eşzamanlamaya zorla</string>
     <string name="title_previous">Önceki</string>
     <string name="title_next">Sonraki</string>
+    <string name="title_edit_signature">İmzayı düzenle</string>
+    <string name="title_edit_signature_text">İmza metni</string>
+    <string name="title_edit_signature_image">Resim ekle</string>
     <string name="title_answer_caption">Kalıbı Düzenle</string>
     <string name="title_answer_reply">Yanıt kalıbı</string>
     <string name="title_answer_name">Kalıp adı</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ea8de890e4..76043ba28a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -338,6 +338,7 @@
     <string name="title_advanced_fts_indexed">%1$d / %2$d 的消息已索引(%3$s)</string>
     <string name="title_advanced_english">强制使用英语</string>
     <string name="title_advanced_watchdog">定期检查FairEmail是否仍在运行</string>
+    <string name="title_advanced_optimize">自动优化设置</string>
     <string name="title_advanced_updates">检查更新</string>
     <string name="title_advanced_experiments">尝试实验性功能</string>
     <string name="title_advanced_crash_reports">发送错误报告</string>
@@ -415,7 +416,6 @@
     <string name="title_account_name_hint">用于区分文件夹</string>
     <string name="title_account_interval_hint">刷新连接推送消息的频率或检查新消息的频率</string>
     <string name="title_account_partial_fetch_hint">仅在空消息或损坏的附件时禁用此功能</string>
-    <string name="title_account_signature">签名文本</string>
     <string name="title_color">颜色</string>
     <string name="title_account_ondemand">手动同步</string>
     <string name="title_account_notify">单独的通知</string>
@@ -703,6 +703,7 @@
     <string name="title_user_interaction">正传输到 OpenKeychain</string>
     <string name="title_signed_data">验证签名以显示消息文本</string>
     <string name="title_not_encrypted">消息未签名或加密</string>
+    <string name="title_no_sign_key">未选择签名密钥</string>
     <string name="title_reset_sign_key">重置签名密钥</string>
     <string name="title_signature_none">消息未签名</string>
     <string name="title_signature_valid">消息签名有效</string>
@@ -748,6 +749,9 @@
     <string name="title_force_sync">强制同步</string>
     <string name="title_previous">上一则</string>
     <string name="title_next">下一则</string>
+    <string name="title_edit_signature">编辑签名</string>
+    <string name="title_edit_signature_text">签名文本</string>
+    <string name="title_edit_signature_image">插入图片</string>
     <string name="title_answer_caption">编辑模板</string>
     <string name="title_answer_reply">回复模板</string>
     <string name="title_answer_name">模板名称</string>