diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 88c6ee58b834fe85bcba20054ba26440c8287e12..438049579d417502e99b44ac43d099b2ab8310d4 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -103,7 +103,6 @@
   <string name="start_error_title">ﻻ يمكن تشغيل جامي !</string>
   <string name="start_error_mic_required">جامي يستوجب الحصول على صلاحيات المايكروفون للعمل.</string>
   <string name="action_call_accept">قبول مكالمة</string>
-  <string name="action_call_hold_accept">انتظر وقم بإجراء مكالمة</string>
   <string name="action_call_end_accept">إنهاء وإجراء مكالمة</string>
   <string name="action_call_decline">رفض</string>
   <string name="action_call_mic_mute">كتم ميكروفون</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index d46b894de29ab8f13ea6809e8552b90ce8b3e32a..d2369f6dcfefafd2572a5ad719a8ff5041df6917 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Nelze spustit Jami!</string>
   <string name="start_error_mic_required">Aby Jami správně pracoval, vyžaduje přístup k mikrofonu.</string>
   <string name="action_call_accept">Přijmout</string>
-  <string name="action_call_hold_accept">Přidržet a přijmout hovor</string>
   <string name="action_call_end_accept">Ukončit a přijmout hovor</string>
   <string name="action_call_decline">Odmítnout</string>
   <string name="action_call_mic_mute">Ztlumit mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/ring-android/app/src/main/res/values-da/strings.xml
index 81281bf663a518b915d69227da74775682591bc3..ab2915b7e1535426f5083a03cd74c7d506f8d269 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -95,7 +95,6 @@
   <string name="start_error_title">Kan ikke starte Jami!</string>
   <string name="start_error_mic_required">Jami kræver adgang til mikrofonen for at virke.</string>
   <string name="action_call_accept">Besvar opkald</string>
-  <string name="action_call_hold_accept">Put på hold og tag besvar opkald</string>
   <string name="action_call_end_accept">Afslut og besvar opkald</string>
   <string name="action_call_decline">Afvis</string>
   <string name="action_call_mic_mute">Sluk mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 991fc04dc42702b80ee1da111a359ddb1d88a058..c9297eb7318a5d9eadd56fceb2fd717b3810d4b7 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -100,7 +100,6 @@ Sie respektiert die Freiheiten und die Privatsphäre ihrer Nutzer.</string>
   <string name="start_error_title">Kann Jami nicht starten!</string>
   <string name="start_error_mic_required">Jami benötigt die Mikrofonberechtigung, um zu funktionieren.</string>
   <string name="action_call_accept">Annehmen</string>
-  <string name="action_call_hold_accept">Aktuellen Anruf halten und Neuen annehmen</string>
   <string name="action_call_end_accept">Aktuellen Anruf beenden und Neuen annehmen</string>
   <string name="action_call_decline">Ablehnen</string>
   <string name="action_call_mic_mute">Mikrofon stummschalten</string>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 2bb4b37f24621f08211b17c94138e5ee35a9a790..1a70ff50e37666827387e2d9cb69ed12ecbb60c5 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jami konnte nicht gestartet werden!</string>
   <string name="start_error_mic_required">Jami benötigt die Erlaubnis, auf das Mikrofon zuzugreifen.</string>
   <string name="action_call_accept">Anruf annehmen</string>
-  <string name="action_call_hold_accept">Anruf halten und entgegennehmen</string>
   <string name="action_call_end_accept">Anruf beenden und entgegennehmen</string>
   <string name="action_call_decline">Ablehnen</string>
   <string name="action_call_mic_mute">Mikrofon stummschalten</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index e9b29a4d8323d7e54cb4d7b6a12e1d8637c9e9cc..dc1761936c8a54313c6591f618b437a9dedffaec 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">¡No se ha podido iniciar Jami!</string>
   <string name="start_error_mic_required">Jami requiere permisos para acceder al micrófono para funcionar.</string>
   <string name="action_call_accept">Atender</string>
-  <string name="action_call_hold_accept">Mantener en espera y responder llamada</string>
   <string name="action_call_end_accept">Finalizar y responder llamada</string>
   <string name="action_call_decline">Rechazar</string>
   <string name="action_call_mic_mute">Enmudecer micrófono</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
index c09270379465b4ec65a0cfd1339ba1554886ee89..115bdcfb954810cbf44f6035220465569cf7f765 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Enviar y recibir confirmaciones de lectura indicando que se ha visto un mensaje.</string>
   <string name="pref_block_record_title">Bloquear capturas de pantalla y grabaciones</string>
   <string name="pref_block_record_summary">Impedir que se hagan capturas de pantalla o se graben videos.</string>
+  <string name="pref_link_preview_title">Mostrar vistas previas de enlaces en las conversaciones</string>
+  <string name="pref_link_preview_summary">Las vistas previas requieren la descarga de contenido desde servidores de terceros.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Público \n(mostrar notificaciones y contenido en la pantalla bloqueada)\n</string>
   <string name="notification_private">Privado \n(mostrar notificaciones pero ocultar su contenido en la pantalla bloqueada)\n</string>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 1423fde34455b4dd16aeab35c59f3fa6f2c1d52e..c2080425891f3664b6a74a9e348a24b25400be35 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">No se puede iniciar Jami!</string>
   <string name="start_error_mic_required">Jami necesita permiso de acceso al micrófono para funcionar.</string>
   <string name="action_call_accept">Contestar a la llamada</string>
-  <string name="action_call_hold_accept">Mantener y responder llamada</string>
   <string name="action_call_end_accept">Finalizar y responder llamada</string>
   <string name="action_call_decline">Rechazar</string>
   <string name="action_call_mic_mute">Silenciar micrófono</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index 840972bc5b2a5af5de423235aaef34f03b6a934b..c1b62ba0c611c409fd0baf3a8ae3f1aa7c15fe02 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Enviar y recibir confirmaciones de lectura indicando que se ha visto un mensaje.</string>
   <string name="pref_block_record_title">Bloquear capturas de pantalla y grabaciones</string>
   <string name="pref_block_record_summary">Impedir que se hagan capturas de pantalla o se graben videos.</string>
+  <string name="pref_link_preview_title">Mostrar vistas previas de enlaces en las conversaciones</string>
+  <string name="pref_link_preview_summary">Las vistas previas requieren la descarga de contenido desde servidores de terceros.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Público \n(mostrar notificaciones y contenido en la pantalla bloqueada)\n</string>
   <string name="notification_private">Privado \n(mostrar notificaciones pero ocultar su contenido en la pantalla bloqueada)\n</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/ring-android/app/src/main/res/values-eu/strings.xml
index 752b926518f8cb1779cc4361fca5d0633b00ef20..4be1048232d810b4595454b5af92b995f9522738 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -97,7 +97,6 @@
   <string name="start_error_title">Ezin da Jami abiatu !</string>
   <string name="start_error_mic_required">Jamik mikrofonoa erabiltzeko baimena behar du funtzionatzeko.</string>
   <string name="action_call_accept">Onartu deia</string>
-  <string name="action_call_hold_accept">Deiari eustea eta erantzutea</string>
   <string name="action_call_end_accept">Amaitu eta deia hartu</string>
   <string name="action_call_decline">Ukatu</string>
   <string name="action_call_mic_mute">Mututu mikrofonoa</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index 6b7866b2a046c502d6faac697dde55d97bd36328..2add2eb5e29d43e44a61e22bb263df94b34d733f 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">نمی‌توان جمی را راه‌اندازی کرد!</string>
   <string name="start_error_mic_required">جمی برای کار به مجوز میکروفون نیاز دارد.</string>
   <string name="action_call_accept">پذیرش تماس</string>
-  <string name="action_call_hold_accept">این را نگه‌دار و تماس بعدی را بپذیر</string>
   <string name="action_call_end_accept">این را قطع کن و تماس بعدی را بپذیر</string>
   <string name="action_call_decline">ردکردن</string>
   <string name="action_call_mic_mute">قطع میکروفون</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index 710115fd9523ae6c10a2bcbb66c7452d96d0fd8d..7c8c6845991851e37900d1e7e588346a5a8f4b96 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jamia ei voitu käynnistää!</string>
   <string name="start_error_mic_required">Jami vaatii mikrofonin käyttöoikeuden toimiakseen.</string>
   <string name="action_call_accept">Vastaanota puhelu</string>
-  <string name="action_call_hold_accept">Pitoon ja tee puhelu</string>
   <string name="action_call_end_accept">Lopeta ja tee puhelu</string>
   <string name="action_call_decline">Kieltäydy</string>
   <string name="action_call_mic_mute">Mykistä mikrofoni</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index fc7dc1afe44938f86948efdc0e70387f80d03f05..ce560488284045f18b93f5d7cb46c3c56752833b 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -95,10 +95,6 @@
   <string name="start_error_title">Impossible de démarrer Jami !</string>
   <string name="start_error_mic_required">Jami requiert la permission d\'accéder à votre microphone pour fonctionner.</string>
   <string name="action_call_accept">Prendre un appel</string>
-  <string name="action_call_accept_audio">Répondre en audio</string>
-  <string name="action_call_accept_video">Répondre en video</string>
-  <string name="action_call_hold_accept">Répondre en audio</string>
-  <string name="action_call_hold_accept_video">Répondre en video</string>
   <string name="action_call_end_accept">Terminer et prendre l\'appel</string>
   <string name="action_call_decline">Refuser</string>
   <string name="action_call_mic_mute">Couper le micro</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 2b0b5dd680688bcdd864c94c42c6b3014adb8d99..579c7b154510a0d94ba09b5916e83ff8b11cd6c3 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jami n\'arrive pas à se lancer !</string>
   <string name="start_error_mic_required">Jami demande pour fonctionner votre autorisation d\'utiliser votre microphone .</string>
   <string name="action_call_accept">Répondre</string>
-  <string name="action_call_hold_accept">Mettre en attente et prendre l\'appel</string>
   <string name="action_call_end_accept">Raccrocher et prendre l\'appel</string>
   <string name="action_call_decline">Décliner</string>
   <string name="action_call_mic_mute">Rendre votre microphone muet</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings.xml b/ring-android/app/src/main/res/values-gl/strings.xml
index 47218d699c015352bf1d362742b7512652f2368e..cbdb8a60ae71055fff48876103a88484f9a1321f 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jami non pode iniciarse!</string>
   <string name="start_error_mic_required">Jami precisa permiso de acceso ao micrófono para funcionar:</string>
   <string name="action_call_accept">Responder a chamada</string>
-  <string name="action_call_hold_accept">Manter e atender chamada</string>
   <string name="action_call_end_accept">Rematar e atender chamada</string>
   <string name="action_call_decline">Rexeitar</string>
   <string name="action_call_mic_mute">Apagar micrófono</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
index 9e1fb5a097ff342f6c239d0ece53ac29933aa7b9..941e7f6256132c2ec47bc2901719b98d9c4636fa 100644
--- a/ring-android/app/src/main/res/values-gl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Enviar e recibir notificación de que unha mensaxe foi mostrada.</string>
   <string name="pref_block_record_title">Bloquear captura de pantalla e gravación</string>
   <string name="pref_block_record_summary">Bloquear a captura de pantalla ou gravación de vídeo.</string>
+  <string name="pref_link_preview_title">Mostrar na conversa vista previa das ligazóns</string>
+  <string name="pref_link_preview_summary">A vista previa precisa descargar contido desde servidores de terceiras partes.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Públicas \n(mostra notificacións e o seu contido na pantalla de bloqueo)\n</string>
   <string name="notification_private">Privadas \n(mostra notificacións pero agocha o seu contido na pantalla de bloqueo)\n</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index cda94475ef529c06963ed24a8e9964be95bbbd73..e0998864bd441a05f0a5e178680fa6f05274463a 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Nem lehet elindítani Jami-t!</string>
   <string name="start_error_mic_required">A Jami működéséhez szükséges a mikrofont elérés engedélyezése.</string>
   <string name="action_call_accept">Hívás fogadása</string>
-  <string name="action_call_hold_accept">Tartás és bejövő hívás fogadása</string>
   <string name="action_call_end_accept">Hívás befejezése és bejövő hívás fogadása</string>
   <string name="action_call_decline">Elutasítás</string>
   <string name="action_call_mic_mute">Mikrofon elnémítása</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index 0ec035a27b048e80fd36e2ca9e8d6ef4a4e68d88..a24d335ce11b4d202d9a427dc55412d659b299ce 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Küldjön és fogadjon nyugtákat, jelezve, hogy üzenet jelenik meg.</string>
   <string name="pref_block_record_title">Képernyőkép és felvétel letiltása</string>
   <string name="pref_block_record_summary">Letiltsa a képernyőkép készítését vagy a videók rögzítését.</string>
+  <string name="pref_link_preview_title">Hivatkozás előnézetek megjelenítése a beszélgetésekben</string>
+  <string name="pref_link_preview_summary">Az előnézethez tartalmat kell letölteni harmadik féltől származó kiszolgálókról.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Nyilvános\n(az értesítések és azok tartalmának megjelenítése a zárolási képernyőn)\n</string>
   <string name="notification_private">Magán\n(értesítések megjelenítése, de tartalmuk elrejtése a zárolási képernyőn)\n</string>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index 4006b6c77605a34d602fd4a147622b0669286402..b711813f371ef974ad10c6cf7264d88e269e5886 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -97,7 +97,6 @@
   <string name="start_error_title">Tidak dapat memulai Jami !</string>
   <string name="start_error_mic_required">Jami butuh izin akses mikrofon untuk bekerja.</string>
   <string name="action_call_accept">Terima panggilan</string>
-  <string name="action_call_hold_accept">Tahan dan angkat panggilan</string>
   <string name="action_call_end_accept">Akhiri dan angkat panggilan</string>
   <string name="action_call_decline">Tolak</string>
   <string name="action_call_mic_mute">Senyapkan mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 67f69d9a28b7ab699b72dfedfbb8084eaaf8c2fa..00df2dc3137ca47ac2cfbceea148cc07bb0ac280 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jami non si avvia!</string>
   <string name="start_error_mic_required">Jami deve usare il microfono per funzionare.</string>
   <string name="action_call_accept">Rispondi</string>
-  <string name="action_call_hold_accept">Metti in attesa e rispondi alla chiamata</string>
   <string name="action_call_end_accept">Termina e rispondi alla chiamata</string>
   <string name="action_call_decline">Rifiuta</string>
   <string name="action_call_mic_mute">Disattiva microfono</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 8ae2190e9a2152e133d869f971903ee9cae6fa62..972dbacb0aa988a810dbef17fb82e730a901b150 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Invia e ricevi conferme indicanti che un messaggio è stato visualizzato.</string>
   <string name="pref_block_record_title">Blocca screenshot e registrazione</string>
   <string name="pref_block_record_summary">Blocca l\'acquisizione di screenshot o registrazione video.</string>
+  <string name="pref_link_preview_title">Mostra le anteprime dei link nelle conversazioni</string>
+  <string name="pref_link_preview_summary">Le anteprime richiedono di scaricare contenuti da server di terzi.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Pubblico \n(mostra le notifiche e il relativo contenuto nella schermata di blocco)\n</string>
   <string name="notification_private">Privato \n(mostra le notifiche ma nascondi il loro contenuto nella schermata di blocco)\n</string>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 042307e389da13210cf76f38d25bdcb071a2f3cc..1752c32ca698aef7000eafa5f6a93be4ca956213 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Jami non si avvia!</string>
   <string name="start_error_mic_required">Jami deve usare il microfono per funzionare.</string>
   <string name="action_call_accept">Rispondi</string>
-  <string name="action_call_hold_accept">Metti in attesa e rispondi alla chiamata</string>
   <string name="action_call_end_accept">Termina e rispondi alla chiamata</string>
   <string name="action_call_decline">Rifiuta</string>
   <string name="action_call_mic_mute">Disattiva microfono</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index 5b7ce63769da8e087e3dc7df70381fe0c91d742e..549b32ff57a7dfba3825acdee1da37b253f41410 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Invia e ricevi conferme indicanti che un messaggio è stato visualizzato.</string>
   <string name="pref_block_record_title">Blocca screenshot e registrazione</string>
   <string name="pref_block_record_summary">Blocca l\'acquisizione di screenshot o registrazione video.</string>
+  <string name="pref_link_preview_title">Mostra le anteprime dei link nelle conversazioni</string>
+  <string name="pref_link_preview_summary">Le anteprime richiedono di scaricare contenuti da server di terzi.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Pubblico \n(mostra le notifiche e il relativo contenuto nella schermata di blocco)\n</string>
   <string name="notification_private">Privato \n(mostra le notifiche ma nascondi il loro contenuto nella schermata di blocco)\n</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 2e9bf0ed4b7dec1af1340022ce27458fd7df79cb..350031fb3efa077daa4d4185dc4decee65ec80a1 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -98,7 +98,6 @@
   <string name="start_error_title">Jamiを開始できません</string>
   <string name="start_error_mic_required">Jamiはマイク使用の権限を必要とします</string>
   <string name="action_call_accept">電話を取る</string>
-  <string name="action_call_hold_accept">いまの通話を保持して電話に出る</string>
   <string name="action_call_end_accept">いまの通話を終了して電話に出る</string>
   <string name="action_call_decline">辞退</string>
   <string name="action_call_mic_mute">マイクをミュート</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index aa14a0ab7582eae63fd7236951c244311b464c32..5845df9965ba5c9eb23996b87745f3e8f236cf19 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -98,7 +98,6 @@
   <string name="start_error_title">Klarte ikke starte Jami!</string>
   <string name="start_error_mic_required">Jami krever tilgang til mikrofonen for å virke.</string>
   <string name="action_call_accept">Svar</string>
-  <string name="action_call_hold_accept">Sett på vent og svar</string>
   <string name="action_call_end_accept">Legg på og svar</string>
   <string name="action_call_decline">Avslå</string>
   <string name="action_call_mic_mute">Koble ut mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index b06944eec67f8ac88d13395eed894b78a8277137..f08878f5faecc7fb6f8ed2ba696c3bc19637998d 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -97,7 +97,6 @@
   <string name="start_error_title">Jami kan niet opgestart worden!</string>
   <string name="start_error_mic_required">Jami vereist toestemming om de microfoon te kunnen gebruiken.</string>
   <string name="action_call_accept">Oproep aannemen</string>
-  <string name="action_call_hold_accept">In wacht zetten en oproep opnemen</string>
   <string name="action_call_end_accept">Ophangen en oproep opnemen</string>
   <string name="action_call_decline">Weigeren</string>
   <string name="action_call_mic_mute">Microfoon dempen</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index ce30cba1eb5f51ee8535ffbee565b4932b6cbd2c..6ccf9703f6d5f7a4a1dcd706adaf90d6f79e70ba 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -96,7 +96,6 @@
   <string name="start_error_title">Jami ਨੂੰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ !</string>
   <string name="start_error_mic_required">Jami ਨੂੰ ਚੱਲਣ ਲਈ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
   <string name="action_call_accept">ਕਾਲ ਲਓ</string>
-  <string name="action_call_hold_accept">ਕਾਲ ਰੋਕ ਕੇ ਦੂਜੀ ਕਾਲ ਲਓ</string>
   <string name="action_call_end_accept">ਕਾਲ ਕੱਟ ਕੇ ਦੂਜੀ ਕਾਲ ਲਓ</string>
   <string name="action_call_decline">ਕਾਲ ਕੱਟੋ</string>
   <string name="action_call_mic_mute">ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਬੰਦ ਕਰੋ</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 1dd3e633ab38504ca50f8fe2b0bb516e4ada5c5b..a8a714fcade973771ac9cd9c51e01660295e4265 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Nie udało się uruchomić Jami!</string>
   <string name="start_error_mic_required">Jami wymaga zezwolenia na korzystanie z mikrofonu, by działać.</string>
   <string name="action_call_accept">Odbierz</string>
-  <string name="action_call_hold_accept">Wstrzymaj i odbierz połączenie</string>
   <string name="action_call_end_accept">Zakończ i odbierz połączenie</string>
   <string name="action_call_decline">Odrzuć</string>
   <string name="action_call_mic_mute">Wycisz mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 333afe87296e5320a08ed98794d840c28b894931..df281e8d96f8748a66cbb7a7e8c9a3e4cd91fac6 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -99,7 +99,6 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="start_error_title">Não é possível iniciar o Jami!</string>
   <string name="start_error_mic_required">O Jami requer permissão para uso do microfone para funcionar.</string>
   <string name="action_call_accept">Atender chamada</string>
-  <string name="action_call_hold_accept">Coloque em espera e receba chamada</string>
   <string name="action_call_end_accept">Finalizar e receba chamada</string>
   <string name="action_call_decline">Rejeitar</string>
   <string name="action_call_mic_mute">Desativar microfone</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings.xml b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
index 7f0c71cd06ef6232f8a60921ea2cc523f8d6b82e..03b5a845f54fa508300a76b6ede7895fac460e8f 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
@@ -100,7 +100,6 @@
   <string name="start_error_title">Jami nu se deschide!</string>
   <string name="start_error_mic_required">Jami trebuie să folosească microfonul ca să funcționeze.</string>
   <string name="action_call_accept">Răspunde</string>
-  <string name="action_call_hold_accept">Așteptare și răspunde la apel</string>
   <string name="action_call_end_accept">Închide și răspunde la apel</string>
   <string name="action_call_decline">Refuză</string>
   <string name="action_call_mic_mute">Oprește microfonul</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
index 4360841dbd52993983e1f712e0e81ccfee55efdb..2105b5ec34f8d2bea106794bcb755092a3d30b6b 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Trimite și primește confirmări de citire care arată că un mesaj a fost citit.</string>
   <string name="pref_block_record_title">Blochează captura de ecran și înregistrarea</string>
   <string name="pref_block_record_summary">Blochează captura de ecran și înregistrarea video.</string>
+  <string name="pref_link_preview_title">Arată adresele web în discuții</string>
+  <string name="pref_link_preview_summary">Previzualizările necesită descărcarea de conținut de pe servere terțe.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Public \n(arată notificările și conținutul lor pe ecranul blocat)\n</string>
   <string name="notification_private">Privat \n(arată notificările, dar ascunde conținutul lor pe ecranul blocat)\n</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 4a43f5080cf62eb19119cf3a533e45c388b75604..adae4fee64480c45a37a4f9f7a99957e1b744347 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -101,7 +101,6 @@
   <string name="start_error_title">Невозможно запустить Jami!</string>
   <string name="start_error_mic_required">Для работы Jami требуется разрешение на использование микрофона.</string>
   <string name="action_call_accept">Принять</string>
-  <string name="action_call_hold_accept">Задержать и ответить на звонок</string>
   <string name="action_call_end_accept">Завершить и ответить на звонок</string>
   <string name="action_call_decline">Отклонить</string>
   <string name="action_call_mic_mute">Выключить микрофон</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 15dfa502a1c90d7d7159b7c2cee86b0726cd6d62..77b41ae59a2aace13d67cb21bacb92fc3632ff53 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Ne morem zagnati Jami-ja!</string>
   <string name="start_error_mic_required">Jami za delovanje potrebuje dovoljenje za uporabo mikrofona.</string>
   <string name="action_call_accept">Prevzemi klic</string>
-  <string name="action_call_hold_accept">Zadrži in prevzemi klic</string>
   <string name="action_call_end_accept">Končaj in prevzemi klic</string>
   <string name="action_call_decline">Zavrni</string>
   <string name="action_call_mic_mute">Izključi mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 3420434244600b0d39a8c80315e5dce9aa5f6f38..427548611d0ca8a10918f068cc3ff7df22cb8b1d 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">S\’niset dot Jami!</string>
   <string name="start_error_mic_required">Që të funksionojë, Jami lyp leje për mikrofonin.</string>
   <string name="action_call_accept">Pranoje thirrjen</string>
-  <string name="action_call_hold_accept">Mbaje dhe bëje thirrje</string>
   <string name="action_call_end_accept">Përfundoje dhe bëje thirrje</string>
   <string name="action_call_decline">Hidhe tej</string>
   <string name="action_call_mic_mute">Heshtoje mikrofonin</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index f6644d9bf4e11a77f6b1f05284f34b5e73284413..8a2f27ea535f6b7b22fb136fa5540bc7238a094a 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">Dërgoni dhe merrni dëshmi që tregojnë se po shfaqet një mesazh.</string>
   <string name="pref_block_record_title">Bllokoni foto ekrani dhe regjistrim</string>
   <string name="pref_block_record_summary">Blloko bërje fotosh ose regjistrim videosh.</string>
+  <string name="pref_link_preview_title">Shfaq paraparje lidhjesh në biseda</string>
+  <string name="pref_link_preview_summary">Paraparjet lypin që të shkarkohet lëndë nga shërbyes palësh të treta.</string>
   <!--Notifications Visibility-->
   <string name="notification_public">Publike \n(shfaq njoftime dhe lëndën e tyre nën ekran të kyçur)\n</string>
   <string name="notification_private">Private \n(shfaq njoftime, por fshihe lëndën e tyre, kur ekrani është i kyçur)\n</string>
diff --git a/ring-android/app/src/main/res/values-sr/strings.xml b/ring-android/app/src/main/res/values-sr/strings.xml
index 9a6dab6df89011685a791b71da82501b32d247af..5918cb8adf3980c16f04e88cf567a3c09644c2e7 100644
--- a/ring-android/app/src/main/res/values-sr/strings.xml
+++ b/ring-android/app/src/main/res/values-sr/strings.xml
@@ -99,7 +99,6 @@
   <string name="start_error_title">Ne može Jami da se pokrene!</string>
   <string name="start_error_mic_required">Jami zahteva pristup mikrofonu da bi radio.</string>
   <string name="action_call_accept">Prihvati poziv</string>
-  <string name="action_call_hold_accept">Zadrži i prihvati poziv</string>
   <string name="action_call_end_accept">Prekini i prihvati poziv</string>
   <string name="action_call_decline">Odbij</string>
   <string name="action_call_mic_mute">Blokiraj mikrofon</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index d4e8602fdf5945c667f604b6dd380b57f0a011c0..efc85c2ecc7966682f9cff8f7a765e58b2a5ce1f 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -98,7 +98,6 @@
   <string name="start_error_title">Jami başlatılamıyor !</string>
   <string name="start_error_mic_required">Jami\'nin çalışması için mikrofon izni gerekli.</string>
   <string name="action_call_accept">Aramayı yanıtla</string>
-  <string name="action_call_hold_accept">Beklet ve aramayı al</string>
   <string name="action_call_end_accept">Bitir ve aramayı al</string>
   <string name="action_call_decline">Reddet</string>
   <string name="action_call_mic_mute">Mikrofon sessiz</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 58dcfa3ed5aa0ad0bbca705666f5acf9dd28e61f..cc35a6865a18bbf7f8cd342f551d066df56d1e7a 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -98,7 +98,6 @@
   <string name="start_error_title">无法启动 Jami!</string>
   <string name="start_error_mic_required">Jami 需要麦克风权限以正常工作。</string>
   <string name="action_call_accept">接听</string>
-  <string name="action_call_hold_accept">保持并呼叫</string>
   <string name="action_call_end_accept">结束并呼叫</string>
   <string name="action_call_decline">拒接</string>
   <string name="action_call_mic_mute">关闭麦克风</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 6368c7ca55b769136c7e460364876c6840faee5a..add681c3501ad985b9cd67b9d31e078511cf81e1 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -98,7 +98,6 @@
   <string name="start_error_title">無法啟動 Jami!</string>
   <string name="start_error_mic_required">Jami 需要麥克風權限以正常運作。</string>
   <string name="action_call_accept">打電話</string>
-  <string name="action_call_hold_accept">保留並接聽通話</string>
   <string name="action_call_end_accept">結束並接聽通話</string>
   <string name="action_call_decline">拒絕</string>
   <string name="action_call_mic_mute">麥克風靜音</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 19c51f8181f7cb90067d0ee8a5aaa59d05db9d60..f49555b22d17ac75f3ea4103865c838dcd5eb448 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -45,6 +45,8 @@
   <string name="pref_read_summary">傳送與接收指示訊息已顯示的回條。</string>
   <string name="pref_block_record_title">封鎖螢幕截圖與錄製</string>
   <string name="pref_block_record_summary">靜止拍攝螢幕截圖或錄製影片。</string>
+  <string name="pref_link_preview_title">在對話中顯示連結預覽</string>
+  <string name="pref_link_preview_summary">預覽需要從第三方伺服器下載內容。</string>
   <!--Notifications Visibility-->
   <string name="notification_public">公開 \n(在鎖定畫面上顯示通知及其內容)\n</string>
   <string name="notification_private">私人 \n(在鎖定畫面上顯示通知但隱藏其內容)\n</string>