diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 1badadd7af..2927db0239 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -100,6 +100,7 @@
     <string name="title_advanced">خيارات متقدمة</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 1badadd7af..2927db0239 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -100,6 +100,7 @@
     <string name="title_advanced">خيارات متقدمة</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 1badadd7af..2927db0239 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -100,6 +100,7 @@
     <string name="title_advanced">خيارات متقدمة</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 1badadd7af..2927db0239 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -100,6 +100,7 @@
     <string name="title_advanced">خيارات متقدمة</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1badadd7af..2927db0239 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -100,6 +100,7 @@
     <string name="title_advanced">خيارات متقدمة</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">إظهار صور جهات الاتصال</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 3e9d1ad00e..49952c64bc 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Qabaqcıl variantlar</string>
     <string name="title_advanced_enabled">Eyniləşdirmə</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Yığcam mesaj görünüşü</string>
     <string name="title_advanced_avatars">Şəxs fotolarını göstər</string>
     <string name="title_advanced_identicons">İdentikon-ları göstər</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1d5730537c..ac162bbe66 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Opcions avançades</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Mostra les fotos dels contactes</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0a74ba8096..b594b73ebf 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 15f23a7ce8..7b00c9e2b7 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Avancerede indstillinger</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a2ca039a1c..6a8dfdc255 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Erweiterte Optionen</string>
     <string name="title_advanced_enabled">Synchronisieren</string>
     <string name="title_advanced_metered">Mobilfunknetz zulassen</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Kompakte Nachrichtenansicht</string>
     <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
     <string name="title_advanced_identicons">Identicons als Kontaktbilder anzeigen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ce6bfe3435..7fd88dab94 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Opciones avanzadas</string>
     <string name="title_advanced_enabled">Sincronizar</string>
     <string name="title_advanced_metered">Usar conexión de datos</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Vista de mensajes compacta</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_identicons">Mostrar identicons</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index cd7c2587b0..a78f9301e1 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 938b3a0078..80d22c5f60 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Options avancées</string>
     <string name="title_advanced_enabled">Synchroniser</string>
     <string name="title_advanced_metered">Utiliser des connexions limitées</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Affichage compact des messages</string>
     <string name="title_advanced_avatars">Afficher les photos des contacts</string>
     <string name="title_advanced_identicons">Afficher les identicônes</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 8849d15b66..5c1cd32237 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 65a45325c0..ccae0774ba 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 04027e2990..8457689d9a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Opzioni avanzate</string>
     <string name="title_advanced_enabled">Sincronizza</string>
     <string name="title_advanced_metered">Usa connessioni a consumo</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Visualizzazione messaggio compatto</string>
     <string name="title_advanced_avatars">Mostra foto del contatto</string>
     <string name="title_advanced_identicons">Visualizza identicon</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 8849d15b66..5c1cd32237 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 08fd5954bd..db9f0f042c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -75,6 +75,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 08fd5954bd..db9f0f042c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -75,6 +75,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a21f64e41e..4fc1aceac1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Geavanceerde opties</string>
     <string name="title_advanced_enabled">Synchroniseren</string>
     <string name="title_advanced_metered">Gemeten verbindingen gebruiken</string>
+    <string name="title_advanced_threading">Gesprekken groeperen</string>
     <string name="title_advanced_compact">Compacte berichtweergave</string>
     <string name="title_advanced_avatars">Toon foto\'s contacten</string>
     <string name="title_advanced_identicons">Toon identicons</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index aa67283e6b..ee26ce89d0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Opcje zaawansowane</string>
     <string name="title_advanced_enabled">Synchronizuj</string>
     <string name="title_advanced_metered">Użyj połączeń taryfowych</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Widok kompaktowy</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_identicons">Pokazuje ikony kontaktów</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8b01bc3aa9..b25bd14a70 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 7faa114520..c666b27f75 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 3bc2360acd..bb11bb40d7 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -85,6 +85,7 @@
     <string name="title_advanced">Opțiuni avansate</string>
     <string name="title_advanced_enabled">Sincronizare</string>
     <string name="title_advanced_metered">Folosește conexiuni contorizate</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Afișarea compactă a mesajelor</string>
     <string name="title_advanced_avatars">Arată pozele contactelor</string>
     <string name="title_advanced_identicons">Arată iconițe generate</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0a74ba8096..b594b73ebf 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d7a33ba82e..d8c193edbd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -85,6 +85,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 7d7b1fdc90..a0517bcead 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Avancerade inställningar</string>
     <string name="title_advanced_enabled">Synkronisera</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Kompakt meddelandevisning</string>
     <string name="title_advanced_avatars">Visa kontaktfoton</string>
     <string name="title_advanced_identicons">Visa identicons</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3e5132226f..0900fc5981 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -80,6 +80,7 @@
     <string name="title_advanced">Gelişmiş ayarlar</string>
     <string name="title_advanced_enabled">Eşzamanlama</string>
     <string name="title_advanced_metered">Ölçülü bağlantıları kullan</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Kompakt mesaj görünümü</string>
     <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
     <string name="title_advanced_identicons">Kimliklerini göster</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0a74ba8096..b594b73ebf 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -90,6 +90,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 08fd5954bd..db9f0f042c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -75,6 +75,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8277311900..fd80f4496d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -75,6 +75,7 @@
     <string name="title_advanced">高级选项</string>
     <string name="title_advanced_enabled">同步</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">简洁信息视图</string>
     <string name="title_advanced_avatars">显示联系人头像</string>
     <string name="title_advanced_identicons">显示哈希头像</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 08fd5954bd..db9f0f042c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -75,6 +75,7 @@
     <string name="title_advanced">Advanced options</string>
     <string name="title_advanced_enabled">Synchronize</string>
     <string name="title_advanced_metered">Use metered connections</string>
+    <string name="title_advanced_threading">Conversation threading</string>
     <string name="title_advanced_compact">Compact message view</string>
     <string name="title_advanced_avatars">Show contact photos</string>
     <string name="title_advanced_identicons">Show identicons</string>