diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 89fe6ffa8d..34b577955d 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -203,8 +203,8 @@
     <string name="title_advanced_section_connection">Свързване</string>
     <string name="title_advanced_section_display">Дисплей</string>
     <string name="title_advanced_section_behavior">Поведение</string>
-    <string name="title_advanced_section_notifications">Известия</string>
     <string name="title_advanced_section_privacy">Поверителност</string>
+    <string name="title_advanced_section_notifications">Известия</string>
     <string name="title_advanced_section_misc">Разни</string>
     <string name="title_advanced_receive">Получени съобщения</string>
     <string name="title_advanced_when">Кога</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 6fcf0d379b..952a580b9b 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -175,8 +175,8 @@
     <string name="title_advanced_section_connection">Connexió</string>
     <string name="title_advanced_section_display">Visualització</string>
     <string name="title_advanced_section_behavior">Comportament</string>
-    <string name="title_advanced_section_notifications">Notificacions</string>
     <string name="title_advanced_section_privacy">Privacitat</string>
+    <string name="title_advanced_section_notifications">Notificacions</string>
     <string name="title_advanced_section_misc">Miscel·lània</string>
     <string name="title_advanced_receive">Rebre missatges</string>
     <string name="title_advanced_when">Quan</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 188c63328b..1480176dbd 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -225,8 +225,8 @@
     <string name="title_advanced_section_connection">Připojení</string>
     <string name="title_advanced_section_display">Zobrazení</string>
     <string name="title_advanced_section_behavior">Chování</string>
-    <string name="title_advanced_section_notifications">Oznámení</string>
     <string name="title_advanced_section_privacy">Soukromí</string>
+    <string name="title_advanced_section_notifications">Oznámení</string>
     <string name="title_advanced_section_misc">Ostatní</string>
     <string name="title_advanced_receive">Přijímat zprávy</string>
     <string name="title_advanced_when">Kdy</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index d9e403881d..d91a5657ee 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -202,8 +202,8 @@
     <string name="title_advanced_section_connection">Forbindelse</string>
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Adfærd</string>
-    <string name="title_advanced_section_notifications">Notifikationer</string>
     <string name="title_advanced_section_privacy">Fortrolighed</string>
+    <string name="title_advanced_section_notifications">Notifikationer</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Beskedmodtagelse</string>
     <string name="title_advanced_when">Når</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4bc5acac5d..7a0c1083d8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -203,8 +203,9 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_section_connection">Verbindung</string>
     <string name="title_advanced_section_display">Anzeige</string>
     <string name="title_advanced_section_behavior">Verhalten</string>
-    <string name="title_advanced_section_notifications">Benachrichtigungen</string>
     <string name="title_advanced_section_privacy">Datenschutz</string>
+    <string name="title_advanced_section_encryption">Verschlüsselung</string>
+    <string name="title_advanced_section_notifications">Benachrichtigungen</string>
     <string name="title_advanced_section_misc">Verschiedenes</string>
     <string name="title_advanced_receive">Empfang von Nachrichten</string>
     <string name="title_advanced_when">Wann</string>
@@ -242,6 +243,9 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_ssl_harden">SSL-Verbindungen stärken</string>
     <string name="title_advanced_socks">SOCKS Proxy verwenden</string>
     <string name="title_advanced_manage_connectivity">Konnektivität verwalten</string>
+    <string name="title_advanced_caption_general">Allgemein</string>
+    <string name="title_advanced_caption_conversation">Unterhaltung</string>
+    <string name="title_advanced_caption_message">Nachricht</string>
     <string name="title_advanced_landscape">Zwei Spalten im Querformat verwenden</string>
     <string name="title_advanced_landscape3">Festes Navigationsmenü im Querformat erlauben</string>
     <string name="title_advanced_startup">Auf Startbildschirm anzeigen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index eded030526..60b536e370 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -203,8 +203,8 @@
     <string name="title_advanced_section_connection">Conexión</string>
     <string name="title_advanced_section_display">Mostrar</string>
     <string name="title_advanced_section_behavior">Comportamiento</string>
-    <string name="title_advanced_section_notifications">Notificaciones</string>
     <string name="title_advanced_section_privacy">Privacidad</string>
+    <string name="title_advanced_section_notifications">Notificaciones</string>
     <string name="title_advanced_section_misc">Miscelánea</string>
     <string name="title_advanced_receive">Recibir mensajes</string>
     <string name="title_advanced_when">Cuando</string>
@@ -287,6 +287,7 @@
     <string name="title_advanced_navbar_colorize">Colorear la barra de navegación de Android</string>
     <string name="title_advanced_double_back">Doble \'atrás\' para salir</string>
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
+    <string name="title_advanced_hide_actionbar">Ocultar barra de acción al desplazarse hacia abajo</string>
     <string name="title_advanced_autoscroll">Desplazar hacia arriba al recibir nuevos mensajes</string>
     <string name="title_advanced_double_tap">Doble toque para marcar mensaje leído/no leído</string>
     <string name="title_advanced_swipenav">Deslice a la izquierda/derecha para ir a la siguiente/anterior conversación</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index df32a9ded7..40a735502d 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -202,8 +202,8 @@
     <string name="title_advanced_section_connection">Konexioa</string>
     <string name="title_advanced_section_display">Bistaratzea</string>
     <string name="title_advanced_section_behavior">Portaera</string>
-    <string name="title_advanced_section_notifications">Jakinarazpenak</string>
     <string name="title_advanced_section_privacy">Pribatutasuna</string>
+    <string name="title_advanced_section_notifications">Jakinarazpenak</string>
     <string name="title_advanced_section_misc">Miszelanea</string>
     <string name="title_advanced_receive">Jaso mezuak</string>
     <string name="title_advanced_when">Noiz</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index e451837e02..2cc23ca394 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -200,8 +200,8 @@
     <string name="title_advanced_section_connection">Yhteys</string>
     <string name="title_advanced_section_display">Ulkoasu</string>
     <string name="title_advanced_section_behavior">Toiminnot</string>
-    <string name="title_advanced_section_notifications">Ilmoitukset</string>
     <string name="title_advanced_section_privacy">Yksityisyys</string>
+    <string name="title_advanced_section_notifications">Ilmoitukset</string>
     <string name="title_advanced_section_misc">Sekalaiset</string>
     <string name="title_advanced_receive">Vastaanota viestejä</string>
     <string name="title_advanced_when">Milloin</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index e1b97c6c44..b96a644ce5 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -70,7 +70,7 @@
     <string name="title_block_sender">Bloquer l\'expéditeur</string>
     <string name="title_block_domain">Bloquer le domaine de l\'expéditeur</string>
     <string name="title_block_sender_hint">        Bloquer un expéditeur créera une règle pour déplacer automatiquement les futurs messages vers le dossier spam.
-        La création et l\'utilisation de règles sont des fonctionnalités Pro.
+        La création et l\'utilisation des règles sont des fonctionnalités Pro.
     </string>
     <string name="title_notification_waiting">En attente d\'une connexion réseau suffisante</string>
     <string name="title_notification_sending">Envoi des messages en cours</string>
@@ -203,8 +203,9 @@
     <string name="title_advanced_section_connection">Connexion</string>
     <string name="title_advanced_section_display">Affichage</string>
     <string name="title_advanced_section_behavior">Comportement</string>
-    <string name="title_advanced_section_notifications">Notifications</string>
     <string name="title_advanced_section_privacy">Confidentialité</string>
+    <string name="title_advanced_section_encryption">Chiffrement</string>
+    <string name="title_advanced_section_notifications">Notifications</string>
     <string name="title_advanced_section_misc">Divers</string>
     <string name="title_advanced_receive">Recevoir des messages</string>
     <string name="title_advanced_when">Quand</string>
@@ -242,6 +243,9 @@
     <string name="title_advanced_ssl_harden">Renforcer les connexions SSL</string>
     <string name="title_advanced_socks">Utiliser un proxy SOCKS</string>
     <string name="title_advanced_manage_connectivity">Gérer la connectivité</string>
+    <string name="title_advanced_caption_general">Général</string>
+    <string name="title_advanced_caption_conversation">Conversation</string>
+    <string name="title_advanced_caption_message">Message</string>
     <string name="title_advanced_landscape">Utiliser deux colonnes en mode paysage</string>
     <string name="title_advanced_landscape3">Afficher le menu de navigation fixe en mode paysage</string>
     <string name="title_advanced_startup">Afficher sur l\'écran de démarrage</string>
@@ -287,6 +291,7 @@
     <string name="title_advanced_navbar_colorize">Colorer la barre de navigation Android</string>
     <string name="title_advanced_double_back">Faire « Retour » deux fois pour quitter</string>
     <string name="title_advanced_pull_refresh">Tirer vers le bas pour actualiser</string>
+    <string name="title_advanced_hide_actionbar">Masquer la barre d\'action lors du défilement vers le bas</string>
     <string name="title_advanced_autoscroll">Faire défiler vers le haut lors de la réception de nouveaux messages</string>
     <string name="title_advanced_double_tap">Appuyer deux fois pour marquer le message lu/non lu</string>
     <string name="title_advanced_swipenav">Balayer vers la gauche/droite pour passer à la conversation suivante/précédente</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index c240fca9f9..f3192de47f 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -209,8 +209,8 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_section_connection">Veza</string>
     <string name="title_advanced_section_display">Prikaz</string>
     <string name="title_advanced_section_behavior">Ponašanje</string>
-    <string name="title_advanced_section_notifications">Obavijesti</string>
     <string name="title_advanced_section_privacy">Privatnost</string>
+    <string name="title_advanced_section_notifications">Obavijesti</string>
     <string name="title_advanced_section_misc">Razno</string>
     <string name="title_advanced_receive">Primljane poruka</string>
     <string name="title_advanced_when">Kada</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 5808829be6..865e70fd7e 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -201,8 +201,8 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_section_connection">Kapcsolat</string>
     <string name="title_advanced_section_display">Megjelenés</string>
     <string name="title_advanced_section_behavior">Működés</string>
-    <string name="title_advanced_section_notifications">Értesítések</string>
     <string name="title_advanced_section_privacy">Adatvédelem</string>
+    <string name="title_advanced_section_notifications">Értesítések</string>
     <string name="title_advanced_section_misc">Egyebek</string>
     <string name="title_advanced_receive">Üzenetek fogadása</string>
     <string name="title_advanced_when">Mikor</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 7be6e21783..11e07b1bb4 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -202,8 +202,9 @@
     <string name="title_advanced_section_connection">Connessione</string>
     <string name="title_advanced_section_display">Schermo</string>
     <string name="title_advanced_section_behavior">Comportamento</string>
-    <string name="title_advanced_section_notifications">Notifiche</string>
     <string name="title_advanced_section_privacy">Privacy</string>
+    <string name="title_advanced_section_encryption">Crittografia</string>
+    <string name="title_advanced_section_notifications">Notifiche</string>
     <string name="title_advanced_section_misc">Altro</string>
     <string name="title_advanced_receive">Ricevi messaggi</string>
     <string name="title_advanced_when">Quando</string>
@@ -241,6 +242,9 @@
     <string name="title_advanced_ssl_harden">Connessioni SSL Harden</string>
     <string name="title_advanced_socks">Usa SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Gestisci connettività</string>
+    <string name="title_advanced_caption_general">Generale</string>
+    <string name="title_advanced_caption_conversation">Conversazione</string>
+    <string name="title_advanced_caption_message">Messaggio</string>
     <string name="title_advanced_landscape">Usa due colonne in modalità orizzontale</string>
     <string name="title_advanced_landscape3">Consenti menu di navigazione fisso in modalità orizzontale</string>
     <string name="title_advanced_startup">Mostra nella schermata iniziale</string>
@@ -286,6 +290,7 @@
     <string name="title_advanced_navbar_colorize">Colora la barra di navigazione di Android</string>
     <string name="title_advanced_double_back">Doppio \'indietro\' per uscire</string>
     <string name="title_advanced_pull_refresh">Trascina in basso per aggiornare</string>
+    <string name="title_advanced_hide_actionbar">Nascondi la barra delle azioni quando scorri in basso</string>
     <string name="title_advanced_autoscroll">Scorri verso l\'alto quando ricevi nuovi messaggi</string>
     <string name="title_advanced_double_tap">Doppio tocco per segnare il messaggio letto/non letto</string>
     <string name="title_advanced_swipenav">Scorri a sinistra/destra per andare alla conversazione successiva/precedente</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 32817849a7..057ae3ddb6 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -189,8 +189,9 @@
     <string name="title_advanced_section_connection">接続</string>
     <string name="title_advanced_section_display">表示</string>
     <string name="title_advanced_section_behavior">動作</string>
-    <string name="title_advanced_section_notifications">通知</string>
     <string name="title_advanced_section_privacy">プライバシー</string>
+    <string name="title_advanced_section_encryption">暗号化</string>
+    <string name="title_advanced_section_notifications">通知</string>
     <string name="title_advanced_section_misc">その他</string>
     <string name="title_advanced_receive">メッセージを受信する</string>
     <string name="title_advanced_when">同期</string>
@@ -228,6 +229,9 @@
     <string name="title_advanced_ssl_harden">SSL接続を有効</string>
     <string name="title_advanced_socks">SOCKS proxyを使用</string>
     <string name="title_advanced_manage_connectivity">接続の管理</string>
+    <string name="title_advanced_caption_general">全般</string>
+    <string name="title_advanced_caption_conversation">会話</string>
+    <string name="title_advanced_caption_message">メッセージ</string>
     <string name="title_advanced_landscape">横向きモードで2列を使用</string>
     <string name="title_advanced_landscape3">横向きモードで固定ナビゲーションメニューを許可</string>
     <string name="title_advanced_startup">スタート画面に表示</string>
@@ -273,6 +277,7 @@
     <string name="title_advanced_navbar_colorize">Androidナビゲーションバーの色付け</string>
     <string name="title_advanced_double_back">\"戻る\"をダブルタップして終了</string>
     <string name="title_advanced_pull_refresh">プルダウンして更新</string>
+    <string name="title_advanced_hide_actionbar">スクロールダウン時にアクションバーを非表示</string>
     <string name="title_advanced_autoscroll">新着メッセージを受信したらトップにスクロール</string>
     <string name="title_advanced_double_tap">ダブルタップでメッセージを既読/未読にします</string>
     <string name="title_advanced_swipenav">左/右にスワイプで次/前の会話に移動</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 6346442d4a..26dfd65878 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -203,8 +203,9 @@
     <string name="title_advanced_section_connection">Verbinding</string>
     <string name="title_advanced_section_display">Weergave</string>
     <string name="title_advanced_section_behavior">Gedrag</string>
-    <string name="title_advanced_section_notifications">Meldingen</string>
     <string name="title_advanced_section_privacy">Privacy</string>
+    <string name="title_advanced_section_encryption">Versleuteling</string>
+    <string name="title_advanced_section_notifications">Meldingen</string>
     <string name="title_advanced_section_misc">Diversen</string>
     <string name="title_advanced_receive">Berichten ontvangen</string>
     <string name="title_advanced_when">Wanneer</string>
@@ -242,6 +243,9 @@
     <string name="title_advanced_ssl_harden">Verhard SSL-verbindingen</string>
     <string name="title_advanced_socks">Gebruik SOCKS proxy</string>
     <string name="title_advanced_manage_connectivity">Beheer connectiviteit</string>
+    <string name="title_advanced_caption_general">Algemeen</string>
+    <string name="title_advanced_caption_conversation">Gesprek</string>
+    <string name="title_advanced_caption_message">Bericht</string>
     <string name="title_advanced_landscape">Twee kolommen gebruiken in liggende modus</string>
     <string name="title_advanced_landscape3">Vaste navigatiemenu toestaan in liggende modus</string>
     <string name="title_advanced_startup">Toon op het startscherm</string>
@@ -287,6 +291,7 @@
     <string name="title_advanced_navbar_colorize">Kleur de Android-navigatiebalk in</string>
     <string name="title_advanced_double_back">Dubbel \'terug\' om te sluiten</string>
     <string name="title_advanced_pull_refresh">Omlaag schuiven om te verversen</string>
+    <string name="title_advanced_hide_actionbar">Actiebalk verbergen bij het omlaag scrollen</string>
     <string name="title_advanced_autoscroll">Scroll naar boven bij het ontvangen van nieuwe berichten</string>
     <string name="title_advanced_double_tap">Dubbel tik om bericht gelezen/ongelezen te markeren</string>
     <string name="title_advanced_swipenav">Veeg links/rechts om naar het volgende/vorige gesprek te gaan</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index f0d45b3e63..5c555c8065 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -203,8 +203,8 @@
     <string name="title_advanced_section_connection">Forbindelse</string>
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
-    <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_privacy">Personvern</string>
+    <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index f0d45b3e63..5c555c8065 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -203,8 +203,8 @@
     <string name="title_advanced_section_connection">Forbindelse</string>
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
-    <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_privacy">Personvern</string>
+    <string name="title_advanced_section_notifications">Varslinger</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Motta meldinger</string>
     <string name="title_advanced_when">Når</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 36434620a7..f8b41c932c 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -224,8 +224,8 @@
     <string name="title_advanced_section_connection">Połączenie</string>
     <string name="title_advanced_section_display">Wyświetlanie</string>
     <string name="title_advanced_section_behavior">Zachowanie</string>
-    <string name="title_advanced_section_notifications">Powiadomienia</string>
     <string name="title_advanced_section_privacy">Prywatność</string>
+    <string name="title_advanced_section_notifications">Powiadomienia</string>
     <string name="title_advanced_section_misc">Różne</string>
     <string name="title_advanced_receive">Odbierz wiadomości</string>
     <string name="title_advanced_when">Kiedy</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4660bd966c..c576edc388 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -198,8 +198,8 @@
     <string name="title_advanced_section_connection">Conexão</string>
     <string name="title_advanced_section_display">Exibição</string>
     <string name="title_advanced_section_behavior">Comportamento</string>
-    <string name="title_advanced_section_notifications">Notificações</string>
     <string name="title_advanced_section_privacy">Privacidade</string>
+    <string name="title_advanced_section_notifications">Notificações</string>
     <string name="title_advanced_section_misc">Diversos</string>
     <string name="title_advanced_receive">Receber mensagens</string>
     <string name="title_advanced_when">Quando</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 0c3e5bc027..3ca222a6b7 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -213,8 +213,8 @@
     <string name="title_advanced_section_connection">Conexiune</string>
     <string name="title_advanced_section_display">Afișare</string>
     <string name="title_advanced_section_behavior">Comportament</string>
-    <string name="title_advanced_section_notifications">Notificări</string>
     <string name="title_advanced_section_privacy">Confidențialitate</string>
+    <string name="title_advanced_section_notifications">Notificări</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Primire mesaje</string>
     <string name="title_advanced_when">Când</string>
@@ -294,6 +294,7 @@
     <string name="title_advanced_images_inline">Arată automat imaginile integrate</string>
     <string name="title_advanced_seekbar">Arată poziția relativă în conversație cu un punct</string>
     <string name="title_advanced_actionbar">Arată bara de acțiuni pentru conversație</string>
+    <string name="title_advanced_navbar_colorize">Colorează bara de navigație Android</string>
     <string name="title_advanced_double_back">Apăsați de două ori \'înapoi\' pentru a ieși</string>
     <string name="title_advanced_pull_refresh">Trageți în jos pentru a actualiza</string>
     <string name="title_advanced_autoscroll">Derulează sus când se primește un mesaj nou</string>
@@ -655,6 +656,8 @@
     <string name="title_ask_help">Ajută la îmbunătățirea FairEmail</string>
     <string name="title_ask_reporting">Trimite rapoarte de eroare?</string>
     <string name="title_reporting_why">Raportarea erorilor va ajuta la îmbunătățirea FairEmail</string>
+    <string name="title_message_bar_hint">Atingeți iconița plus pentru a arhiva, șterge sau raporta un mesaj ca spam și a elimina această notificare</string>
+    <string name="title_answer_hint">Răspundeți tuturor, redirecționare, etc. au fost mutate în butonul de răspuns de jos</string>
     <string name="title_ask_review">Vă rugăm să evaluați FairEmail</string>
     <string name="title_ask_review_rationale">        Utilizați FairEmail de ceva vreme.
         Vom aprecia dacă ați putea evalua FairEmail în Play Store.
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ba9d0d944f..92696bb6cc 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -225,8 +225,9 @@
     <string name="title_advanced_section_connection">Соединение</string>
     <string name="title_advanced_section_display">Отображение</string>
     <string name="title_advanced_section_behavior">Режимы</string>
-    <string name="title_advanced_section_notifications">Уведомления</string>
     <string name="title_advanced_section_privacy">Конфиденциальность</string>
+    <string name="title_advanced_section_encryption">Шифрование</string>
+    <string name="title_advanced_section_notifications">Уведомления</string>
     <string name="title_advanced_section_misc">Разное</string>
     <string name="title_advanced_receive">Получить сообщения</string>
     <string name="title_advanced_when">Когда</string>
@@ -264,6 +265,9 @@
     <string name="title_advanced_ssl_harden">Усиленные SSL-соединения</string>
     <string name="title_advanced_socks">Использовать SOCKS-прокси</string>
     <string name="title_advanced_manage_connectivity">Управление подключением</string>
+    <string name="title_advanced_caption_general">По умолчанию</string>
+    <string name="title_advanced_caption_conversation">Диалог</string>
+    <string name="title_advanced_caption_message">Сообщение</string>
     <string name="title_advanced_landscape">Использовать две колонки в альбомном режиме</string>
     <string name="title_advanced_landscape3">Разрешить фиксированное меню навигации в альбомном режиме</string>
     <string name="title_advanced_startup">При запуске показывать</string>
@@ -309,6 +313,7 @@
     <string name="title_advanced_navbar_colorize">Раскрашивать панель навигации Android</string>
     <string name="title_advanced_double_back">Двойное нажатие \"Назад\" для выхода</string>
     <string name="title_advanced_pull_refresh">Потянуть вниз для обновления</string>
+    <string name="title_advanced_hide_actionbar">Скрыть панель действий при прокрутке вниз</string>
     <string name="title_advanced_autoscroll">Прокрутить к началу списка при получении новых сообщений</string>
     <string name="title_advanced_double_tap">Двойное нажатие для отметки сообщений прочитанными/непрочитанными</string>
     <string name="title_advanced_swipenav">Смахивание влево/вправо для перехода к следующему/предыдущему диалогу</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index fa75bcb31e..75582f0c52 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -184,8 +184,8 @@
     <string name="title_advanced_section_connection">Конекција</string>
     <string name="title_advanced_section_display">Приказ</string>
     <string name="title_advanced_section_behavior">Понашање</string>
-    <string name="title_advanced_section_notifications">Обавештења</string>
     <string name="title_advanced_section_privacy">Приватност</string>
+    <string name="title_advanced_section_notifications">Обавештења</string>
     <string name="title_advanced_section_misc">Разно</string>
     <string name="title_advanced_receive">Прими поруке</string>
     <string name="title_advanced_when">Када</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 7093a7177d..affbffb5de 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -198,8 +198,8 @@
     <string name="title_advanced_section_connection">Anslutning</string>
     <string name="title_advanced_section_display">Visning</string>
     <string name="title_advanced_section_behavior">Beteende</string>
-    <string name="title_advanced_section_notifications">Aviseringar</string>
     <string name="title_advanced_section_privacy">Sekretess</string>
+    <string name="title_advanced_section_notifications">Aviseringar</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_receive">Ta emot meddelanden</string>
     <string name="title_advanced_when">När</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 1cefcb47c7..c415e3aed3 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -201,8 +201,8 @@
     <string name="title_advanced_section_connection">Bağlantı</string>
     <string name="title_advanced_section_display">Görüntüle</string>
     <string name="title_advanced_section_behavior">Davranış</string>
-    <string name="title_advanced_section_notifications">Bildirimler</string>
     <string name="title_advanced_section_privacy">Gizlilik</string>
+    <string name="title_advanced_section_notifications">Bildirimler</string>
     <string name="title_advanced_section_misc">Çeşitli</string>
     <string name="title_advanced_receive">Mesajları al</string>
     <string name="title_advanced_when">Ne zaman</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2b30afbecf..8aa70964b2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -190,8 +190,9 @@
     <string name="title_advanced_section_connection">连接</string>
     <string name="title_advanced_section_display">显示</string>
     <string name="title_advanced_section_behavior">行为</string>
-    <string name="title_advanced_section_notifications">通知</string>
     <string name="title_advanced_section_privacy">隐私</string>
+    <string name="title_advanced_section_encryption">加密</string>
+    <string name="title_advanced_section_notifications">通知</string>
     <string name="title_advanced_section_misc">杂项</string>
     <string name="title_advanced_receive">接收消息</string>
     <string name="title_advanced_when">何时</string>
@@ -229,6 +230,9 @@
     <string name="title_advanced_ssl_harden">加强 SSL 连接</string>
     <string name="title_advanced_socks">使用 SOCKS 代理</string>
     <string name="title_advanced_manage_connectivity">管理连接</string>
+    <string name="title_advanced_caption_general">常规​​​​​</string>
+    <string name="title_advanced_caption_conversation">会话</string>
+    <string name="title_advanced_caption_message">消息</string>
     <string name="title_advanced_landscape">在横屏模式下使用两列</string>
     <string name="title_advanced_landscape3">在横屏模式下允许固定的导航栏菜单</string>
     <string name="title_advanced_startup">在启动屏幕上显示</string>
@@ -274,6 +278,7 @@
     <string name="title_advanced_navbar_colorize">为安卓导航栏上色</string>
     <string name="title_advanced_double_back">双击返回键退出</string>
     <string name="title_advanced_pull_refresh">下拉刷新</string>
+    <string name="title_advanced_hide_actionbar">向下滚动时隐藏操作栏</string>
     <string name="title_advanced_autoscroll">在收到新消息时滚动至顶部</string>
     <string name="title_advanced_double_tap">双击标记消息已读/未读</string>
     <string name="title_advanced_swipenav">左右滑动切换邮件</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9c9493249..3e164ffafc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -294,7 +294,6 @@
     <string name="title_advanced_manage_connectivity">Manage connectivity</string>
 
     <string name="title_advanced_caption_general">General</string>
-    <string name="title_advanced_caption_folder">Folder</string>
     <string name="title_advanced_caption_conversation">Conversation</string>
     <string name="title_advanced_caption_message">Message</string>