diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index 3ab41344..58d5c77f 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -744,6 +744,38 @@ class ChatViewModel(
         return verificationHandler.beginQRVerification(qr)
     }
 
+    // MARK: - Debug and Troubleshooting
+    
+    fun getDebugStatus(): String {
+        return meshService.getDebugStatus()
+    }
+    
+    fun setAppBackgroundState(inBackground: Boolean) {
+        notificationManager.setAppBackgroundState(inBackground)
+    }
+    
+    fun setCurrentPrivateChatPeer(peerID: String?) {
+        notificationManager.setCurrentPrivateChatPeer(peerID)
+    }
+    
+    fun setCurrentGeohash(geohash: String?) {
+        notificationManager.setCurrentGeohash(geohash)
+    }
+
+    fun clearNotificationsForSender(peerID: String) {
+        notificationManager.clearNotificationsForSender(peerID)
+    }
+    
+    fun clearNotificationsForGeohash(geohash: String) {
+        notificationManager.clearNotificationsForGeohash(geohash)
+    }
+
+    fun clearMeshMentionNotifications() {
+        notificationManager.clearMeshMentionNotifications()
+    }
+
+    private var reopenSidebarAfterVerification = false
+
     fun showVerificationSheet(fromSidebar: Boolean = false) {
         if (fromSidebar) {
             reopenSidebarAfterVerification = true
@@ -1061,8 +1093,6 @@ class ChatViewModel(
      */
     fun colorForNostrPubkey(pubkeyHex: String, isDark: Boolean): androidx.compose.ui.graphics.Color {
         return geohashViewModel.colorForNostrPubkey(pubkeyHex, isDark)
-    }
-
 }
 
 }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 56fbeee8..7ddae251 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 0a243e78..24f94630 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5991ac75..c02bbb37 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Aus Favoriten entfernen</string>
     <string name="cd_add_bookmark">Lesezeichen hinzufügen</string>
 
-    <!-- Chat‑Kopf & Barrierefreiheit -->
+    <!-- Chat‑Kopf &amp; Barrierefreiheit -->
     <string name="chat_back">zurück</string>
     <string name="chat_channel_prefix">Kanal: %1$s</string>
     <string name="chat_leave">verlassen</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Online‑Geohash‑Kanäle</string>
     <string name="cd_end_to_end_encryption">Ende‑zu‑Ende‑Verschlüsselung</string>
 
-    <!-- Bilder & Dateien -->
+    <!-- Bilder &amp; Dateien -->
     <string name="image_page_of">Bild %1$d von %2$d</string>
     <string name="image_unavailable">Bild nicht verfügbar</string>
     <string name="image_saved_to_downloads">Bild in "Downloads" gespeichert</string>
@@ -382,7 +382,7 @@
   <string name="fingerprint_yours">dein fingerabdruck</string>
   <string name="fingerprint_pending">handshake ausstehend</string>
   <string name="fingerprint_no_peer">privatchat öffnen</string>
-  <string name="fingerprint_status_verified">verschlüsselt & verifiziert</string>
+  <string name="fingerprint_status_verified">verschlüsselt &amp; verifiziert</string>
   <string name="fingerprint_status_encrypted">verschlüsselt</string>
   <string name="fingerprint_status_handshaking">handshake</string>
   <string name="fingerprint_status_failed">handshake fehlgeschlagen</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 99526f32..1473c5fd 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 74aa8bd3..0a7dc2e3 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1ae7ac60..01f480d2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Retirer des favoris</string>
     <string name="cd_add_bookmark">Ajouter un signet</string>
 
-    <!-- En‑tête de chat & accessibilité -->
+    <!-- En‑tête de chat &amp; accessibilité -->
     <string name="chat_back">retour</string>
     <string name="chat_channel_prefix">canal : %1$s</string>
     <string name="chat_leave">quitter</string>
@@ -165,7 +165,7 @@
     <string name="cd_online_geohash_channels">Canaux Geohash en ligne</string>
     <string name="cd_end_to_end_encryption">Chiffrement de bout en bout</string>
 
-    <!-- Images & fichiers -->
+    <!-- Images &amp; fichiers -->
     <string name="image_page_of">Image %1$d sur %2$d</string>
     <string name="image_unavailable">Image indisponible</string>
     <string name="image_saved_to_downloads">Image enregistrée dans "Téléchargements"</string>
@@ -395,7 +395,7 @@
   <string name="fingerprint_yours">votre empreinte</string>
   <string name="fingerprint_pending">négociation en cours</string>
   <string name="fingerprint_no_peer">ouvrir un chat privé</string>
-  <string name="fingerprint_status_verified">chiffré & vérifié</string>
+  <string name="fingerprint_status_verified">chiffré &amp; vérifié</string>
   <string name="fingerprint_status_encrypted">chiffré</string>
   <string name="fingerprint_status_handshaking">négociation</string>
   <string name="fingerprint_status_failed">échec négociation</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index eb5b7503..deb22711 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -33,7 +33,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index a81bac0e..acaa54b6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">पसंदीदा से हटाएँ</string>
     <string name="cd_add_bookmark">बुकमार्क जोड़ें</string>
 
-    <!-- चैट हेडर & एक्सेसिबिलिटी -->
+    <!-- चैट हेडर &amp; एक्सेसिबिलिटी -->
     <string name="chat_back">वापस</string>
     <string name="chat_channel_prefix">चैनल: %1$s</string>
     <string name="chat_leave">छोड़ें</string>
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 97f90728..18c85a5b 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Hapus dari favorit</string>
     <string name="cd_add_bookmark">Tambah bookmark</string>
 
-    <!-- Header chat & aksesibilitas -->
+    <!-- Header chat &amp; aksesibilitas -->
     <string name="chat_back">kembali</string>
     <string name="chat_channel_prefix">Channel: %1$s</string>
     <string name="chat_leave">keluar</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Channel Geohash Online</string>
     <string name="cd_end_to_end_encryption">Enkripsi end-to-end</string>
 
-    <!-- Gambar & file -->
+    <!-- Gambar &amp; file -->
     <string name="image_page_of">Gambar %1$d dari %2$d</string>
     <string name="image_unavailable">Gambar tidak tersedia</string>
     <string name="image_saved_to_downloads">Gambar disimpan ke \"Downloads\"</string>
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 175bf521..07fb5a76 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -415,7 +415,7 @@
   <string name="fingerprint_yours">tua impronta</string>
   <string name="fingerprint_pending">handshake in corso</string>
   <string name="fingerprint_no_peer">apri chat privata</string>
-  <string name="fingerprint_status_verified">criptato & verificato</string>
+  <string name="fingerprint_status_verified">criptato &amp; verificato</string>
   <string name="fingerprint_status_encrypted">criptato</string>
   <string name="fingerprint_status_handshaking">handshake</string>
   <string name="fingerprint_status_failed">handshake fallito</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 00222907..f9c4fd64 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">お気に入りから削除</string>
     <string name="cd_add_bookmark">ブックマークに追加</string>
 
-    <!-- チャットヘッダー & アクセシビリティ -->
+    <!-- チャットヘッダー &amp; アクセシビリティ -->
     <string name="chat_back">戻る</string>
     <string name="chat_channel_prefix">チャンネル: %1$s</string>
     <string name="chat_leave">退出</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">オンライン Geohash チャンネル</string>
     <string name="cd_end_to_end_encryption">エンドツーエンド暗号化</string>
 
-    <!-- 画像 & ファイル -->
+    <!-- 画像 &amp; ファイル -->
     <string name="image_page_of">画像 %1$d / %2$d</string>
     <string name="image_unavailable">画像は利用できません</string>
     <string name="image_saved_to_downloads">画像を「ダウンロード」に保存しました</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index c0251a52..db24c8a9 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">რჩეულებიდან წაშლა</string>
     <string name="cd_add_bookmark">სანიშნეს დამატება</string>
 
-    <!-- ჩათის სათაური & ხელმისაწვდომობა -->
+    <!-- ჩათის სათაური &amp; ხელმისაწვდომობა -->
     <string name="chat_back">უკან</string>
     <string name="chat_channel_prefix">არხი: %1$s</string>
     <string name="chat_leave">გასვლა</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">ონლაინ geohash არხები</string>
     <string name="cd_end_to_end_encryption">ბოლო-მდე დაშიფვრა</string>
 
-    <!-- სურათები & ფაილები -->
+    <!-- სურათები &amp; ფაილები -->
     <string name="image_page_of">სურათი %1$d %2$d-დან</string>
     <string name="image_unavailable">სურათი მიუწვდომელია</string>
     <string name="image_saved_to_downloads">სურათი შენახულია "ჩამოტვირთვებში"</string>
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d93c8eec..0510fb7d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">즐겨찾기에서 제거</string>
     <string name="cd_add_bookmark">북마크 추가</string>
 
-    <!-- 채팅 헤더 & 접근성 -->
+    <!-- 채팅 헤더 &amp; 접근성 -->
     <string name="chat_back">뒤로</string>
     <string name="chat_channel_prefix">채널: %1$s</string>
     <string name="chat_leave">나가기</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">온라인 geohash 채널</string>
     <string name="cd_end_to_end_encryption">종단간 암호화</string>
 
-    <!-- 이미지 & 파일 -->
+    <!-- 이미지 &amp; 파일 -->
     <string name="image_page_of">이미지 %1$d / %2$d</string>
     <string name="image_unavailable">이미지를 사용할 수 없음</string>
     <string name="image_saved_to_downloads">이미지가 \"Downloads\"에 저장됨</string>
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-mg/strings.xml b/app/src/main/res/values-mg/strings.xml
index f945c9eb..5fc53577 100644
--- a/app/src/main/res/values-mg/strings.xml
+++ b/app/src/main/res/values-mg/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Hanesorana amin\'ny ankafizina</string>
     <string name="cd_add_bookmark">Hanampy bookmark</string>
 
-    <!-- Lohan\'ny resaka & fahafaha-miditra -->
+    <!-- Lohan\'ny resaka &amp; fahafaha-miditra -->
     <string name="chat_back">miverina</string>
     <string name="chat_channel_prefix">fantsona: %1$s</string>
     <string name="chat_leave">hiala</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Fantsona Geohash an-tserasera</string>
     <string name="cd_end_to_end_encryption">Fandokoana Farany amin\'ny Farany</string>
 
-    <!-- Sary & rakitra -->
+    <!-- Sary &amp; rakitra -->
     <string name="image_page_of">Sary %1$d amin\'ny %2$d</string>
     <string name="image_unavailable">Tsy misy sary</string>
     <string name="image_saved_to_downloads">Sary voatahiry ao amin\'ny Downloads</string>
@@ -395,7 +395,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index eeba16dd..0e6dd945 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -20,7 +20,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index 3f78683d..6632f0dc 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5b88aedb..7d19b52a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Verwijderen uit favorieten</string>
     <string name="cd_add_bookmark">Bladwijzer toevoegen</string>
 
-    <!-- Chatkop & toegankelijkheid -->
+    <!-- Chatkop &amp; toegankelijkheid -->
     <string name="chat_back">terug</string>
     <string name="chat_channel_prefix">kanaal: %1$s</string>
     <string name="chat_leave">verlaten</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Online geohash-kanalen</string>
     <string name="cd_end_to_end_encryption">End-to-end-versleuteling</string>
 
-    <!-- Afbeeldingen & bestanden -->
+    <!-- Afbeeldingen &amp; bestanden -->
     <string name="image_page_of">Afbeelding %1$d van %2$d</string>
     <string name="image_unavailable">Afbeelding niet beschikbaar</string>
     <string name="image_saved_to_downloads">Afbeelding opgeslagen in Downloads</string>
@@ -338,7 +338,7 @@
     <string name="join">Deelnemen</string>
     <string name="cancel">Annuleren</string>
 
-    <!-- Symbolen & speciale strings -->
+    <!-- Symbolen &amp; speciale strings -->
     <string name="at_symbol">@</string>
     <string name="app_brand">bitchat/</string>
     <string name="channel_count_prefix"> · ⧉ </string>
@@ -413,7 +413,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 55bf16b4..3f08aa32 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">پسندیدہ توں ہٹاؤ</string>
     <string name="cd_add_bookmark">بُک مارک پاؤ</string>
 
-    <!-- چیٹ ہیڈر & رسائی پذیری -->
+    <!-- چیٹ ہیڈر &amp; رسائی پذیری -->
     <string name="chat_back">واپس</string>
     <string name="chat_channel_prefix">چینل: %1$s</string>
     <string name="chat_leave">باہر آؤ</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">آن لائن geohash چینل</string>
     <string name="cd_end_to_end_encryption">اینڈ ٹو اینڈ انکرپشن</string>
 
-    <!-- تصویراں & فائلز -->
+    <!-- تصویراں &amp; فائلز -->
     <string name="image_page_of">تصویر %1$d وچوں %2$d</string>
     <string name="image_unavailable">تصویر دستیاب نئیں</string>
     <string name="image_saved_to_downloads">تصویر \"Downloads\" وچ سیو ہو گئی</string>
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7ea11c7b..56cd087a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -33,7 +33,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 004bd340..e9686f99 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Remover dos favoritos</string>
     <string name="cd_add_bookmark">Adicionar favorito</string>
 
-    <!-- Cabeçalho do chat & acessibilidade -->
+    <!-- Cabeçalho do chat &amp; acessibilidade -->
     <string name="chat_back">voltar</string>
     <string name="chat_channel_prefix">Canal: %1$s</string>
     <string name="chat_leave">sair</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Canais geohash online</string>
     <string name="cd_end_to_end_encryption">Criptografia de ponta a ponta</string>
 
-    <!-- Imagens & arquivos -->
+    <!-- Imagens &amp; arquivos -->
     <string name="image_page_of">Imagem %1$d de %2$d</string>
     <string name="image_unavailable">Imagem indisponível</string>
     <string name="image_saved_to_downloads">Imagem salva em "Downloads"</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 56cb768d..ef3307e3 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -369,7 +369,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 1292e355..98ceef9c 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -20,7 +20,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 83e59391..343f6885 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">เอาออกจากรายการโปรด</string>
     <string name="cd_add_bookmark">เพิ่มที่คั่นหน้า</string>
 
-    <!-- ส่วนหัวแชท & การช่วยสำหรับการเข้าถึง -->
+    <!-- ส่วนหัวแชท &amp; การช่วยสำหรับการเข้าถึง -->
     <string name="chat_back">กลับ</string>
     <string name="chat_channel_prefix">ช่อง: %1$s</string>
     <string name="chat_leave">ออก</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">ช่อง geohash ออนไลน์</string>
     <string name="cd_end_to_end_encryption">การเข้ารหัสแบบปลายทางถึงปลายทาง</string>
 
-    <!-- รูปภาพ & ไฟล์ -->
+    <!-- รูปภาพ &amp; ไฟล์ -->
     <string name="image_page_of">รูปภาพ %1$d จาก %2$d</string>
     <string name="image_unavailable">ไม่สามารถใช้รูปภาพได้</string>
     <string name="image_saved_to_downloads">บันทึกรูปภาพไว้ใน "ดาวน์โหลด" แล้ว</string>
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 289525b3..1209074c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -369,7 +369,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a1d385da..5545b546 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -20,7 +20,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index ef21c423..1626a041 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -381,7 +381,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 09fb2b19..afc227b6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -70,7 +70,7 @@
     <string name="cd_remove_favorite">Xóa khỏi yêu thích</string>
     <string name="cd_add_bookmark">Thêm bookmark</string>
 
-    <!-- Header trò chuyện & khả năng truy cập -->
+    <!-- Header trò chuyện &amp; khả năng truy cập -->
     <string name="chat_back">quay lại</string>
     <string name="chat_channel_prefix">Kênh: %1$s</string>
     <string name="chat_leave">rời khỏi</string>
@@ -170,7 +170,7 @@
     <string name="cd_online_geohash_channels">Kênh Geohash trực tuyến</string>
     <string name="cd_end_to_end_encryption">Mã hóa đầu cuối</string>
 
-    <!-- Hình ảnh & file -->
+    <!-- Hình ảnh &amp; file -->
     <string name="image_page_of">Hình ảnh %1$d trong %2$d</string>
     <string name="image_unavailable">Hình ảnh không có sẵn</string>
     <string name="image_saved_to_downloads">Hình ảnh đã lưu vào \"Downloads\"</string>
@@ -368,7 +368,7 @@
   <string name="fingerprint_yours">your fingerprint</string>
   <string name="fingerprint_pending">handshake pending</string>
   <string name="fingerprint_no_peer">open a private chat to view fingerprints</string>
-  <string name="fingerprint_status_verified">encrypted & verified</string>
+  <string name="fingerprint_status_verified">encrypted &amp; verified</string>
   <string name="fingerprint_status_encrypted">encrypted</string>
   <string name="fingerprint_status_handshaking">handshaking</string>
   <string name="fingerprint_status_failed">handshake failed</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9b2fced..6fe23b49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,7 +71,7 @@
   <string name="cd_remove_favorite">Remove from favorites</string>
   <string name="cd_add_bookmark">Add bookmark</string>
 
-  <!-- Chat header & accessibility -->
+  <!-- Chat header &amp; accessibility -->
   <string name="chat_back">back</string>
   <string name="chat_channel_prefix">channel: %1$s</string>
   <string name="chat_leave">leave</string>