diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index d3859cd9f..a2d0b484c 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -645,8 +645,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
             mSearchEditText.setHint(R.string.search_contacts);
             mSearchEditText.setContentDescription(getString(R.string.search_contacts));
         } else {
-            mSearchEditText.setHint(R.string.search_bookmarks);
-            mSearchEditText.setContentDescription(getString(R.string.search_bookmarks));
+            mSearchEditText.setHint(R.string.search_group_chats);
+            mSearchEditText.setContentDescription(getString(R.string.search_group_chats));
         }
     }
 
@@ -1299,7 +1299,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                 case 0:
                     return getResources().getString(R.string.contacts);
                 case 1:
-                    return getResources().getString(R.string.bookmarks);
+                    return getResources().getString(R.string.group_chats);
                 default:
                     return super.getPageTitle(position);
             }
diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml
index e4d4b8000..f526ffd99 100644
--- a/src/main/res/layout/dialog_join_conference.xml
+++ b/src/main/res/layout/dialog_join_conference.xml
@@ -46,6 +46,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:checked="true"
-            android:text="@string/save_as_bookmark"/>
+            android:text="@string/save_as_group_chat"/>
     </LinearLayout>
 </layout>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index b1d3a8ef0..c8a5c3bad 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -182,7 +182,6 @@
     <string name="fetching_keys">جارإحضار المفاتيح ...</string>
     <string name="done">تم</string>
     <string name="decrypt">فك الشيفرة</string>
-    <string name="bookmarks">الفواصل المرجعية</string>
     <string name="search">بحث</string>
     <string name="enter_contact">قم بإدخال جهة إتصال</string>
     <string name="delete_contact">حذف جهة الإتصال</string>
@@ -358,7 +357,6 @@
     <string name="recently_used">التي تم استعمالها كثيرا مؤخرا</string>
     <string name="choose_quick_action">إختر حركة سريعة</string>
     <string name="search_contacts">البحث في جهات الإتصال</string>
-    <string name="search_bookmarks">البحث في الفواصل المرجعية</string>
     <string name="send_private_message">إبعث برسالة على الخاص</string>
     <string name="username">إسم المستخدم</string>
     <string name="username_hint">إسم المستخدم</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 5b8982917..b8f233eef 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -226,7 +226,6 @@
     <string name="fetching_keys">Изтегляне на ключове…</string>
     <string name="done">Готово</string>
     <string name="decrypt">Дешифроване</string>
-    <string name="bookmarks">Отметки</string>
     <string name="search">Търсене</string>
     <string name="enter_contact">Въведете контакт</string>
     <string name="delete_contact">Изтриване на контакта</string>
@@ -451,7 +450,6 @@
     <string name="recently_used">Използвани наскоро</string>
     <string name="choose_quick_action">Изберете бързо действие</string>
     <string name="search_contacts">Търсене в контактите</string>
-    <string name="search_bookmarks">Търсене в отметките</string>
     <string name="send_private_message">Изпращане на лично съобщение</string>
     <string name="user_has_left_conference">%1$s напусна груповия разговор</string>
     <string name="username">Потребителско име</string>
diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml
index bd426b737..d4a0639a9 100644
--- a/src/main/res/values-bn-rIN/strings.xml
+++ b/src/main/res/values-bn-rIN/strings.xml
@@ -102,7 +102,6 @@
     <string name="offering">প্রস্তাব দেওয়া হচ্ছে...</string>
     <string name="waiting">অপেক্ষা করা হচ্ছে...</string>
     <string name="no_pgp_key">কোনো OpenPGP Key খুঁজে পাওয়া যায়নি</string>
-    <string name="bookmarks">বুকমার্ক করা যেগুলি</string>
     <string name="search">খোঁজা যাক</string>
     <string name="block_contact">এই ব্যক্তিকে ব্লক্ করা যাক</string>
     <string name="unblock_contact">ব্লকটা সরিয়ে ফেলা যাক</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 2259a74b0..3efec8a7b 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -216,7 +216,6 @@
     <string name="fetching_keys">S\'estan obtenint les claus…</string>
     <string name="done">Fet</string>
     <string name="decrypt">Desxifra</string>
-    <string name="bookmarks">Marcadors</string>
     <string name="search">Cerca</string>
     <string name="enter_contact">Introduïu un contacte</string>
     <string name="delete_contact">Suprimeix el contacte</string>
@@ -441,7 +440,6 @@
     <string name="recently_used">Ús més recent</string>
     <string name="choose_quick_action">Trieu una acció ràpida</string>
     <string name="search_contacts">Buscar contactes</string>
-    <string name="search_bookmarks">Buscar favorits</string>
     <string name="send_private_message">Envia un missatge privat</string>
     <string name="user_has_left_conference">%1$s ha abandonat el xat de grup</string>
     <string name="username">Nom d\'usuari</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 316e8200b..f4e1a083c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -229,7 +229,6 @@
     <string name="fetching_keys">Získávání klíčů…</string>
     <string name="done">Hotovo</string>
     <string name="decrypt">Dešifrovat</string>
-    <string name="bookmarks">Záložky</string>
     <string name="search">Hledat</string>
     <string name="enter_contact">Vložit kontakt</string>
     <string name="delete_contact">Smazat kontakt</string>
@@ -456,7 +455,6 @@
     <string name="recently_used">Naposledy použitá</string>
     <string name="choose_quick_action">Vybrat rychlou akci</string>
     <string name="search_contacts">Prohledat kontakty</string>
-    <string name="search_bookmarks">Prohledat záložky</string>
     <string name="send_private_message">Poslat soukromou zprávu</string>
     <string name="user_has_left_conference">%1$s opustil(a) skupinový chat</string>
     <string name="username">Uživatelské jméno</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 6915a903d..2d70d571a 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -227,7 +227,6 @@
     <string name="fetching_keys">Henter nøgler…</string>
     <string name="done">Færdig</string>
     <string name="decrypt">Dekrypter</string>
-    <string name="bookmarks">Bogmærker</string>
     <string name="search">Find</string>
     <string name="enter_contact">Indtast kontakt</string>
     <string name="delete_contact">Slet kontakt</string>
@@ -457,7 +456,6 @@
     <string name="recently_used">Senest brugt</string>
     <string name="choose_quick_action">Vælg hurtig handling</string>
     <string name="search_contacts">Find kontakter</string>
-    <string name="search_bookmarks">Find bogmærker</string>
     <string name="send_private_message">Send privat besked</string>
     <string name="user_has_left_conference">%1$s har forladt gruppechatten</string>
     <string name="username">Brugernavn</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 525df9187..591970c30 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -226,7 +226,6 @@
     <string name="fetching_keys">Schlüssel werden abgerufen…</string>
     <string name="done">Fertig</string>
     <string name="decrypt">Entschlüsseln</string>
-    <string name="bookmarks">Lesezeichen</string>
     <string name="search">Suchen</string>
     <string name="enter_contact">Kontakt eingeben</string>
     <string name="delete_contact">Kontakt löschen</string>
@@ -458,7 +457,6 @@
     <string name="recently_used">Zuletzt verwendet</string>
     <string name="choose_quick_action">Wähle Schnell-Taste</string>
     <string name="search_contacts">Kontakte durchsuchen</string>
-    <string name="search_bookmarks">Lesezeichen durchsuchen</string>
     <string name="send_private_message">Private Nachricht senden</string>
     <string name="user_has_left_conference">%1$s hat den Gruppenchat verlassen</string>
     <string name="username">Benutzername</string>
@@ -1005,7 +1003,6 @@
     <string name="incoming_call_duration_timestamp">Eingehender Anruf (%s) · %s</string>
     <string name="outgoing_call_duration_timestamp">Ausgehender Anruf (%s) · %s</string>
     <string name="outgoing_call_timestamp">Ausgehender Anruf · %s</string>
-    <string name="channel_discover_opt_in_message">Die Channelsuche verwendet einen Drittanbieterservice namens &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Wenn du diese Funktion verwendest, werden deine IP-Adresse und deine Suchbegriffe an diesen Dienst übertragen. Weitere Informationen findest du in der &lt;a href=https://search.jabber.network/privacy&gt;Datenschutzerklärung&lt;/a&gt;.</string>
     <string name="delete_from_server">Konto vom Server löschen</string>
     <string name="could_not_delete_account_from_server">Konto konnte nicht vom Server gelöscht werden</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index bb9697c8b..dccb53bf0 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -226,7 +226,6 @@
     <string name="fetching_keys">Μεταφόρτωση κλειδιών...</string>
     <string name="done">Έγινε</string>
     <string name="decrypt">Αποκρυπτογράφηση</string>
-    <string name="bookmarks">Σελιδοδείκτες</string>
     <string name="search">Αναζήτηση</string>
     <string name="enter_contact">Εισαγωγή επαφής</string>
     <string name="delete_contact">Διαγραφή επαφής</string>
@@ -452,7 +451,6 @@
     <string name="recently_used">Πιο πρόσφατα χρησιμοποιημένη</string>
     <string name="choose_quick_action">Επιλογή γρήγορης ενέργειας</string>
     <string name="search_contacts">Αναζήτηση επαφών</string>
-    <string name="search_bookmarks">Αναζήτηση σελιδοδεικτών</string>
     <string name="send_private_message">Αποστολή ιδιωτικού μηνύματος</string>
     <string name="user_has_left_conference">Ο/Η %1$s αποχώρησε από την ομαδική συζήτηση</string>
     <string name="username">Όνομα χρήστη</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f6e5f2bd1..8ea82b501 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -229,7 +229,6 @@
     <string name="fetching_keys">Descargando claves…</string>
     <string name="done">Hecho</string>
     <string name="decrypt">Descifrar</string>
-    <string name="bookmarks">Marcadores</string>
     <string name="search">Buscar</string>
     <string name="enter_contact">Introducir contacto</string>
     <string name="delete_contact">Eliminar contacto</string>
@@ -460,7 +459,6 @@
     <string name="recently_used">Usada más recientemente</string>
     <string name="choose_quick_action">Elegir acción rápida</string>
     <string name="search_contacts">Buscar contactos</string>
-    <string name="search_bookmarks">Buscar marcadores</string>
     <string name="send_private_message">Enviar mensaje privado</string>
     <string name="user_has_left_conference">%1$s ha dejado la conversación</string>
     <string name="username">Usuario</string>
@@ -1019,7 +1017,6 @@
     <string name="outgoing_call_duration_timestamp">Llamada saliente (%s) · %s</string>
     <string name="outgoing_call_timestamp">Llamadas salientes · %s</string>
     <string name="decline">Rechazar</string>
-    <string name="channel_discover_opt_in_message">La búsqueda de canales utiliza un servicio de terceros denominado &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Si utiliza esta función, su dirección IP y búsqueda términos transferidos a este servicio. Para obtener más información, consulte la &lt;a href=https://search.jabber.network/privacy&gt;Política de privacidad&lt;/a&gt;.</string>
     <string name="delete_from_server">Eliminar la cuenta del servidor</string>
     <string name="could_not_delete_account_from_server">No se pudo eliminar la cuenta del servidor</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index fb0ed1683..5fde5b3cb 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -178,7 +178,6 @@
     <string name="fetching_keys">Gakoak eskuratzen...</string>
     <string name="done">Eginda</string>
     <string name="decrypt">Desenkriptatu</string>
-    <string name="bookmarks">Laster-markak</string>
     <string name="search">Bilatu</string>
     <string name="enter_contact">Kontaktua sartu</string>
     <string name="delete_contact">Kontaktua ezabatu</string>
@@ -379,7 +378,6 @@
     <string name="recently_used">Azkenengo aldiz erabilitakoa</string>
     <string name="choose_quick_action">Ekintza azkarra aukeratu</string>
     <string name="search_contacts">Kontaktuak bilatu</string>
-    <string name="search_bookmarks">Laster-marketan bilatu</string>
     <string name="send_private_message">Mezu pribatua bidali</string>
     <string name="username">Erabiltzaile izena</string>
     <string name="username_hint">Erabiltzaile izena</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index c42059667..4fc483c11 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -221,7 +221,6 @@
     <string name="fetching_keys">Haetaan avaimia...</string>
     <string name="done">Valmis</string>
     <string name="decrypt">Pura salaus</string>
-    <string name="bookmarks">Kirjanmerkit</string>
     <string name="search">Haku</string>
     <string name="enter_contact">Syötä yhteystieto</string>
     <string name="delete_contact">Poista yhteystieto</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 578d676c8..67c6e7f1d 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -222,7 +222,6 @@
     <string name="fetching_keys">Récupération des clés…</string>
     <string name="done">Terminé</string>
     <string name="decrypt">Déchiffrer</string>
-    <string name="bookmarks">Favoris</string>
     <string name="search">Rechercher</string>
     <string name="enter_contact">Ajouter contact</string>
     <string name="delete_contact">Supprimer un contact</string>
@@ -448,7 +447,6 @@
     <string name="recently_used">Dernière utilisée</string>
     <string name="choose_quick_action">Sélectionner l\'action rapide</string>
     <string name="search_contacts"> Rechercher dans les contacts</string>
-    <string name="search_bookmarks">Rechercher des favoris</string>
     <string name="send_private_message">Envoyer un message privé</string>
     <string name="user_has_left_conference">%1$s a quitté le groupe</string>
     <string name="username">Identifiant</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index bc69d1f8d..f5efedc2d 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -230,7 +230,6 @@
     <string name="fetching_keys">Obtendo chaves…</string>
     <string name="done">Feito</string>
     <string name="decrypt">Descifrar</string>
-    <string name="bookmarks">Marcadores</string>
     <string name="search">Buscar</string>
     <string name="enter_contact">Introducir contacto</string>
     <string name="delete_contact">Eliminar contacto</string>
@@ -460,7 +459,6 @@
     <string name="recently_used">Utilizadas recentemente</string>
     <string name="choose_quick_action">Elixe a acción rápida</string>
     <string name="search_contacts">Buscar contactos</string>
-    <string name="search_bookmarks">Buscar marcadores</string>
     <string name="send_private_message">Enviar mensaxe privada</string>
     <string name="user_has_left_conference">%1$s deixou a conversa en grupo</string>
     <string name="username">Identificador</string>
@@ -1008,7 +1006,6 @@
     <string name="incoming_call_duration_timestamp">Chamada entrante (%s) · %s</string>
     <string name="outgoing_call_duration_timestamp">Chamada saínte (%s) · %s</string>
     <string name="outgoing_call_timestamp">Chamada saínte · %s</string>
-    <string name="channel_discover_opt_in_message">O descubrimento de canles usa un servizo externo chamado &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Ao usar esta ferramenta transmitirás o teu enderezo IP e termos de busca a ese servizo. Le a súa &lt;a href=https://search.jabber.network/privacy&gt;Política de Privacidade&lt;/a&gt; para saber máis.</string>
     <string name="delete_from_server">Eliminar a conta no servidor</string>
     <string name="could_not_delete_account_from_server">Non se puido eliminar a conta no servidor</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index c9bcf6ba1..c4c01573a 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -224,7 +224,6 @@
     <string name="fetching_keys">Kulcsok lekérése…</string>
     <string name="done">Kész</string>
     <string name="decrypt">Visszafejtés</string>
-    <string name="bookmarks">Könyvjelzők</string>
     <string name="search">Keresés</string>
     <string name="enter_contact">Partner megadása</string>
     <string name="delete_contact">Partner törlése</string>
@@ -443,7 +442,6 @@
     <string name="recently_used">Legutóbb használt</string>
     <string name="choose_quick_action">Gyors művelet kiválasztása</string>
     <string name="search_contacts">Partnerek keresése</string>
-    <string name="search_bookmarks">Könyvjelzők keresése</string>
     <string name="send_private_message">Személyes üzenet küldése</string>
     <string name="user_has_left_conference">%1$s elhagyta a csoportos csevegést</string>
     <string name="username">Felhasználónév</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 701e5ec76..aa357c713 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -213,7 +213,6 @@
     <string name="fetching_keys">Mengambil kunci…</string>
     <string name="done">Selesai</string>
     <string name="decrypt">Deskripsi</string>
-    <string name="bookmarks">Bookmark</string>
     <string name="search">Cari</string>
     <string name="enter_contact">Masukkan kontak</string>
     <string name="delete_contact">Hapus kontak</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c24c5649b..e3605c9fd 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -227,7 +227,6 @@
     <string name="fetching_keys">Ricezione chiavi…</string>
     <string name="done">Fatto</string>
     <string name="decrypt">Decripta</string>
-    <string name="bookmarks">Segnalibri</string>
     <string name="search">Cerca</string>
     <string name="enter_contact">Inserisci contatto</string>
     <string name="delete_contact">Elimina contatto</string>
@@ -460,7 +459,6 @@
     <string name="recently_used">Usati recentemente</string>
     <string name="choose_quick_action">Scegli azione rapida</string>
     <string name="search_contacts">Cerca contatti</string>
-    <string name="search_bookmarks">Cerca segnalibri</string>
     <string name="send_private_message">Invia messaggio privato</string>
     <string name="user_has_left_conference">%1$s ha abbandonato la chat di gruppo</string>
     <string name="username">Utente</string>
@@ -1019,7 +1017,6 @@
     <string name="incoming_call_duration_timestamp">Chiamata in arrivo (%s) · %s</string>
     <string name="outgoing_call_duration_timestamp">Chiamata in uscita (%s) · %s</string>
     <string name="outgoing_call_timestamp">Chiamata in uscita · %s</string>
-    <string name="channel_discover_opt_in_message">La scoperta dei canali usa un servizio di terze parti chiamato &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;L\'uso di questa funzione invierà il tuo indirizzo IP e i termini di ricerca a quel servizio. Vedi la sua &lt;a href=https://search.jabber.network/privacy&gt;informativa sulla privacy&lt;/a&gt; per maggiori informazioni.</string>
     <string name="delete_from_server">Rimuovi profilo dal server</string>
     <string name="could_not_delete_account_from_server">Impossibile eliminare il profilo dal server</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 11cd9a8fb..8c136c06c 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -223,7 +223,6 @@
     <string name="fetching_keys">暗号鍵の取得中…</string>
     <string name="done">完了</string>
     <string name="decrypt">復号</string>
-    <string name="bookmarks">ブックマーク</string>
     <string name="search">検索</string>
     <string name="enter_contact">連絡先を入力</string>
     <string name="delete_contact">連絡先を削除</string>
@@ -451,7 +450,6 @@
     <string name="recently_used">最近使用した</string>
     <string name="choose_quick_action">クイックアクションを選択</string>
     <string name="search_contacts">連絡先を検索</string>
-    <string name="search_bookmarks">ブックマークを検索</string>
     <string name="send_private_message">非公開メッセージを送信</string>
     <string name="user_has_left_conference">%1$s はグループチャットを退出しました</string>
     <string name="username">ユーザー名</string>
diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml
index cf9ca60a3..ccee3e16b 100644
--- a/src/main/res/values-ml/strings.xml
+++ b/src/main/res/values-ml/strings.xml
@@ -144,7 +144,6 @@
     <string name="fetching_keys">കീകൾ ലഭ്യമാക്കുന്നു...</string>
     <string name="done">ചെയ്തു</string>
     <string name="decrypt">ഡീക്രിപ്റ്റ് ചെയ്യുക</string>
-    <string name="bookmarks">അടയാളകുറിപ്പുകൾ</string>
     <string name="search">തിരയുക</string>
     <string name="enter_contact">കോൺ‌ടാക്റ്റ് നൽകുക</string>
     <string name="delete_contact">കോൺ‌ടാക്റ്റ് ഇല്ലാതാക്കൂ</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index a8ec45e61..d45984703 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -210,7 +210,6 @@
     <string name="fetching_keys">Sleutels ophalen…</string>
     <string name="done">Klaar</string>
     <string name="decrypt">Ontsleutelen</string>
-    <string name="bookmarks">Bladwijzers</string>
     <string name="search">Zoeken</string>
     <string name="enter_contact">Contact invoeren</string>
     <string name="delete_contact">Contact verwijderen</string>
@@ -420,7 +419,6 @@
     <string name="recently_used">Recent gebruikt</string>
     <string name="choose_quick_action">Snelle actie kiezen</string>
     <string name="search_contacts">Contacten zoeken</string>
-    <string name="search_bookmarks">Bladwijzers doorzoeken</string>
     <string name="send_private_message">Privébericht sturen</string>
     <string name="username">Gebruikersnaam</string>
     <string name="username_hint">Gebruikersnaam</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 0b2798984..cf60a507a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -230,7 +230,6 @@
     <string name="fetching_keys">Pobieranie kluczy…</string>
     <string name="done">Ukończono</string>
     <string name="decrypt">Odszyfruj</string>
-    <string name="bookmarks">Zakładki</string>
     <string name="search">Szukaj</string>
     <string name="enter_contact">Wpisz kontakt</string>
     <string name="delete_contact">Usuń kontakt</string>
@@ -464,7 +463,6 @@
     <string name="recently_used">Ostatnio używana</string>
     <string name="choose_quick_action">Wybierz szybką akcję</string>
     <string name="search_contacts">Przeszukuj kontakty</string>
-    <string name="search_bookmarks">Przeszukaj zakładki</string>
     <string name="send_private_message">Wyślij wiadomość prywatną</string>
     <string name="user_has_left_conference">%1$s opuścił konferencję</string>
     <string name="username">Nazwa użytkownika</string>
@@ -1038,7 +1036,6 @@
     <string name="incoming_call_duration_timestamp">Połączenie przychodzące (%s) · %s</string>
     <string name="outgoing_call_duration_timestamp">Połączenie wychodzące (%s) · %s</string>
     <string name="outgoing_call_timestamp">Połączenie wychodzące · %s</string>
-    <string name="channel_discover_opt_in_message">Wykrywanie kanałów korzysta z usługi innej firmy o nazwie &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Użycie tej funkcji spowoduje przesłanie adresu IP i wyszukiwanych terminów do tej usługi. Zobacz ich &lt;a href=https://search.jabber.network/privacy&gt;Politykę prywatności&lt;/a&gt;, aby uzyskać więcej informacji.</string>
     <string name="delete_from_server">Usuń konto z serwera</string>
     <string name="could_not_delete_account_from_server">Nie można usunąć konta z serwera</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 624d93c83..8c04b5a6c 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -230,7 +230,6 @@
     <string name="fetching_keys">Buscando as chaves...</string>
     <string name="done">Concluído</string>
     <string name="decrypt">Descriptografar</string>
-    <string name="bookmarks">Favoritos</string>
     <string name="search">Pesquisar</string>
     <string name="enter_contact">Digite o contato</string>
     <string name="delete_contact">Excluir contato</string>
@@ -461,7 +460,6 @@
     <string name="recently_used">Usada mais recentemente</string>
     <string name="choose_quick_action">Selecione a ação rápida</string>
     <string name="search_contacts">Pesquisar contatos</string>
-    <string name="search_bookmarks">Pesquisar favoritos</string>
     <string name="send_private_message">Enviar mensagem privada</string>
     <string name="user_has_left_conference">%1$s deixou a conversa em grupo</string>
     <string name="username">Nome de usuário</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 15372a60a..42adc743c 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -229,7 +229,6 @@
     <string name="fetching_keys">Se preiau cheile…</string>
     <string name="done">Gata</string>
     <string name="decrypt">Decriptează</string>
-    <string name="bookmarks">Semne de carte</string>
     <string name="search">Caută</string>
     <string name="enter_contact">Introduceți contact</string>
     <string name="delete_contact">Șterge contact</string>
@@ -462,7 +461,6 @@
     <string name="recently_used">Folosită recent</string>
     <string name="choose_quick_action">Alegeți acțiunea rapidă</string>
     <string name="search_contacts">Caută contacte</string>
-    <string name="search_bookmarks">Caută semne de carte</string>
     <string name="send_private_message">Trimite mesaj privat</string>
     <string name="user_has_left_conference">%1$s a părăsit discuția de grup</string>
     <string name="username">Nume utilizator</string>
@@ -1028,6 +1026,5 @@
     <string name="outgoing_call_duration_timestamp">Apel efectuat (%s) · %s</string>
     <string name="outgoing_call_timestamp">Apel efectuat · %s</string>
     <string name="could_not_delete_account_from_server">Nu s-a putut șterge contul de pe server</string>
-    <string name="channel_discover_opt_in_message">Descoperirea de canale publice folosește un serviciu terț numit &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Folosind această funcție se va transmite adresa dumneavoastră IP și cuvintele căutate către acest serviciu. Pentru mai multe informații citiți &lt;a href=https://search.jabber.network/privacy&gt;Politica de confidențialitate&lt;/a&gt; a serviciului.</string>
     <string name="delete_from_server">Șterge contul de pe server</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 16113a1f0..c099525ad 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -225,7 +225,6 @@
     <string name="fetching_keys">Получение ключей…</string>
     <string name="done">Готово</string>
     <string name="decrypt">Расшифровать</string>
-    <string name="bookmarks">Закладки</string>
     <string name="search">Поиск</string>
     <string name="enter_contact">Добавить контакт</string>
     <string name="delete_contact">Удалить контакт</string>
@@ -453,7 +452,6 @@
     <string name="recently_used">Последнее выбранное</string>
     <string name="choose_quick_action">Выбрать быстрое действие</string>
     <string name="search_contacts">Поиск контактов</string>
-    <string name="search_bookmarks">Поиск закладок</string>
     <string name="send_private_message">Отправить личное сообщение</string>
     <string name="user_has_left_conference">%1$s покинул конференцию</string>
     <string name="username">Имя пользователя</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index d9e0f2a51..410beca20 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -222,7 +222,6 @@
     <string name="fetching_keys">Načítavam kľúče...</string>
     <string name="done">Dokončený</string>
     <string name="decrypt">Dešifrovať</string>
-    <string name="bookmarks">Záložky</string>
     <string name="search">Hľadať</string>
     <string name="enter_contact">Vložiť Kontakt</string>
     <string name="delete_contact">Zmazať kontakt</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index a4f1548f4..c86c426b6 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -178,7 +178,6 @@
     <string name="fetching_keys">Po sillen kyçe…</string>
     <string name="done">U bë</string>
     <string name="decrypt">Shfshehtëzoje</string>
-    <string name="bookmarks">Faqerojtës</string>
     <string name="search">Kërko</string>
     <string name="enter_contact">Jepni Kontakt</string>
     <string name="delete_contact">Fshije kontaktin</string>
@@ -368,7 +367,6 @@
     <string name="recently_used">Më të përdorur së fundi</string>
     <string name="choose_quick_action">Zgjidhni veprim të shpejtë</string>
     <string name="search_contacts">Kërko te kontaktet</string>
-    <string name="search_bookmarks">Kërko te faqerojtës</string>
     <string name="send_private_message">Dërgo mesazh privat</string>
     <string name="user_has_left_conference">%1$s e braktisi fjalosjen në grup</string>
     <string name="username">Emër përdoruesi</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 7c1a1e16d..de9f6d1df 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -225,7 +225,6 @@
     <string name="fetching_keys">Добављам кључеве…</string>
     <string name="done">Готово</string>
     <string name="decrypt">Дешифруј</string>
-    <string name="bookmarks">Обележивачи</string>
     <string name="search">Тражи</string>
     <string name="enter_contact">Унеси контакт</string>
     <string name="delete_contact">Обриши контакт</string>
@@ -448,7 +447,6 @@
     <string name="recently_used">Недавно коришћена</string>
     <string name="choose_quick_action">Изаберите брзу радњу</string>
     <string name="search_contacts">Тражи контакте</string>
-    <string name="search_bookmarks">Претрага обележивача</string>
     <string name="send_private_message">Пошаљи личну поруку</string>
     <string name="user_has_left_conference">%1$s је напустио/ла групно ћаскање</string>
     <string name="username">Корисничко име</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index bd2edb397..fe8138eb5 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -227,7 +227,6 @@
     <string name="fetching_keys">Hämtar nycklar …</string>
     <string name="done">Klar</string>
     <string name="decrypt">Avkryptera</string>
-    <string name="bookmarks">Bokmärken</string>
     <string name="search">Sök</string>
     <string name="enter_contact">Fyll i kontakt</string>
     <string name="delete_contact">Ta bort kontakt</string>
@@ -453,7 +452,6 @@
     <string name="recently_used">Senast använd</string>
     <string name="choose_quick_action">Välj snabbfunktion</string>
     <string name="search_contacts">Sök kontakter</string>
-    <string name="search_bookmarks">Sök bokmärken</string>
     <string name="send_private_message">Skicka privat meddelande</string>
     <string name="user_has_left_conference">%1$s har lämnat gruppchatten</string>
     <string name="username">Användarnamn</string>
diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml
index cfa9b612f..62806a6f4 100644
--- a/src/main/res/values-szl/strings.xml
+++ b/src/main/res/values-szl/strings.xml
@@ -240,7 +240,6 @@
     <string name="fetching_keys">Pobiyranie kluczy…</string>
     <string name="done">Skōńczōno</string>
     <string name="decrypt">Ôdszyfruj</string>
-    <string name="bookmarks">Zokłodki</string>
     <string name="search">Szukej</string>
     <string name="enter_contact">Wpisz kōntakt</string>
     <string name="delete_contact">Wymaż kōntakt</string>
@@ -477,7 +476,6 @@
     <string name="recently_used">Ôstatnio używano</string>
     <string name="choose_quick_action">Ôbier gibko akcyjo</string>
     <string name="search_contacts">Przeszukej kōntakty</string>
-    <string name="search_bookmarks">Przeszukej zokłodki</string>
     <string name="send_private_message">Wyślij wiadōmość prywatno</string>
     <string name="user_has_left_conference">%1$s już niy je we kōnferyncyji</string>
     <string name="username">Miano ôd używocza</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index f1dfef5b3..b6880d42a 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -224,7 +224,6 @@
     <string name="fetching_keys">Anahtarları alıyor…</string>
     <string name="done">Tamam</string>
     <string name="decrypt">Şifreyi çöz</string>
-    <string name="bookmarks">Yer imleri</string>
     <string name="search">Ara</string>
     <string name="enter_contact">Kişi Girin</string>
     <string name="delete_contact">Kişiyi sil</string>
@@ -453,7 +452,6 @@
     <string name="recently_used">En son kullanılanlar</string>
     <string name="choose_quick_action">Kısayolu seç</string>
     <string name="search_contacts">Kişilerde ara</string>
-    <string name="search_bookmarks">Yer imleri ara</string>
     <string name="send_private_message">Özel ileti gönder</string>
     <string name="user_has_left_conference">%1$s grup konuşmasından ayrıldı</string>
     <string name="username">Kullanıcı adı</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index c1cf1640c..b7342458c 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -208,7 +208,6 @@
     <string name="fetching_keys">Отримую ключі…</string>
     <string name="done">Зроблено</string>
     <string name="decrypt">Розшифрувати</string>
-    <string name="bookmarks">Закладки</string>
     <string name="search">Пошук</string>
     <string name="enter_contact">Увести контакт</string>
     <string name="delete_contact">Вилучити контакт</string>
@@ -435,7 +434,6 @@
     <string name="recently_used">Остання, що використана</string>
     <string name="choose_quick_action">Вибрати швидку дію</string>
     <string name="search_contacts">Шукати в контактах</string>
-    <string name="search_bookmarks">Шукати закладки</string>
     <string name="send_private_message">Приватне повідомлення</string>
     <string name="user_has_left_conference">%1$s залишила групу!</string>
     <string name="username">Ім\'я користувача</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 502243ea8..82fd62d39 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -223,7 +223,6 @@
     <string name="fetching_keys">Đang nhận khoá...</string>
     <string name="done">Xong</string>
     <string name="decrypt">Giải mã</string>
-    <string name="bookmarks">Dấu trang</string>
     <string name="search">Tìm kiếm</string>
     <string name="enter_contact">Nhập liên hệ</string>
     <string name="delete_contact">Xoá liên hệ</string>
@@ -448,7 +447,6 @@
     <string name="recently_used">Dùng gần đây nhất</string>
     <string name="choose_quick_action">Chọn thao tác nhanh</string>
     <string name="search_contacts">Tìm kiếm liên hệ</string>
-    <string name="search_bookmarks">Tìm kiếm dấu trang</string>
     <string name="send_private_message">Gửi tin nhắn cá nhân</string>
     <string name="user_has_left_conference">%1$s đã rời khỏi cuộc trò chuyện nhóm</string>
     <string name="username">Tên người dùng</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 851de9e08..eab545ddb 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -227,7 +227,6 @@
     <string name="fetching_keys">获取密钥中…</string>
     <string name="done">完成</string>
     <string name="decrypt">解密</string>
-    <string name="bookmarks">书签</string>
     <string name="search">搜索</string>
     <string name="enter_contact">输入联系人</string>
     <string name="delete_contact">删除联系人</string>
@@ -459,7 +458,6 @@
     <string name="recently_used">刚用过的</string>
     <string name="choose_quick_action">选择快捷操作</string>
     <string name="search_contacts">搜索联系人</string>
-    <string name="search_bookmarks">搜索书签</string>
     <string name="send_private_message">发送私密消息</string>
     <string name="user_has_left_conference">%1$s离开了群聊</string>
     <string name="username">用户名</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index baf2fd8b2..388ffb1e8 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -213,7 +213,6 @@
     <string name="fetching_keys">正在擷取金鑰…</string>
     <string name="done">完成</string>
     <string name="decrypt">解密</string>
-    <string name="bookmarks">書籤</string>
     <string name="search">搜尋</string>
     <string name="enter_contact">輸入聯絡人</string>
     <string name="delete_contact">刪除聯絡人</string>
@@ -433,7 +432,6 @@
     <string name="recently_used">最近使用</string>
     <string name="choose_quick_action">選擇快速動作</string>
     <string name="search_contacts">搜尋聯絡人</string>
-    <string name="search_bookmarks">搜尋書籤</string>
     <string name="send_private_message">傳送私密訊息</string>
     <string name="user_has_left_conference">%1$s 離開了群組聊天</string>
     <string name="username">使用者名稱</string>
@@ -992,7 +990,6 @@
     <string name="outgoing_call_duration_timestamp">撥出電話 (%s) · %s</string>
     <string name="incoming_call_duration_timestamp">撥入電話 (%s) · %s</string>
     <string name="outgoing_call_timestamp">撥出電話 · %s</string>
-    <string name="channel_discover_opt_in_message">頻道探索使用一個名為 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服務。&lt;br&gt;&lt;br&gt;使用此功能將會把您的 IP 位址和搜尋詞彙傳送至此服務。更多資訊請參見他們的&lt;a href=https://search.jabber.network/privacy&gt;隱私權政策&lt;/a&gt;。</string>
     <string name="request_presence_updates">請先要求您的聯絡人進行線上狀態更新。
 \n
 \n<small>這將被用於判斷您的聯絡人正在使用的聊天應用程式</small>。</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f64e9bbd0..7130aa6a7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -225,7 +225,7 @@
     <string name="fetching_keys">Fetching keys…</string>
     <string name="done">Done</string>
     <string name="decrypt">Decrypt</string>
-    <string name="bookmarks">Bookmarks</string>
+    <string name="group_chats">Group chats</string>
     <string name="search">Search</string>
     <string name="enter_contact">Enter Contact</string>
     <string name="delete_contact">Delete contact</string>
@@ -239,6 +239,7 @@
     <string name="channel_full_jid_example">channel@conference.example.com/nick</string>
     <string name="channel_bare_jid_example">channel@conference.example.com</string>
     <string name="save_as_bookmark">Save as bookmark</string>
+    <string name="save_as_group_chat">Save as group chat</string>
     <string name="delete_bookmark">Delete bookmark</string>
     <string name="destroy_room">Destroy group chat</string>
     <string name="destroy_channel">Destroy channel</string>
@@ -455,7 +456,7 @@
     <string name="recently_used">Most recently used</string>
     <string name="choose_quick_action">Choose quick action</string>
     <string name="search_contacts">Search contacts</string>
-    <string name="search_bookmarks">Search bookmarks</string>
+    <string name="search_group_chats">Search group chats</string>
     <string name="send_private_message">Send private message</string>
     <string name="user_has_left_conference">%1$s has left the group chat</string>
     <string name="username">Username</string>