diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index 6521b7587..13f630231 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "هل انت متأكد من تنزيل الوسيط المرسل من طرف $name$؟",
   "pinConversation": "ثَبِت المحادثة",
   "unpinConversation": "ألغِي تثبيت المحادثة",
-  "pinConversationLimitTitle": "حدود المحادثات المثبتة",
-  "pinConversationLimitToastDescription": "يمكنك تثبيت $number$ محادثات فقط",
   "showUserDetails": "اظهر تفاصيل المستخدم",
   "sendRecoveryPhraseTitle": "أرسل جملة الاسترجاع",
   "sendRecoveryPhraseMessage": "انت تحاول ارسال جملة الاسترجاع التي تسمح بالوصول للحساب. متاكد من ارسالها؟",
diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json
index d2aebc667..83a7a33b9 100644
--- a/_locales/bg/messages.json
+++ b/_locales/bg/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json
index fbb512696..24096587c 100644
--- a/_locales/ca/messages.json
+++ b/_locales/ca/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 2bdb16525..7560ffddf 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Určitě chceš stáhnout obsah odeslán uživatelem $name$?",
   "pinConversation": "Připnout konverzaci",
   "unpinConversation": "Odepnout konverzaci",
-  "pinConversationLimitTitle": "Limit připnutých konverzací",
-  "pinConversationLimitToastDescription": "Můžete připnout jen $number$ konverzací",
   "showUserDetails": "Zobrazit podrobnosti uživatele",
   "sendRecoveryPhraseTitle": "Odesílání fráze pro obnovení",
   "sendRecoveryPhraseMessage": "Pokoušíš se odeslat svou frázu pro obnovení, díky které se lze přihlásit do tvého účtu. Opravdu chceš tuto zprávu odeslat?",
diff --git a/_locales/da/messages.json b/_locales/da/messages.json
index 4df339d0d..e91fbfab2 100644
--- a/_locales/da/messages.json
+++ b/_locales/da/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 08a353fa5..6a058d4e5 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Bist du sicher, dass du die von $name$ gesendeten Medien herunterladen möchtest?",
   "pinConversation": "Unterhaltung anheften",
   "unpinConversation": "Unterhaltung abnehmen",
-  "pinConversationLimitTitle": "Limit für angeheftete Unterhaltungen",
-  "pinConversationLimitToastDescription": "Du kannst höchstens $number$ Unterhaltungen anheften",
   "showUserDetails": "Nutzerdetails ansehen",
   "sendRecoveryPhraseTitle": "Wiederherstellungsphrase zusenden",
   "sendRecoveryPhraseMessage": "Mit der Wiederherstellungsphrase kann auf deinen Account zugegriffen werden. Bist du dir sicher das du sie dir zusenden lassen möchtest?",
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 993dd30bf..c8d50fe00 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 7fcb221a7..af96d001f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -403,8 +403,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json
index 9680453b2..3ef87ad8c 100644
--- a/_locales/eo/messages.json
+++ b/_locales/eo/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 98faaecd3..fd6d07fa7 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "¿Estás seguro de querer descargar este archivo que $name$ te ha enviado?",
   "pinConversation": "Anclar conversación",
   "unpinConversation": "Desanclar conversación",
-  "pinConversationLimitTitle": "Límite de conversaciones ancladas",
-  "pinConversationLimitToastDescription": "Solo puedes anclar $number$ conversaciones",
   "showUserDetails": "Mostrar Detalles del Usuario",
   "sendRecoveryPhraseTitle": "Enviando Frase de Recuperación",
   "sendRecoveryPhraseMessage": "Estás intentando enviar tu frase de recuperación, que puede utilizarse para acceder a tu cuenta. ¿Estás seguro de que deseas enviar este mensaje?",
diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json
index eb417855f..cb13d8516 100644
--- a/_locales/es_419/messages.json
+++ b/_locales/es_419/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/et/messages.json b/_locales/et/messages.json
index f8547e003..49dca3c86 100644
--- a/_locales/et/messages.json
+++ b/_locales/et/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json
index 45fb21ce0..6f6a75fd8 100644
--- a/_locales/fa/messages.json
+++ b/_locales/fa/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "آیا مطمئنید که میخواهید رسانه های ارسال شده توسط $name$ را بارگذاری کنید؟",
   "pinConversation": "سنجاق کردن گفتگو",
   "unpinConversation": "گفتگو را از حالت پین خارج کنید",
-  "pinConversationLimitTitle": "محدودیت سنجاق کردن گفتگوها",
-  "pinConversationLimitToastDescription": "شما فقط تعداد $number$ گفتگو را میتوانید پین کنید",
   "showUserDetails": "نمایش جزئیات کاربر",
   "sendRecoveryPhraseTitle": "ارسال عبارت بازیابی",
   "sendRecoveryPhraseMessage": "شما در حال تلاش برای ارسال عبارت بازیابی خود هستید که می تواند برای دسترسی به حساب خود استفاده شود. آیا مطمئن هستید که می خواهید این پیام را ارسال کنید؟",
diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json
index ef51845c6..e6163501c 100644
--- a/_locales/fi/messages.json
+++ b/_locales/fi/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Haluatko varmasti ladata käyttäjän $name$ lähettämän median?",
   "pinConversation": "Kiinnitä keskustelu",
   "unpinConversation": "Irroita keskustelu",
-  "pinConversationLimitTitle": "Kiinnitettyjen keskuteluiden raja",
-  "pinConversationLimitToastDescription": "Voit kiinnittää enintään $number$ keskustelua",
   "showUserDetails": "Näytä käyttäjän tiedot",
   "sendRecoveryPhraseTitle": "Palautuslausekkeen lähetys",
   "sendRecoveryPhraseMessage": "Olet lähettämässä palautuslausekettasi, jonka avulla päästään tilillesi. Haluatko varmasti lähettää viestin?",
diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json
index 853c2dbe3..8382800bd 100644
--- a/_locales/fil/messages.json
+++ b/_locales/fil/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Sigurado ka bang nais mong i-download ang media mula kay $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "Maari ka lang mag-pin $number$ sa paguusap",
   "showUserDetails": "Ipakita ang Detalye ng User",
   "sendRecoveryPhraseTitle": "Ipapadala ang Recovery Phrase",
   "sendRecoveryPhraseMessage": "Sinusubukan mong ipadala ang iyong recovery phrase na pwedeng gamitin para mapasok ang iyong account. Gusto mo bang ipadala ito?",
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index ddff349b9..f2472a867 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Êtes-vous sûr de vouloir télécharger les médias envoyés par $name$ ?",
   "pinConversation": "Épingler la conversation",
   "unpinConversation": "Désépingler la conversation",
-  "pinConversationLimitTitle": "Limite de conversation épinglée",
-  "pinConversationLimitToastDescription": "Vous pouvez seulement épingler $number$ conversations",
   "showUserDetails": "Afficher les détails de l'utilisateur",
   "sendRecoveryPhraseTitle": "Envoyer la phrase de récupération",
   "sendRecoveryPhraseMessage": "Vous essayer actuellement d’envoyer votre phrase de récupération, qui peut être utilisée pour accéder a votre compte. Êtes-vous sûre de vouloir envoyer ce message ?",
diff --git a/_locales/he/messages.json b/_locales/he/messages.json
index fdf97fb74..14e321168 100644
--- a/_locales/he/messages.json
+++ b/_locales/he/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json
index 61cd97834..ef1d6dcf5 100644
--- a/_locales/hi/messages.json
+++ b/_locales/hi/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json
index 248df9185..f148903a5 100644
--- a/_locales/hr/messages.json
+++ b/_locales/hr/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json
index 0a525b908..1b280555e 100644
--- a/_locales/hu/messages.json
+++ b/_locales/hu/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Biztosan le szeretnéd tölteni a(z) $name$ által küldött tartalmat?",
   "pinConversation": "Beszélgetés feltűzése",
   "unpinConversation": "Feltűzött beszélgetés eltávolítása",
-  "pinConversationLimitTitle": "Feltűzött beszélgetések limite",
-  "pinConversationLimitToastDescription": "Csak $number$ beszélgetést tudsz feltűzni",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Helyreállító kódmondat küldése",
   "sendRecoveryPhraseMessage": "A helyreállító kódmondatod készülsz elküldeni, amellyel hozzá lehet férni fiókodhoz. Biztosan el akarod küldeni?",
diff --git a/_locales/id/messages.json b/_locales/id/messages.json
index 4487354ce..11c5060f4 100644
--- a/_locales/id/messages.json
+++ b/_locales/id/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index e6892390c..58e819ea9 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Sei sicuro di voler scaricare i media inviati da $name$?",
   "pinConversation": "Fissa conversazione",
   "unpinConversation": "Rimuovi conversazione",
-  "pinConversationLimitTitle": "Limite conversazioni fissate",
-  "pinConversationLimitToastDescription": "Puoi fissare solo $number$ conversazioni",
   "showUserDetails": "Mostra Dettagli Utente",
   "sendRecoveryPhraseTitle": "Invio Frase Di Recupero",
   "sendRecoveryPhraseMessage": "Stai tentando di inviare la frase di recupero che può essere utilizzata per accedere al tuo account. Sei sicuro di voler inviare questo messaggio?",
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 890d4db9e..54eeb53d8 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "$name$ が送信したメディアをダウンロードしてもよろしいですか？",
   "pinConversation": "会話をピン留めする",
   "unpinConversation": "会話のピン留めを外す",
-  "pinConversationLimitTitle": "会話のピン留めの上限",
-  "pinConversationLimitToastDescription": "$number$ 件の会話をピン留めすることができます",
   "showUserDetails": "ユーザーの詳細を表示",
   "sendRecoveryPhraseTitle": "復元フレーズを送信中",
   "sendRecoveryPhraseMessage": "あなたのアカウントにアクセスするため復元フレーズを送信しようとしています。このメッセージを送信してもよろしいですか？",
diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json
index 32dced648..894a218eb 100644
--- a/_locales/ka/messages.json
+++ b/_locales/ka/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/km/messages.json b/_locales/km/messages.json
index 24aab618f..be572ec9f 100644
--- a/_locales/km/messages.json
+++ b/_locales/km/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json
index cdbae4888..de622a454 100644
--- a/_locales/kn/messages.json
+++ b/_locales/kn/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json
index c5305f167..74e133301 100644
--- a/_locales/ko/messages.json
+++ b/_locales/ko/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json
index df42e0160..f600fb6f1 100644
--- a/_locales/lt/messages.json
+++ b/_locales/lt/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Prisegti pokalbį",
   "unpinConversation": "Atsegti pokalbį",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json
index b96f8a24b..34db653a3 100644
--- a/_locales/mk/messages.json
+++ b/_locales/mk/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json
index 36afed075..cfaf4cb5d 100644
--- a/_locales/nb/messages.json
+++ b/_locales/nb/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index 9b7bb9835..b591372a7 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Weet je zeker dat je media van $name$ wilt downloaden?",
   "pinConversation": "Gesprek vastzetten",
   "unpinConversation": "Gesprek losmaken",
-  "pinConversationLimitTitle": "Limiet vastgezette gesprekken",
-  "pinConversationLimitToastDescription": "Je kan alleen $number$ gesprekken vastzetten",
   "showUserDetails": "Toon gebruikers informatie",
   "sendRecoveryPhraseTitle": "Herstelzin verzenden",
   "sendRecoveryPhraseMessage": "Je probeert uw herstel zin te versturen welke kan worden gebruikt om toegang te krijgen tot jou account. Weet je zeker dat je dit bericht wilt versturen?",
diff --git a/_locales/no/messages.json b/_locales/no/messages.json
index 205062608..80996b427 100644
--- a/_locales/no/messages.json
+++ b/_locales/no/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Er du sikker på at du vil laste ned medier sendt av $name$?",
   "pinConversation": "Fest samtale",
   "unpinConversation": "Løsne samtale",
-  "pinConversationLimitTitle": "Begresning på festede samtaler",
-  "pinConversationLimitToastDescription": "Du kan kun feste $number$ samtaler",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sender gjenopprettelsesfrase",
   "sendRecoveryPhraseMessage": "Du forsøker å sende gjenopprettelsesfrasen din, som kan brukes til å få tilgang til kontoen din. Er du sikker på at du vil sende denne beskjeden?",
diff --git a/_locales/pa/messages.json b/_locales/pa/messages.json
index 36afed075..cfaf4cb5d 100644
--- a/_locales/pa/messages.json
+++ b/_locales/pa/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
index f1b1dc4a6..aa1632c79 100644
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Czy na pewno chcesz pobrać multimedia wysłane przez $name$?",
   "pinConversation": "Przypnij konwersację",
   "unpinConversation": "Odepnij konwersację",
-  "pinConversationLimitTitle": "Limit przypiętych konwersacji",
-  "pinConversationLimitToastDescription": "Możesz przypiąć tylko $number$ konwersacji",
   "showUserDetails": "Pokaż szczegóły użytkownika",
   "sendRecoveryPhraseTitle": "Wysyłanie frazy odzyskiwania",
   "sendRecoveryPhraseMessage": "Próbujesz wysłać frazę odzyskiwania, która może być użyta do uzyskania dostępu do twojego konta. Czy na pewno chcesz wysłać tę wiadomość?",
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index 9693d6317..cd329451e 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Tem certeza de que deseja baixar a mídia enviada por $name$?",
   "pinConversation": "Fixar conversa",
   "unpinConversation": "Desafixar conversa",
-  "pinConversationLimitTitle": "Limite de conversas fixadas",
-  "pinConversationLimitToastDescription": "Você só pode fixar $number$ conversas",
   "showUserDetails": "Mostrar Detalhes do Usuário",
   "sendRecoveryPhraseTitle": "Enviando frase de recuperação",
   "sendRecoveryPhraseMessage": "Tu estás tentando enviar a tua frase de recuperação qual pode ser utilizada para acessar a tua conta. Tu tens certeza de que queres enviar esta mensagem?",
diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json
index 620c1261c..138fc8587 100644
--- a/_locales/pt_PT/messages.json
+++ b/_locales/pt_PT/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json
index 11bdcd664..fe080a8a9 100644
--- a/_locales/ro/messages.json
+++ b/_locales/ro/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Ești sigur că vrei să descarci fișiere multimedia trimise de $name$?",
   "pinConversation": "Fixare conversație",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Arată detaliile utilizatorului",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 11754ae24..6aae3ed0a 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Вы уверены, что хотите загрузить медиафайлы, присланные $name$?",
   "pinConversation": "Закрепить беседу",
   "unpinConversation": "Открепить беседу",
-  "pinConversationLimitTitle": "Лимит закрепленных бесед",
-  "pinConversationLimitToastDescription": "Вы можете закрепить только $number$ бесед",
   "showUserDetails": "Показывать Сведения о Пользователе",
   "sendRecoveryPhraseTitle": "Отправка секретной фразы",
   "sendRecoveryPhraseMessage": "Вы пытаетесь отправить вашу секретную фразу, которая может быть использована для доступа к вашей учетной записи. Вы уверены, что хотите отправить это сообщение?",
diff --git a/_locales/si/messages.json b/_locales/si/messages.json
index 8f6eb8172..6c26719e9 100644
--- a/_locales/si/messages.json
+++ b/_locales/si/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "ඔබට $name$ එවන ලද මාධ්‍යය බාගැනීමට අවශ්‍ය බව විශ්වාසද?",
   "pinConversation": "පින් සංවාදය",
   "unpinConversation": "සංවාදය ඉවත් කරන්න",
-  "pinConversationLimitTitle": "අමුණන ලද සංවාද සීමාව",
-  "pinConversationLimitToastDescription": "ඔබට ඇමුණුම් කළ හැක්කේ සංවාද $number$ ක් පමණි",
   "showUserDetails": "පරිශීලක විස්තර පෙන්වන්න",
   "sendRecoveryPhraseTitle": "ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය යැවීම",
   "sendRecoveryPhraseMessage": "ඔබ ඔබේ ගිණුමට ප්‍රවේශ වීමට භාවිත කළ හැකි ඔබේ ප්‍රතිසාධන වාක්‍ය ඛණ්ඩය යැවීමට උත්සාහ කරයි. ඔබට මෙම පණිවිඩය යැවීමට අවශ්‍ය බව විශ්වාසද?",
diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json
index 2a2deccf9..ed8cb55a1 100644
--- a/_locales/sk/messages.json
+++ b/_locales/sk/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Ste si istí že chcete stiahnuť média poslané od $name$?",
   "pinConversation": "Pripnúť Konverzáciu",
   "unpinConversation": "Odopnúť Konverzáciu",
-  "pinConversationLimitTitle": "Limit pripnutých konverzácií",
-  "pinConversationLimitToastDescription": "Môžete pripnúť iba $number$ konverzácii",
   "showUserDetails": "Zobraziť Detaily Používateľa",
   "sendRecoveryPhraseTitle": "Posielanie Obnovovacej Frázy",
   "sendRecoveryPhraseMessage": "Pokúšate sa poslať vašu obnovovaciu frázu ktorá môže byť použítá na prístup k Vášmu účtu. Ste si istí že chcete poslať túto správu?",
diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json
index 1143b809a..c4e308b6e 100644
--- a/_locales/sl/messages.json
+++ b/_locales/sl/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json
index 4542f79e2..b74c32a71 100644
--- a/_locales/sq/messages.json
+++ b/_locales/sq/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index db1a6ba1f..2196ea78b 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Da li ste sigurni da želite da preuzmete medije koje šalje $name$?",
   "pinConversation": "Zalepi konverzaciju na vrh",
   "unpinConversation": "Otkači konverzaciju sa vrha",
-  "pinConversationLimitTitle": "Limit zalepljenih konverzacija",
-  "pinConversationLimitToastDescription": "Možete zalepiti najviše $number$ konverzacija",
   "showUserDetails": "Pokaži detalje korisnika",
   "sendRecoveryPhraseTitle": "Slanje fraze za oporavak",
   "sendRecoveryPhraseMessage": "Pokušavate da pošaljete svoju frazu za oporavak koja se može koristiti za pristup vašem nalogu. Jeste li sigurni da želite poslati ovu poruku?",
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index 1388a43fd..026dfaedd 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Är du säker du vill hämta media skickat av $name$?",
   "pinConversation": "Fäst konversation",
   "unpinConversation": "Lossa konversation",
-  "pinConversationLimitTitle": "Gräns för fästa konversationer",
-  "pinConversationLimitToastDescription": "Du kan bara fästa $number$ konversationer",
   "showUserDetails": "Visa användardetaljer",
   "sendRecoveryPhraseTitle": "Skickar återställningsfras",
   "sendRecoveryPhraseMessage": "Du försöker skicka din återställningsfras som kan användas för att komma åt ditt konto. Är du säker på att du vill skicka detta meddelande?",
diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json
index 204db0de0..6787a28aa 100644
--- a/_locales/ta/messages.json
+++ b/_locales/ta/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/th/messages.json b/_locales/th/messages.json
index b42c7b98f..57161fc31 100644
--- a/_locales/th/messages.json
+++ b/_locales/th/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index f7ec24fcc..f6b6ae18c 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "$name$ tarafından gönderilen medyayı indirmek istediğine emin misin?",
   "pinConversation": "Konuşmayı sabitle",
   "unpinConversation": "Konuşmanın Sabitlemesini Kaldır",
-  "pinConversationLimitTitle": "Sabitlenmiş konuşmalalimiti",
-  "pinConversationLimitToastDescription": "Yalnızca $number$ ileti dizisini sabitleyebilirsiniz",
   "showUserDetails": "Kullanıcı Detaylarını Göster",
   "sendRecoveryPhraseTitle": "Kurtarma Sözcük Grubunu Gönder",
   "sendRecoveryPhraseMessage": "Hesabınıza erişmek için kullanılabilecek kurtarma ifadenizi göndermeye çalışıyorsunuz. Bu mesajı göndermek istediğinizden emin misiniz?",
diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json
index 1a2814973..09cbfee18 100644
--- a/_locales/uk/messages.json
+++ b/_locales/uk/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Ви впевнені що хочете завантажити медіафайл відправлений $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Показати деталі користувача",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/uz/messages.json b/_locales/uz/messages.json
index 7edc18fb8..118e338b9 100644
--- a/_locales/uz/messages.json
+++ b/_locales/uz/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",
diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json
index 01156f60e..13a10e794 100644
--- a/_locales/vi/messages.json
+++ b/_locales/vi/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Bạn có chắc bạn muốn tải tệp đa phương tiện gửi bởi $name$?",
   "pinConversation": "Ghim cuộc trò chuyện",
   "unpinConversation": "Bỏ ghim cuộc trò chuyện",
-  "pinConversationLimitTitle": "Giới hạn các cuộc trò chuyện đã ghim",
-  "pinConversationLimitToastDescription": "Bạn chỉ có thể ghim $number$ cuộc trò chuyện",
   "showUserDetails": "Hiện thông tin người dùng",
   "sendRecoveryPhraseTitle": "Đang gửi vế phục hồi",
   "sendRecoveryPhraseMessage": "Bạn đang chuẩn bị gởi vế khôi phục của bạn dùng vào mục đích truy cập tài khoản của bạn. Bạn có chắc bạn muốn gửi tin nhắn này?",
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index ea69dc9ec..498344d99 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "您确定要下载$name$发送的媒体消息吗?",
   "pinConversation": "置顶对话",
   "unpinConversation": "取消置顶对话",
-  "pinConversationLimitTitle": "置顶对话上限",
-  "pinConversationLimitToastDescription": "你只能置顶 $number$ 个聊天",
   "showUserDetails": "显示用户信息",
   "sendRecoveryPhraseTitle": "正在发送恢复口令",
   "sendRecoveryPhraseMessage": "您正在尝试发送恢复口令，它能用来登录和访问您的账号。\n您确定要发送该消息吗？",
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index c4780bc01..256b037d3 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "您確定要下載從$name$傳送的媒體嗎？",
   "pinConversation": "置頂對話",
   "unpinConversation": "取消置頂",
-  "pinConversationLimitTitle": "置頂對話限額",
-  "pinConversationLimitToastDescription": "你只能置頂$number$個對話",
   "showUserDetails": "顯示使用者詳細資料",
   "sendRecoveryPhraseTitle": "正在傳送回復用字句",
   "sendRecoveryPhraseMessage": "您將傳送用來恢復您帳戶的回復用字句，您確定要傳送這個訊息嗎？",
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index f92ca61b1..6c0fc05cc 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -42,7 +42,6 @@ import {
   ConversationNotificationSettingType,
 } from '../../models/conversationAttributes';
 import { getConversationController } from '../../session/conversations';
-import { ToastUtils } from '../../session/utils';
 import {
   changeNickNameModal,
   updateConfirmModal,
@@ -50,15 +49,12 @@ import {
 } from '../../state/ducks/modalDialog';
 import { SectionType } from '../../state/ducks/section';
 import { hideMessageRequestBanner } from '../../state/ducks/userConfig';
-import { getNumberOfPinnedConversations } from '../../state/selectors/conversations';
 import { getFocusedSection } from '../../state/selectors/section';
 import { getTimerOptions } from '../../state/selectors/timerOptions';
 import { LocalizerKeys } from '../../types/LocalizerKeys';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { ContextConversationId } from '../leftpane/conversation-list-item/ConversationListItem';
 
-const maxNumberOfPinnedConversations = 5;
-
 function showTimerOptions(
   isPublic: boolean,
   isKickedFromGroup: boolean,
@@ -180,7 +176,6 @@ export const InviteContactMenuItem = (): JSX.Element | null => {
 export const PinConversationMenuItem = (): JSX.Element | null => {
   const conversationId = useContext(ContextConversationId);
   const isMessagesSection = useSelector(getFocusedSection) === SectionType.Message;
-  const nbOfAlreadyPinnedConvos = useSelector(getNumberOfPinnedConversations);
   const isRequest = useIsRequest(conversationId);
 
   if (isMessagesSection && !isRequest) {
@@ -188,15 +183,7 @@ export const PinConversationMenuItem = (): JSX.Element | null => {
     const isPinned = conversation?.isPinned() || false;
 
     const togglePinConversation = async () => {
-      if ((!isPinned && nbOfAlreadyPinnedConvos < maxNumberOfPinnedConversations) || isPinned) {
-        await conversation?.setIsPinned(!isPinned);
-      } else {
-        ToastUtils.pushToastWarning(
-          'pinConversationLimitToast',
-          window.i18n('pinConversationLimitTitle'),
-          window.i18n('pinConversationLimitToastDescription', [`${maxNumberOfPinnedConversations}`])
-        );
-      }
+      await conversation?.setIsPinned(!isPinned);
     };
 
     const menuText = isPinned ? window.i18n('unpinConversation') : window.i18n('pinConversation');
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 73d3be41e..fd2fe7f21 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1514,6 +1514,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     details: {
       admins?: Array<string>;
       image_id?: number;
+      name?: string;
       moderators?: Array<string>;
       hidden_admins?: Array<string>;
       hidden_moderators?: Array<string>;
@@ -1562,6 +1563,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       type: 'mods',
     });
 
+    if (details.name && details.name !== this.getRealSessionUsername()) {
+      hasChange = hasChange || true;
+      this.setSessionDisplayNameNoCommit(details.name);
+    }
+
     hasChange = hasChange || modsChanged;
 
     if (this.isOpenGroupV2() && details.image_id && isNumber(details.image_id)) {
diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
index 54382a9c8..503cb0f76 100644
--- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts
@@ -139,6 +139,10 @@ export async function joinOpenGroupV2WithUIEvents(
     const alreadyExist = hasExistingOpenGroup(parsedRoom.serverUrl, parsedRoom.roomId);
     const conversationID = getOpenGroupV2ConversationId(parsedRoom.serverUrl, parsedRoom.roomId);
     if (alreadyExist || getConversationController().get(conversationID)) {
+      const existingConvo = getConversationController().get(conversationID);
+      await existingConvo.setDidApproveMe(true, false);
+      await existingConvo.setIsApproved(true, false);
+      await existingConvo.commit();
       if (showToasts) {
         ToastUtils.pushToastError('publicChatExists', window.i18n('publicChatExists'));
       }
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
index 787d65d27..c6a6e4ac5 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts
@@ -197,6 +197,8 @@ export class OpenGroupManagerV2 {
         active_at: Date.now(),
         displayNameInProfile: room.roomName,
         isApproved: true,
+        didApproveMe: true,
+        isTrustedForAttachmentDownload: true, // we always trust attachments when sent to an opengroup
       });
       await conversation.commit();
 
diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
index a1aa8cf3e..00b0b1ca6 100644
--- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
+++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts
@@ -151,34 +151,43 @@ export function tryMatchBlindWithStandardKey(
   if (!blindedSessionId.startsWith(KeyPrefixType.blinded)) {
     throw new Error('blindedKey must be a blinded key (starting with 15)');
   }
-  // tslint:disable: no-bitwise
 
-  const sessionIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(standardSessionId).key);
-  const blindedIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(blindedSessionId).key);
-  const kBytes = generateBlindingFactor(serverPubKey, sodium);
+  // We don't want to stop iterating even if an error happens while looking for a blind/standard match.
+  // That's why we catch any errors and return false if it happens.
+  try {
+    // tslint:disable: no-bitwise
 
-  // From the session id (ignoring 05 prefix) we have two possible ed25519 pubkeys; the first is
-  // the positive(which is what Signal's XEd25519 conversion always uses)
+    const sessionIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(standardSessionId).key);
+    const blindedIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(blindedSessionId).key);
+    const kBytes = generateBlindingFactor(serverPubKey, sodium);
 
-  const inbin = from_hex(sessionIdNoPrefix);
-  // Note: The below method is code we have exposed from the  method within the Curve25519-js library
-  // rather than custom code we have written
-  const xEd25519Key = crypto_sign_curve25519_pk_to_ed25519(inbin);
+    // From the session id (ignoring 05 prefix) we have two possible ed25519 pubkeys; the first is
+    // the positive(which is what Signal's XEd25519 conversion always uses)
 
-  // Blind it:
-  const pk1 = combineKeys(kBytes, xEd25519Key, sodium);
-  //  For the negative, what we're going to get out of the above is simply the negative of pk1, so
-  // flip the sign bit to get pk2:
-  const pk2 = cloneDeep(pk1);
-  pk2[31] = pk1[31] ^ 0b1000_0000;
+    const inbin = from_hex(sessionIdNoPrefix);
+    // Note: The below method is code we have exposed from the method within the Curve25519-js library
+    // rather than custom code we have written
+    const xEd25519Key = crypto_sign_curve25519_pk_to_ed25519(inbin);
 
-  const match = isEqual(blindedIdNoPrefix, to_hex(pk1)) || isEqual(blindedIdNoPrefix, to_hex(pk2));
+    // Blind it:
+    const pk1 = combineKeys(kBytes, xEd25519Key, sodium);
+    //  For the negative, what we're going to get out of the above is simply the negative of pk1, so
+    // flip the sign bit to get pk2:
+    const pk2 = cloneDeep(pk1);
+    pk2[31] = pk1[31] ^ 0b1000_0000;
 
-  if (!match) {
+    const match =
+      isEqual(blindedIdNoPrefix, to_hex(pk1)) || isEqual(blindedIdNoPrefix, to_hex(pk2));
+
+    if (!match) {
+      return false;
+    }
+
+    return true;
+  } catch (e) {
+    window.log.warn('Failed to do crypto tryMatchBlindWithStandardKey with ', e.message);
     return false;
   }
-
-  return true;
 }
 
 /**
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
index c8e8ce1dc..dbaa248de 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts
@@ -77,6 +77,7 @@ async function handlePollInfoResponse(
     details: {
       admins?: Array<string>;
       image_id: number;
+      name?: string;
       moderators?: Array<string>;
       hidden_admins?: Array<string>;
       hidden_moderators?: Array<string>;
@@ -122,7 +123,8 @@ async function handlePollInfoResponse(
       'image_id',
       'moderators',
       'hidden_admins',
-      'hidden_moderators'
+      'hidden_moderators',
+      'name'
     ),
   });
 }
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index f3b1c0b3c..7cd8101ce 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -411,14 +411,6 @@ export const _getSortedConversations = (
       };
     }
 
-    // Add Open Group to list as soon as the name has been set
-    if (
-      conversation.isPublic &&
-      (!conversation.displayNameInProfile || conversation.displayNameInProfile === 'Unknown group')
-    ) {
-      continue;
-    }
-
     // Remove all invalid conversations and conversatons of devices associated
     //  with cancelled attempted links
     if (!conversation.isPublic && !conversation.activeAt) {
diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts
index d004aa636..a8dd4f414 100644
--- a/ts/types/LocalizerKeys.ts
+++ b/ts/types/LocalizerKeys.ts
@@ -91,7 +91,6 @@ export type LocalizerKeys =
   | 'join'
   | 'dialogClearAllDataDeletionFailedMultiple'
   | 'clearAllReactions'
-  | 'pinConversationLimitToastDescription'
   | 'appMenuQuit'
   | 'windowMenuZoom'
   | 'allUsersAreRandomly...'
@@ -328,7 +327,6 @@ export type LocalizerKeys =
   | 'invalidGroupNameTooShort'
   | 'notificationForConvo'
   | 'noNameOrMessage'
-  | 'pinConversationLimitTitle'
   | 'classicLightThemeTitle'
   | 'noSearchResults'
   | 'reactionPopup'