diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f42cccc202..cdbf3ca26a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -132,7 +132,7 @@ kontakt</string>
   <string name="ConversationFragment_deleting">Mažu</string>
   <string name="ConversationFragment_deleting_messages">Mažu zprávy...</string>
   <!--ConversationListActivity-->
-  <string name="ConversationListActivity_search">Vyhhledávám...</string>
+  <string name="ConversationListActivity_search">Vyhledávám...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Smazat konverzace?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Opravdu chcete smazat VŠECHNY označené konverzace?</string>
@@ -623,6 +623,9 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="arrays__name_and_message">Jméno a zpráva</string>
   <string name="arrays__name_only">Pouze jméno</string>
   <string name="arrays__neither">Ani</string>
+  <string name="arrays__images">Obrázky</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
@@ -708,6 +711,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">U každé odeslané zprávy požadovat potvrzení o doručení</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne určitou délku</string>
   <string name="preferences__delete_old_messages">Smazat staré zprávy</string>
+  <string name="preferences__chats">Konverzace a media</string>
   <string name="preferences__conversation_length_limit">Limit délky konverzací</string>
   <string name="preferences__trim_all_threads_now">Zkrátit konverzace</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pohledat všechny konverzace a uplatnit limit délky.</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5179fdaa01..8861c1c5f0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -599,6 +599,9 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="arrays__name_and_message">Name und Nachricht</string>
   <string name="arrays__name_only">Nur Name</string>
   <string name="arrays__neither">Weder Name noch Nachricht</string>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d Stunde</item>
@@ -683,6 +686,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
+  <string name="preferences__chats">Unterhaltungen und Medien</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
   <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
@@ -702,6 +706,11 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivieren, falls das Gerät SMS/MMS über WLAN nutzt (nur bei aktivierter WLAN-Telefonie)</string>
   <string name="preferences_app_protection__blocked_contacts">Blockierte Kontakte</string>
   <string name="preferences_notifications__display_in_notifications">In Benachrichtigungen anzeigen</string>
+  <string name="preferences_chats__when_using_mobile_data">Bei mobiler Datenverbindung</string>
+  <string name="preferences_chats__when_using_wifi">Bei WLAN-Verbindung</string>
+  <string name="preferences_chats__when_roaming">Bei Roaming</string>
+  <string name="preferences_chats__media_auto_download">Automatisches Herunterladen von Medien</string>
+  <string name="preferences_chats__message_trimming">Kürzen von Unterhaltungen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2ef19a7343..067ed29695 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -674,6 +674,9 @@ por SMS.
   <string name="arrays__name_and_message">Nombre y mensaje</string>
   <string name="arrays__name_only">Sólo nombre</string>
   <string name="arrays__neither">Ninguno de los dos</string>
+  <string name="arrays__images">Imágenes</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Vídeo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b1d08c7788..da2989772d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -71,7 +71,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Napsauta, jos haluat lähettää viestin salaamattomana</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Käytä salaamattomia tekstiviestejä?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Käytä salaamattomia MMS-viestejä?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> tulla salaamaan, koska vastaanottaja ei enää käytä TextSecurea.\n\nLähetä salaamaton viesti?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tätä viestiä <b>ei</b> voida salata, koska vastaanottaja ei enää käytä TextSecurea.\n\nLähetetäänkö salaamattomana?</string>
   <string name="ConversationItem_unable_to_open_media">Median avaamiseen ei löytynyt sovellusta.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Aloita salattu istunto?</string>
@@ -628,6 +628,9 @@ epäonnistui.</string>
   <string name="arrays__name_and_message">Nimi ja viesti</string>
   <string name="arrays__name_only">Vain nimi</string>
   <string name="arrays__neither">Ei kumpaakaan</string>
+  <string name="arrays__images">Kuvat</string>
+  <string name="arrays__audio">Äänitallenteet</string>
+  <string name="arrays__video">Videot</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tunti</item>
@@ -712,6 +715,7 @@ epäonnistui.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhimpia viestejä automaattisesti, kun keskustelu ylittää määritetyn pituusrajan</string>
   <string name="preferences__delete_old_messages">Vanhojen viestien poisto</string>
+  <string name="preferences__chats">Keskustelut ja media</string>
   <string name="preferences__conversation_length_limit">Keskustelun pituusraja</string>
   <string name="preferences__trim_all_threads_now">Karsi kaikki keskustelut nyt</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki keskustelut ja pakota niihin pituusrajat</string>
@@ -731,6 +735,11 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön, jos laitteesi lähettää SMS- ja MMS-viestit WiFi-yhteyden kautta. (Ota käyttöön vain, kun \"WiFi Calling\" on käytössä laitteessasi.)</string>
   <string name="preferences_app_protection__blocked_contacts">Estetyt yhteystiedot</string>
   <string name="preferences_notifications__display_in_notifications">Ilmoituksissa näytetään</string>
+  <string name="preferences_chats__when_using_mobile_data">Mobiilitiedonsiirtoverkossa</string>
+  <string name="preferences_chats__when_using_wifi">Wi-Fi-verkossa</string>
+  <string name="preferences_chats__when_roaming">Roaming-verkossa</string>
+  <string name="preferences_chats__media_auto_download">Liitetiedostojen automaattinen lataus</string>
+  <string name="preferences_chats__message_trimming">Viestien karsiminen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ebddd1d2e2..9c19cca971 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -641,6 +641,9 @@ non riuscita.
   <string name="arrays__name_and_message">Nome e messaggio</string>
   <string name="arrays__name_only">Solo nome</string>
   <string name="arrays__neither">Nessuno dei due</string>
+  <string name="arrays__images">Immagini</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
@@ -725,6 +728,7 @@ non riuscita.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una certa lunghezza</string>
   <string name="preferences__delete_old_messages">Elimina i messaggi vecchi</string>
+  <string name="preferences__chats">Chat e download</string>
   <string name="preferences__conversation_length_limit">Limite di lunghezza conversazione</string>
   <string name="preferences__trim_all_threads_now">Riduci immediatamente tutti i thread</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Analizza tutti i thread e applica il limite di lunghezza delle conversazioni.</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e6a58334ec..e3d3a2d394 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -576,6 +576,9 @@
   <string name="arrays__name_and_message">이름과 메시지</string>
   <string name="arrays__name_only">이름</string>
   <string name="arrays__neither">이름이나 메시지 표시하지 않음</string>
+  <string name="arrays__images">이미지</string>
+  <string name="arrays__audio">오디오</string>
+  <string name="arrays__video">동영상</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d시간 전</item>
@@ -659,6 +662,7 @@
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS 메시지 보낼 때마다 전송 확인 요청</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">대화 메시지 저장한도가 초과되면 이전 메시지 자동 삭제</string>
   <string name="preferences__delete_old_messages">이전 메시지 삭제</string>
+  <string name="preferences__chats">대화 및 미디어</string>
   <string name="preferences__conversation_length_limit">대화 메시지 저장한도</string>
   <string name="preferences__trim_all_threads_now">모든 대화 줄이기</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">모든 대화에 메시지 저장한도 적용</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c89c22c1cf..d7cd7cef0d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -614,6 +614,9 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="arrays__name_and_message">Naam en bericht</string>
   <string name="arrays__name_only">Alleen naam</string>
   <string name="arrays__neither">Geen van alle</string>
+  <string name="arrays__images">Afbeeldingen</string>
+  <string name="arrays__audio">Geluid</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d uur</item>
@@ -698,6 +701,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoeken om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een gesprek meer dan een bepaald aantal berichten bevat</string>
   <string name="preferences__delete_old_messages">Verwijder oude berichten</string>
+  <string name="preferences__chats">Gesprekken en media</string>
   <string name="preferences__conversation_length_limit">Gesprekslengte limiet</string>
   <string name="preferences__trim_all_threads_now">Oude berichten nu verwijderen</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle gesprekken scannen en de maximale gesprekslengte toepassen</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index ace90bc059..d1d72b0890 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -608,6 +608,9 @@ feilet.</string>
   <string name="arrays__name_and_message">Navn og melding</string>
   <string name="arrays__name_only">Kun navn</string>
   <string name="arrays__neither">Ingen</string>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Lyd</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -692,6 +695,7 @@ feilet.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtaletråd overskrider en spesifisert lengde</string>
   <string name="preferences__delete_old_messages">Slett gamle meldinger</string>
+  <string name="preferences__chats">Samtaler og media</string>
   <string name="preferences__conversation_length_limit">Grense på samtalelengde</string>
   <string name="preferences__trim_all_threads_now">Trimme alle samtaletråder nå</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Gjennomgå alle samtaletrådene og håndhev grensen på samtalelengde </string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 127cff0728..104fe98520 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -604,9 +604,12 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__settings_default">Ustawienia domyślne</string>
   <string name="arrays__enabled">Włączone</string>
   <string name="arrays__disabled">Wyłączone</string>
-  <string name="arrays__name_and_message">Nazwa i wiadomość</string>
+  <string name="arrays__name_and_message">Imię i wiadomość</string>
   <string name="arrays__name_only">Tylko imie</string>
   <string name="arrays__neither">Żadne</string>
+  <string name="arrays__images">Obrazy</string>
+  <string name="arrays__audio">Audio</string>
+  <string name="arrays__video">Wideo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d godzina</item>
@@ -692,6 +695,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie usuń starsze wiadomości po przekroczeniu określonej długości wątku</string>
   <string name="preferences__delete_old_messages">Usuń stare wiadomości</string>
+  <string name="preferences__chats">Czaty i media</string>
   <string name="preferences__conversation_length_limit">Limit długości konwersacji</string>
   <string name="preferences__trim_all_threads_now">Przytnij wszystkie wątki</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanuj wszystkie rozmowy i przytnij do zdefiniowanej długości</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 86c2b31070..5545ebc7e0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -605,6 +605,9 @@ bila uspešna.</string>
   <string name="arrays__name_and_message">Pošiljatelj in sporočilo</string>
   <string name="arrays__name_only">Samo pošiljatelj</string>
   <string name="arrays__neither">Brez</string>
+  <string name="arrays__images">Slike</string>
+  <string name="arrays__audio">Zvok</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ura</item>
@@ -691,6 +694,7 @@ bila uspešna.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejen izbris starih sporočil, ko pogovor preseže določeno dolžino</string>
   <string name="preferences__delete_old_messages">Izbris starih sporočil</string>
+  <string name="preferences__chats">Pogovori in multimedija</string>
   <string name="preferences__conversation_length_limit">Omejitev dolžine pogovorov</string>
   <string name="preferences__trim_all_threads_now">Obreži vse pogovore zdaj</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Preišči vse pogovore in uveljavi omejitve njihove dolžine</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e0307549cb..ef4543df55 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -611,6 +611,9 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="arrays__name_and_message">Namn och meddelande</string>
   <string name="arrays__name_only">Endast namn</string>
   <string name="arrays__neither">Varken eller</string>
+  <string name="arrays__images">Bilder</string>
+  <string name="arrays__audio">Ljud</string>
+  <string name="arrays__video">Video</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d timme</item>
@@ -695,6 +698,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS-meddelande du skickar</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
   <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
+  <string name="preferences__chats">Konversationer och media</string>
   <string name="preferences__conversation_length_limit">Konversationstrådslängd</string>
   <string name="preferences__trim_all_threads_now">Trimma alla trådar nu</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanna igenom alla konversationstrådar och framtvinga konversationstrådslängder.</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7bd58214cb..bef63e1ae7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -619,6 +619,9 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="arrays__name_and_message">名字和信息</string>
   <string name="arrays__name_only">仅名字</string>
   <string name="arrays__neither">都不</string>
+  <string name="arrays__images">图片</string>
+  <string name="arrays__audio">音频</string>
+  <string name="arrays__video">视频</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d 小时</item>
@@ -702,6 +705,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">请求发送报告</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">对话超过指定数量时自动删除旧的信息</string>
   <string name="preferences__delete_old_messages">删除旧信息</string>
+  <string name="preferences__chats">聊天与媒体</string>
   <string name="preferences__conversation_length_limit">对话数量限制</string>
   <string name="preferences__trim_all_threads_now">现在处理所有对话</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">查找并处理所有超过限制的对话</string>