diff --git a/README.md b/README.md
index 4cd7b2b787..28b40d0c1b 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,8 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
+[Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
+
 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
 
 [Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
@@ -377,8 +379,9 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Using mobile profiles from the desktop app.
 - ✅ Private notes.
 - ✅ Improve sending videos (including encryption of locally stored videos).
+- ✅ Post-quantum resistant key exchange in double ratchet protocol.
+- 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
-- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
 - 🏗 Large groups, communities and public channels.
 - 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift
index 365f23c33e..a099069f77 100644
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -21,6 +21,8 @@ public let CURRENT_CHAT_VERSION: Int = 2
 // version range that supports establishing direct connection with a group member (xGrpDirectInvVRange in core)
 public let CREATE_MEMBER_CONTACT_VRANGE = VersionRange(minVersion: 2, maxVersion: CURRENT_CHAT_VERSION)
 
+private let networkStatusesLock = DispatchQueue(label: "chat.simplex.app.network-statuses.lock")
+
 enum TerminalItem: Identifiable {
     case cmd(Date, ChatCommand)
     case resp(Date, ChatResponse)
@@ -1566,34 +1568,30 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(mergedContact.id)
             }
         }
-    case let .contactsSubscribed(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .connected)
-    case let .contactsDisconnected(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .disconnected)
-    case let .contactSubSummary(_, contactSubscriptions):
-        await MainActor.run {
-            for sub in contactSubscriptions {
-// no need to update contact here, and it is slow
-//                if active(user) {
-//                    m.updateContact(sub.contact)
-//                }
-                if let err = sub.contactError {
-                    processContactSubError(sub.contact, err)
-                } else {
-                    m.setContactNetworkStatus(sub.contact, .connected)
-                }
-            }
-        }
     case let .networkStatus(status, connections):
-        await MainActor.run {
+        // dispatch queue to synchronize access
+        networkStatusesLock.sync {
+            var ns = m.networkStatuses
+            // slow loop is on the background thread
             for cId in connections {
-                m.networkStatuses[cId] = status
+                ns[cId] = status
+            }
+            // fast model update is on the main thread
+            DispatchQueue.main.sync {
+                m.networkStatuses = ns
             }
         }
     case let .networkStatuses(_, statuses): ()
-        await MainActor.run {
+        // dispatch queue to synchronize access
+        networkStatusesLock.sync {
+            var ns = m.networkStatuses
+            // slow loop is on the background thread
             for s in statuses {
-                m.networkStatuses[s.agentConnId] = s.networkStatus
+                ns[s.agentConnId] = s.networkStatus
+            }
+            // fast model update is on the main thread
+            DispatchQueue.main.sync {
+                m.networkStatuses = ns
             }
         }
     case let .newChatItem(user, aChatItem):
@@ -1944,26 +1942,6 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     }
 }
 
-func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
-    let m = ChatModel.shared
-    await MainActor.run {
-        for c in contactRefs {
-            m.networkStatuses[c.agentConnId] = status
-        }
-    }
-}
-
-func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
-    let m = ChatModel.shared
-    var err: String
-    switch chatError {
-    case .errorAgent(agentError: .BROKER(_, .NETWORK)): err = "network"
-    case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
-    default: err = String(describing: chatError)
-    }
-    m.setContactNetworkStatus(contact, .error(connectionError: err))
-}
-
 func refreshCallInvitations() throws {
     let m = ChatModel.shared
     let callInvitations = try justRefreshCallInvitations()
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
index c3e4805bf3..16974147c8 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
@@ -70,14 +70,14 @@ struct CIImageView: View {
     }
 
     private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : img.imageData == nil ? .infinity : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
         DispatchQueue.main.async { imgWidth = w }
         return ZStack(alignment: .topTrailing) {
             if img.imageData == nil {
                 Image(uiImage: img)
                         .resizable()
                         .scaledToFit()
-                        .frame(maxWidth: w)
+                        .frame(width: w)
             } else {
                 SwiftyGif(image: img)
                         .frame(width: w, height: w * img.size.height / img.size.width)
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
index ff208fe58a..a3918e17bc 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
@@ -243,13 +243,13 @@ struct CIVideoView: View {
     }
 
     private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : .infinity
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
         DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             Image(uiImage: img)
             .resizable()
             .scaledToFit()
-            .frame(maxWidth: w)
+            .frame(width: w)
             loadingIndicator()
         }
     }
diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift
index 468027ec8a..cd2aa55bc3 100644
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -17,6 +17,7 @@ struct ChatView: View {
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.dismiss) var dismiss
     @Environment(\.presentationMode) var presentationMode
+    @Environment(\.scenePhase) var scenePhase
     @State @ObservedObject var chat: Chat
     @State private var showChatInfoSheet: Bool = false
     @State private var showAddMembersSheet: Bool = false
@@ -234,7 +235,9 @@ struct ChatView: View {
 
     private func initChatView() {
         let cInfo = chat.chatInfo
-        if case let .direct(contact) = cInfo {
+        // This check prevents the call to apiContactInfo after the app is suspended, and the database is closed.
+        if case .active = scenePhase,
+           case let .direct(contact) = cInfo {
             Task {
                 do {
                     let (stats, _) = try await apiContactInfo(chat.chatInfo.apiId)
@@ -511,6 +514,7 @@ struct ChatView: View {
             chat: chat,
             chatItem: ci,
             maxWidth: maxWidth,
+            itemWidth: maxWidth,
             composeState: $composeState,
             selectedMember: $selectedMember,
             chatView: self
@@ -523,6 +527,7 @@ struct ChatView: View {
         @ObservedObject var chat: Chat
         var chatItem: ChatItem
         var maxWidth: CGFloat
+        @State var itemWidth: CGFloat
         @Binding var composeState: ComposeState
         @Binding var selectedMember: GMember?
         var chatView: ChatView
@@ -651,7 +656,7 @@ struct ChatView: View {
                     playbackState: $playbackState,
                     playbackTime: $playbackTime
                 )
-                .uiKitContextMenu(maxWidth: maxWidth, menu: uiMenu, allowMenu: $allowMenu)
+                .uiKitContextMenu(hasImageOrVideo: ci.content.msgContent?.isImageOrVideo == true, maxWidth: maxWidth, itemWidth: $itemWidth, menu: uiMenu, allowMenu: $allowMenu)
                 .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                     chatItemReactions(ci)
diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index 741af6f08f..922fc84e53 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -12,6 +12,7 @@ private let fillColorLight = Color(uiColor: UIColor(red: 0.99, green: 0.99, blue
 struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.scenePhase) var scenePhase
     @Binding var showSettings: Bool
     @Binding var showConnectDesktop: Bool
     @Binding var userPickerVisible: Bool
@@ -91,7 +92,10 @@ struct UserPicker: View {
         .opacity(userPickerVisible ? 1.0 : 0.0)
         .onAppear {
             do {
-                m.users = try listUsers()
+                // This check prevents the call of listUsers after the app is suspended, and the database is closed.
+                if case .active = scenePhase {
+                    m.users = try listUsers()
+                }
             } catch let error {
                 logger.error("Error loading users \(responseError(error))")
             }
diff --git a/apps/ios/Shared/Views/Helpers/ContextMenu.swift b/apps/ios/Shared/Views/Helpers/ContextMenu.swift
index 3b82d6eb95..9504d919ef 100644
--- a/apps/ios/Shared/Views/Helpers/ContextMenu.swift
+++ b/apps/ios/Shared/Views/Helpers/ContextMenu.swift
@@ -11,11 +11,20 @@ import UIKit
 import SwiftUI
 
 extension View {
-    func uiKitContextMenu(maxWidth: CGFloat, menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
+    func uiKitContextMenu(hasImageOrVideo: Bool, maxWidth: CGFloat, itemWidth: Binding<CGFloat>, menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
         Group {
             if allowMenu.wrappedValue {
-                InteractionView(content: self, maxWidth: maxWidth, menu: menu)
-                    .fixedSize(horizontal: true, vertical: false)
+                if hasImageOrVideo {
+                    InteractionView(content:
+                        self.environmentObject(ChatModel.shared)
+                        .overlay(DetermineWidthImageVideoItem())
+                        .onPreferenceChange(DetermineWidthImageVideoItem.Key.self) { itemWidth.wrappedValue = $0 == 0 ? maxWidth : $0 }
+                    , maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
+                    .frame(maxWidth: itemWidth.wrappedValue)
+                } else {
+                    InteractionView(content: self.environmentObject(ChatModel.shared), maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
+                        .fixedSize(horizontal: true, vertical: false)
+                }
             } else {
                 self
             }
@@ -31,13 +40,14 @@ private class HostingViewHolder: UIView {
 struct InteractionView<Content: View>: UIViewRepresentable {
     let content: Content
     var maxWidth: CGFloat
+    var itemWidth: Binding<CGFloat>
     @Binding var menu: UIMenu
 
     func makeUIView(context: Context) -> UIView {
         let view = HostingViewHolder()
-        view.contentSize = CGSizeMake(maxWidth, .infinity)
         view.backgroundColor = .clear
         let hostView = UIHostingController(rootView: content)
+        view.contentSize = hostView.view.intrinsicContentSize
         hostView.view.translatesAutoresizingMaskIntoConstraints = false
         let constraints = [
             hostView.view.topAnchor.constraint(equalTo: view.topAnchor),
@@ -57,7 +67,11 @@ struct InteractionView<Content: View>: UIViewRepresentable {
     }
 
     func updateUIView(_ uiView: UIView, context: Context) {
-        (uiView as! HostingViewHolder).contentSize = uiView.subviews[0].sizeThatFits(CGSizeMake(maxWidth, .infinity))
+        let was = (uiView as! HostingViewHolder).contentSize
+        (uiView as! HostingViewHolder).contentSize = uiView.subviews[0].sizeThatFits(CGSizeMake(itemWidth.wrappedValue, .infinity))
+        if was != (uiView as! HostingViewHolder).contentSize {
+            uiView.invalidateIntrinsicContentSize()
+        }
     }
 
     func makeCoordinator() -> Coordinator {
diff --git a/apps/ios/Shared/Views/Helpers/DetermineWidth.swift b/apps/ios/Shared/Views/Helpers/DetermineWidth.swift
index d2a0aaab1d..b05ab17089 100644
--- a/apps/ios/Shared/Views/Helpers/DetermineWidth.swift
+++ b/apps/ios/Shared/Views/Helpers/DetermineWidth.swift
@@ -21,6 +21,19 @@ struct DetermineWidth: View {
     }
 }
 
+struct DetermineWidthImageVideoItem: View {
+    typealias Key = MaximumWidthImageVideoPreferenceKey
+    var body: some View {
+        GeometryReader { proxy in
+            Color.clear
+                .preference(
+                    key: MaximumWidthImageVideoPreferenceKey.self,
+                    value: proxy.size.width
+                )
+        }
+    }
+}
+
 struct MaximumWidthPreferenceKey: PreferenceKey {
     static var defaultValue: CGFloat = 0
     static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
@@ -28,6 +41,13 @@ struct MaximumWidthPreferenceKey: PreferenceKey {
     }
 }
 
+struct MaximumWidthImageVideoPreferenceKey: PreferenceKey {
+    static var defaultValue: CGFloat = 0
+    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}
+
 struct DetermineWidth_Previews: PreviewProvider {
     static var previews: some View {
         DetermineWidth()
diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff
index f04880ee91..0f8bff18ea 100644
--- a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
+++ b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
@@ -631,6 +631,7 @@
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
         <source>Admins can block a member for all.</source>
+        <target>Администраторите могат да блокират член за всички.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -690,6 +691,7 @@
       </trans-unit>
       <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
         <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target>Всички ваши контакти, разговори и файлове ще бъдат сигурно криптирани и качени на парчета в конфигурираните XFTP релета.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow" xml:space="preserve">
@@ -819,6 +821,7 @@
       </trans-unit>
       <trans-unit id="App data migration" xml:space="preserve">
         <source>App data migration</source>
+        <target>Миграция на данните от приложението</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
@@ -858,14 +861,17 @@
       </trans-unit>
       <trans-unit id="Apply" xml:space="preserve">
         <source>Apply</source>
+        <target>Приложи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
+        <target>Архивиране и качване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
         <source>Archiving database</source>
+        <target>Архивиране на база данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Attach" xml:space="preserve">
@@ -1060,6 +1066,7 @@
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
+        <target>Отмени миграцията</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
@@ -1165,6 +1172,7 @@
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
         <source>Chat migrated!</source>
+        <target>Чатът е мигриран!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat preferences" xml:space="preserve">
@@ -1263,6 +1271,7 @@
       </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
+        <target>Потвърди мрежовите настройки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm new passphrase…" xml:space="preserve">
@@ -1277,10 +1286,12 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
+        <target>Потвърдете, че помните паролата на базата данни, преди да я мигрирате.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
         <source>Confirm upload</source>
+        <target>Потвърди качването</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
@@ -1544,6 +1555,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Creating archive link" xml:space="preserve">
         <source>Creating archive link</source>
+        <target>Създаване на архивен линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Creating link…" xml:space="preserve">
@@ -1768,6 +1780,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Delete database from this device" xml:space="preserve">
         <source>Delete database from this device</source>
+        <target>Изтриване на базата данни от това устройство</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete file" xml:space="preserve">
@@ -2062,6 +2075,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Download failed" xml:space="preserve">
         <source>Download failed</source>
+        <target>Неуспешно изтегляне</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Download file" xml:space="preserve">
@@ -2071,10 +2085,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Downloading archive" xml:space="preserve">
         <source>Downloading archive</source>
+        <target>Архива се изтегля</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downloading link details" xml:space="preserve">
         <source>Downloading link details</source>
+        <target>Подробности за линка се изтеглят</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Duplicate display name!" xml:space="preserve">
@@ -2134,6 +2150,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
         <source>Enable in direct chats (BETA)!</source>
+        <target>Активиране в личните чатове (БЕТА)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -2253,6 +2270,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter passphrase" xml:space="preserve">
         <source>Enter passphrase</source>
+        <target>Въведи парола</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
@@ -2317,6 +2335,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error allowing contact PQ encryption" xml:space="preserve">
         <source>Error allowing contact PQ encryption</source>
+        <target>Грешка при разрешаване на PQ криптиране за контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2411,6 +2430,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error downloading the archive" xml:space="preserve">
         <source>Error downloading the archive</source>
+        <target>Грешка при изтеглянето на архива</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
@@ -2490,6 +2510,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
         <source>Error saving settings</source>
+        <target>Грешка при запазване на настройките</target>
         <note>when migrating</note>
       </trans-unit>
       <trans-unit id="Error saving user password" xml:space="preserve">
@@ -2564,10 +2585,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error uploading the archive" xml:space="preserve">
         <source>Error uploading the archive</source>
+        <target>Грешка при качването на архива</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error verifying passphrase:" xml:space="preserve">
         <source>Error verifying passphrase:</source>
+        <target>Грешка при проверката на паролата:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: " xml:space="preserve">
@@ -2622,6 +2645,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Exported file doesn't exist" xml:space="preserve">
         <source>Exported file doesn't exist</source>
+        <target>Експортираният файл не съществува</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Exporting database archive…" xml:space="preserve">
@@ -2696,10 +2720,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Finalize migration" xml:space="preserve">
         <source>Finalize migration</source>
+        <target>Завърши миграцията</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finalize migration on another device." xml:space="preserve">
         <source>Finalize migration on another device.</source>
+        <target>Завършете миграцията на другото устройство.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2994,6 +3020,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Hungarian interface" xml:space="preserve">
         <source>Hungarian interface</source>
+        <target>Унгарски интерфейс</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="ICE servers (one per line)" xml:space="preserve">
@@ -3063,10 +3090,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Import failed" xml:space="preserve">
         <source>Import failed</source>
+        <target>Неуспешно импортиране</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Importing archive" xml:space="preserve">
         <source>Importing archive</source>
+        <target>Импортиране на архив</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -3086,6 +3115,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
         <source>In order to continue, chat should be stopped.</source>
+        <target>За да продължите, чатът трябва да бъде спрян.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
@@ -3202,6 +3232,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Invalid migration confirmation" xml:space="preserve">
         <source>Invalid migration confirmation</source>
+        <target>Невалидно потвърждение за мигриране</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid name!" xml:space="preserve">
@@ -3574,6 +3605,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message too large" xml:space="preserve">
         <source>Message too large</source>
+        <target>Съобщението е твърде голямо</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages" xml:space="preserve">
@@ -3601,26 +3633,32 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
         <source>Migrate device</source>
+        <target>Мигрирай устройството</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>Мигриране от друго устройство</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
         <source>Migrate here</source>
+        <target>Мигрирай тук</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device" xml:space="preserve">
         <source>Migrate to another device</source>
+        <target>Миграция към друго устройство</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
+        <target>Мигрирайте към друго устройство чрез QR код.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
         <source>Migrating</source>
+        <target>Мигриране</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
@@ -3630,6 +3668,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migration complete" xml:space="preserve">
         <source>Migration complete</source>
+        <target>Миграцията е завършена</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
@@ -3993,6 +4032,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
+        <target>Отвори миграцията към друго устройство</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
@@ -4012,6 +4052,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
         <source>Or paste archive link</source>
+        <target>Или постави архивен линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or scan QR code" xml:space="preserve">
@@ -4021,6 +4062,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or securely share this file link" xml:space="preserve">
         <source>Or securely share this file link</source>
+        <target>Или сигурно споделете този линк към файла</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
@@ -4110,6 +4152,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Picture-in-picture calls" xml:space="preserve">
         <source>Picture-in-picture calls</source>
+        <target>Обаждания "картина в картина"</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -4134,6 +4177,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
         <source>Please confirm that network settings are correct for this device.</source>
+        <target>Моля, потвърдете, че мрежовите настройки са правилни за това устройство.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
@@ -4195,6 +4239,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Post-quantum E2EE" xml:space="preserve">
         <source>Post-quantum E2EE</source>
+        <target>Постквантово E2EE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -4334,10 +4379,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Push server" xml:space="preserve">
         <source>Push server</source>
+        <target>Push сървър</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
+        <target>Квантово устойчиво криптиране</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -4527,10 +4574,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
         <source>Repeat download</source>
+        <target>Повтори изтеглянето</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat import" xml:space="preserve">
         <source>Repeat import</source>
+        <target>Повтори импортирането</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
@@ -4540,6 +4589,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
         <source>Repeat upload</source>
+        <target>Повтори качването</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
@@ -4644,6 +4694,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
+        <target>По-безопасни групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
@@ -5013,6 +5064,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Set passphrase" xml:space="preserve">
         <source>Set passphrase</source>
+        <target>Задаване на парола</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passphrase to export" xml:space="preserve">
@@ -5072,6 +5124,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
+        <target>Покажи QR код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show calls in phone history" xml:space="preserve">
@@ -5216,6 +5269,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
+        <target>Спри чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
@@ -5260,6 +5314,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
         <source>Stopping chat</source>
+        <target>Спиране на чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -5511,10 +5566,12 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by end-to-end encryption.</source>
+        <target>Този чат е защитен чрез криптиране от край до край.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
+        <target>Този чат е защитен от квантово устойчиво криптиране от край до край.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -5813,6 +5870,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Upload failed" xml:space="preserve">
         <source>Upload failed</source>
+        <target>Неуспешно качване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
@@ -5822,6 +5880,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Uploading archive" xml:space="preserve">
         <source>Uploading archive</source>
+        <target>Архивът се качва</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -5876,6 +5935,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
         <source>Use the app while in the call.</source>
+        <target>Използвайте приложението по време на разговора.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -5915,10 +5975,12 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Verify database passphrase" xml:space="preserve">
         <source>Verify database passphrase</source>
+        <target>Проверете паролата на базата данни</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify passphrase" xml:space="preserve">
         <source>Verify passphrase</source>
+        <target>Провери паролата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
@@ -6013,6 +6075,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
+        <target>Внимание: стартирането на чата на множество устройства не се поддържа и ще доведе до неуспешно изпращане на съобщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -6037,6 +6100,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Welcome message is too long" xml:space="preserve">
         <source>Welcome message is too long</source>
+        <target>Съобщението при посрещане е твърде дълго</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="What's new" xml:space="preserve">
@@ -6187,6 +6251,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
         <source>You can give another try.</source>
+        <target>Можете да опитате още веднъж.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -7094,6 +7159,7 @@ SimpleX сървърите не могат да видят вашия профи
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
+        <target>квантово устойчиво e2e криптиране</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -7173,6 +7239,7 @@ SimpleX сървърите не могат да видят вашия профи
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
         <source>standard end-to-end encryption</source>
+        <target>стандартно криптиране от край до край</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
index 3ed8ecbaeb..7ad19ff86f 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
+++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
@@ -635,7 +635,7 @@
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
         <source>Admins can block a member for all.</source>
-        <target>Administratoren können für ein Mitglied alle Funktionen blockieren.</target>
+        <target>Administratoren können ein Gruppenmitglied für Alle blockieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -1291,7 +1291,7 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
-        <target>Für die Migration bestätigen Sie bitte, dass Sie sich an das Datenbank-Passwort erinnern.</target>
+        <target>Bitte bestätigen Sie für die Migration, dass Sie sich an Ihr Datenbank-Passwort erinnern.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
@@ -3660,7 +3660,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
-        <target>Über einen QR-Code auf ein anderes Gerät migrieren.</target>
+        <target>Daten können über einen QR-Code auf ein anderes Gerät migriert werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
@@ -5618,7 +5618,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </trans-unit>
       <trans-unit id="To ask any questions and to receive updates:" xml:space="preserve">
         <source>To ask any questions and to receive updates:</source>
-        <target>Um Fragen zu stellen und Aktualisierungen zu erhalten:</target>
+        <target>Um Fragen zu stellen und aktuelle Informationen zu erhalten:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To connect, your contact can scan QR code or use the link in the app." xml:space="preserve">
@@ -6508,7 +6508,7 @@ Sie können diese Verbindung abbrechen und den Kontakt entfernen (und es später
       </trans-unit>
       <trans-unit id="Your contacts will remain connected." xml:space="preserve">
         <source>Your contacts will remain connected.</source>
-        <target>Ihre Kontakte bleiben verbunden.</target>
+        <target>Ihre Kontakte bleiben weiterhin verbunden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff
index 2f279a963c..99a117d786 100644
--- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
+++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
@@ -134,6 +134,7 @@
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
         <source>%@ uploaded</source>
+        <target>%@ cargado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ wants to connect!" xml:space="preserve">
@@ -1295,6 +1296,7 @@
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
         <source>Confirm upload</source>
+        <target>Confirmar subida</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
@@ -1558,6 +1560,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Creating archive link" xml:space="preserve">
         <source>Creating archive link</source>
+        <target>Creando enlace de archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Creating link…" xml:space="preserve">
@@ -1782,6 +1785,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Delete database from this device" xml:space="preserve">
         <source>Delete database from this device</source>
+        <target>Eliminar base de datos de este dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete file" xml:space="preserve">
@@ -2076,6 +2080,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Download failed" xml:space="preserve">
         <source>Download failed</source>
+        <target>Error en la descarga</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Download file" xml:space="preserve">
@@ -2085,10 +2090,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Downloading archive" xml:space="preserve">
         <source>Downloading archive</source>
+        <target>Descargando archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downloading link details" xml:space="preserve">
         <source>Downloading link details</source>
+        <target>Descargando detalles del enlace</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Duplicate display name!" xml:space="preserve">
@@ -2148,6 +2155,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
         <source>Enable in direct chats (BETA)!</source>
+        <target>Activar en chats directos (BETA)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -2267,6 +2275,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter passphrase" xml:space="preserve">
         <source>Enter passphrase</source>
+        <target>Introducir frase de contraseña</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
@@ -2331,6 +2340,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error allowing contact PQ encryption" xml:space="preserve">
         <source>Error allowing contact PQ encryption</source>
+        <target>Error al permitir cifrado PQ al contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2425,6 +2435,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error downloading the archive" xml:space="preserve">
         <source>Error downloading the archive</source>
+        <target>Error al descargar el archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
@@ -2504,6 +2515,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
         <source>Error saving settings</source>
+        <target>Error al guardar ajustes</target>
         <note>when migrating</note>
       </trans-unit>
       <trans-unit id="Error saving user password" xml:space="preserve">
@@ -2578,10 +2590,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error uploading the archive" xml:space="preserve">
         <source>Error uploading the archive</source>
+        <target>Error al subir el archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error verifying passphrase:" xml:space="preserve">
         <source>Error verifying passphrase:</source>
+        <target>Error al verificar la frase de contraseña:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: " xml:space="preserve">
@@ -2636,6 +2650,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Exported file doesn't exist" xml:space="preserve">
         <source>Exported file doesn't exist</source>
+        <target>El archivo exportado no existe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Exporting database archive…" xml:space="preserve">
@@ -2710,10 +2725,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Finalize migration" xml:space="preserve">
         <source>Finalize migration</source>
+        <target>Finalizar la migración</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finalize migration on another device." xml:space="preserve">
         <source>Finalize migration on another device.</source>
+        <target>Finalizar la migración en otro dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -3008,6 +3025,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Hungarian interface" xml:space="preserve">
         <source>Hungarian interface</source>
+        <target>Interfaz húngara</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="ICE servers (one per line)" xml:space="preserve">
@@ -3077,10 +3095,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Import failed" xml:space="preserve">
         <source>Import failed</source>
+        <target>Error de importación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Importing archive" xml:space="preserve">
         <source>Importing archive</source>
+        <target>Importando archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -3100,6 +3120,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
         <source>In order to continue, chat should be stopped.</source>
+        <target>Para continuar, el chat debe ser interrumpido.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
@@ -3216,6 +3237,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Invalid migration confirmation" xml:space="preserve">
         <source>Invalid migration confirmation</source>
+        <target>Confirmación de migración inválida</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid name!" xml:space="preserve">
@@ -3588,6 +3610,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message too large" xml:space="preserve">
         <source>Message too large</source>
+        <target>Mensaje demasiado grande</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages" xml:space="preserve">
@@ -3607,34 +3630,42 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Los mensajes, archivos y llamadas están protegidos por **cifrado de extremo a extremo** con perfecta confidencialidad, repudio y recuperación tras ataques.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Los mensajes, archivos y llamadas están protegidos por **cifrado de extremo a extremo resistente a la computación cuántica** con perfecta confidencialidad, repudio y recuperación tras ataques.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
         <source>Migrate device</source>
+        <target>Migrar dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>Migrar desde otro dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
         <source>Migrate here</source>
+        <target>Migrar aquí</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device" xml:space="preserve">
         <source>Migrate to another device</source>
+        <target>Migrar hacia otro dispositivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
+        <target>Migrar hacia otro dispositivo mediante código QR.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
         <source>Migrating</source>
+        <target>Migrando</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
@@ -3644,6 +3675,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migration complete" xml:space="preserve">
         <source>Migration complete</source>
+        <target>Migración completada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
@@ -4007,6 +4039,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
+        <target>Abrir la migración hacia otro dispositivo</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
@@ -4026,6 +4059,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
         <source>Or paste archive link</source>
+        <target>O pegar enlace del archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or scan QR code" xml:space="preserve">
@@ -4035,6 +4069,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Or securely share this file link" xml:space="preserve">
         <source>Or securely share this file link</source>
+        <target>O comparta de forma segura el enlace de este archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
@@ -4124,6 +4159,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Picture-in-picture calls" xml:space="preserve">
         <source>Picture-in-picture calls</source>
+        <target>Llamadas picture-in-picture</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -4148,6 +4184,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
         <source>Please confirm that network settings are correct for this device.</source>
+        <target>Por favor confirme que la configuración de red es correcta para este dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
@@ -4209,6 +4246,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Post-quantum E2EE" xml:space="preserve">
         <source>Post-quantum E2EE</source>
+        <target>E2EE postcuántica</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -4348,10 +4386,12 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Push server" xml:space="preserve">
         <source>Push server</source>
+        <target>Servidor push</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
+        <target>Cifrado resistente a la tecnología cuántica</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -4541,10 +4581,12 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
         <source>Repeat download</source>
+        <target>Repetir descarga</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat import" xml:space="preserve">
         <source>Repeat import</source>
+        <target>Repetir importación</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
@@ -4554,6 +4596,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
         <source>Repeat upload</source>
+        <target>Repetir la carga</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
@@ -4658,6 +4701,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
+        <target>Grupos más seguros</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
@@ -5027,6 +5071,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Set passphrase" xml:space="preserve">
         <source>Set passphrase</source>
+        <target>Definir frase de contraseña</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passphrase to export" xml:space="preserve">
@@ -5086,6 +5131,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
+        <target>Mostrar código QR</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show calls in phone history" xml:space="preserve">
@@ -5230,6 +5276,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
+        <target>Detener el chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
@@ -5274,6 +5321,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
         <source>Stopping chat</source>
+        <target>Detención del chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -5525,10 +5573,12 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by end-to-end encryption.</source>
+        <target>Este chat está protegido por cifrado de extremo a extremo.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
+        <target>Este chat está protegido por un cifrado de extremo a extremo resistente a tecnologías cuánticas.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -5828,6 +5878,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Upload failed" xml:space="preserve">
         <source>Upload failed</source>
+        <target>Error de carga</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
@@ -5837,6 +5888,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Uploading archive" xml:space="preserve">
         <source>Uploading archive</source>
+        <target>Subiendo el archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -5891,6 +5943,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
         <source>Use the app while in the call.</source>
+        <target>Usar la app durante la llamada.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -5930,10 +5983,12 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Verify database passphrase" xml:space="preserve">
         <source>Verify database passphrase</source>
+        <target>Verificar la contraseña de la base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify passphrase" xml:space="preserve">
         <source>Verify passphrase</source>
+        <target>Verificar frase de contraseña</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
@@ -6028,6 +6083,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
+        <target>Advertencia: el inicio del chat en varios dispositivos no es compatible y provocará fallos en la entrega de mensajes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -6052,6 +6108,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Welcome message is too long" xml:space="preserve">
         <source>Welcome message is too long</source>
+        <target>El mensaje de bienvenida es demasiado largo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="What's new" xml:space="preserve">
@@ -6111,6 +6168,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
+        <target>**No debe** usar la misma base de datos en dos dispositivos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You accepted connection" xml:space="preserve">
@@ -6202,6 +6260,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
         <source>You can give another try.</source>
+        <target>Puede intentarlo de nuevo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -7109,6 +7168,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
+        <target>cifrado e2e resistente a la cuántica</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -7188,6 +7248,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
         <source>standard end-to-end encryption</source>
+        <target>cifrado estándar de extremo a extremo</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff
index 7bdbefedb6..1e335c00b0 100644
--- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
+++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
@@ -2155,7 +2155,7 @@ Cette opération ne peut être annulée !</target>
       </trans-unit>
       <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
         <source>Enable in direct chats (BETA)!</source>
-        <target>Activé dans les conversations directes (BETA) !</target>
+        <target>Activer dans les conversations directes (BETA) !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -3635,7 +3635,7 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>Les messages, fichiers et appels sont protégés par un chiffrement **2e2 résistant post-quantique** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.</target>
+        <target>Les messages, fichiers et appels sont protégés par un chiffrement **e2e résistant post-quantique** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
@@ -5578,7 +5578,7 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
-        <target>Cette discussion est protégée par un chiffrement de bout en bout résistant post-quantique.</target>
+        <target>Cette discussion est protégée par un chiffrement de bout en bout résistant aux technologies quantiques.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -6082,7 +6082,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
-        <target>Attention : démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages</target>
+        <target>Attention: démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff b/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff
index ac71ed26bc..45cfe0c468 100644
--- a/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff	
+++ b/apps/ios/SimpleX Localizations/he.xcloc/Localized Contents/he.xliff	
@@ -5311,6 +5311,11 @@ SimpleX servers cannot see your profile.</source>
         <target state="translated">ללא היסטוריה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ ו-%@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="he" datatype="plaintext">
diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff
index 4fe1a8da8e..34d39c405d 100644
--- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
+++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
@@ -3635,7 +3635,7 @@ Questo è il tuo link per il gruppo %@!</target>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>I messaggi, i file e le chiamate sono protetti da **crittografia e2e resistente al quantistico** con perfect forward secrecy, ripudio e recupero da intrusione.</target>
+        <target>I messaggi, i file e le chiamate sono protetti da **crittografia e2e resistente alla quantistica** con perfect forward secrecy, ripudio e recupero da intrusione.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
@@ -4391,7 +4391,7 @@ Errore: %@</target>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
-        <target>Crittografia resistente al quantistico</target>
+        <target>Crittografia resistente alla quantistica</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -5578,7 +5578,7 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
-        <target>Questa chat è protetta da crittografia end-to-end resistente al quantistico.</target>
+        <target>Questa chat è protetta da crittografia end-to-end resistente alla quantistica.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -6002,7 +6002,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
       </trans-unit>
       <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
         <source>Via secure quantum resistant protocol.</source>
-        <target>Tramite protocollo sicuro resistente al quantistico.</target>
+        <target>Tramite protocollo sicuro resistente alla quantistica.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Video call" xml:space="preserve">
@@ -7167,7 +7167,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
-        <target>crittografia e2e resistente al quantistico</target>
+        <target>crittografia e2e resistente alla quantistica</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff
index 61d91c8fbb..d450d228d8 100644
--- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
+++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
@@ -4024,7 +4024,7 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="Open chat" xml:space="preserve">
         <source>Open chat</source>
-        <target>Gesprekken openen</target>
+        <target>Chat openen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open chat console" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff b/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff
index 71c523ca4e..a31d4e314d 100644
--- a/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff	
+++ b/apps/ios/SimpleX Localizations/pt.xcloc/Localized Contents/pt.xliff	
@@ -15,32 +15,39 @@
 Available in v5.1</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=" " xml:space="preserve">
+      <trans-unit id=" " xml:space="preserve" approved="no">
         <source> </source>
+        <target state="translated"> </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="  " xml:space="preserve">
+      <trans-unit id="  " xml:space="preserve" approved="no">
         <source>  </source>
+        <target state="translated">  </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="   " xml:space="preserve">
+      <trans-unit id="   " xml:space="preserve" approved="no">
         <source>   </source>
+        <target state="translated">   </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=" (" xml:space="preserve">
+      <trans-unit id=" (" xml:space="preserve" approved="no">
         <source> (</source>
+        <target state="translated"> (</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id=" (can be copied)" xml:space="preserve">
+      <trans-unit id=" (can be copied)" xml:space="preserve" approved="no">
         <source> (can be copied)</source>
+        <target state="translated"> .(pode ser copiado)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="!1 colored!" xml:space="preserve">
+      <trans-unit id="!1 colored!" xml:space="preserve" approved="no">
         <source>!1 colored!</source>
+        <target state="translated">!1 colorido!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="#secret#" xml:space="preserve">
+      <trans-unit id="#secret#" xml:space="preserve" approved="no">
         <source>#secret#</source>
+        <target state="translated">#secreto#</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@" xml:space="preserve">
@@ -55,48 +62,59 @@ Available in v5.1</source>
         <source>%@ / %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ is connected!" xml:space="preserve">
+      <trans-unit id="%@ is connected!" xml:space="preserve" approved="no">
         <source>%@ is connected!</source>
+        <target state="translated">%@ está conectado!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@ is not verified" xml:space="preserve">
+      <trans-unit id="%@ is not verified" xml:space="preserve" approved="no">
         <source>%@ is not verified</source>
+        <target state="translated">%@ não foi verificado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ is verified" xml:space="preserve">
+      <trans-unit id="%@ is verified" xml:space="preserve" approved="no">
         <source>%@ is verified</source>
+        <target state="translated">%@ foi verificado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ servers" xml:space="preserve">
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
         <source>%@ servers</source>
+        <target state="translated">%@ servidores</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ wants to connect!" xml:space="preserve">
+      <trans-unit id="%@ wants to connect!" xml:space="preserve" approved="no">
         <source>%@ wants to connect!</source>
+        <target state="translated">%@ quer se conectar!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%d days" xml:space="preserve">
+      <trans-unit id="%d days" xml:space="preserve" approved="no">
         <source>%d days</source>
+        <target state="translated">%d dias</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d hours" xml:space="preserve">
+      <trans-unit id="%d hours" xml:space="preserve" approved="no">
         <source>%d hours</source>
+        <target state="translated">%d horas</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d min" xml:space="preserve">
+      <trans-unit id="%d min" xml:space="preserve" approved="no">
         <source>%d min</source>
+        <target state="translated">%d minuto</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d months" xml:space="preserve">
+      <trans-unit id="%d months" xml:space="preserve" approved="no">
         <source>%d months</source>
+        <target state="translated">%d meses</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d sec" xml:space="preserve">
+      <trans-unit id="%d sec" xml:space="preserve" approved="no">
         <source>%d sec</source>
+        <target state="translated">%d segundo</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d skipped message(s)" xml:space="preserve">
+      <trans-unit id="%d skipped message(s)" xml:space="preserve" approved="no">
         <source>%d skipped message(s)</source>
+        <target state="translated">%d mensagem(s) ignorada(s)</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve">
@@ -107,28 +125,34 @@ Available in v5.1</source>
         <source>%lld %@</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld contact(s) selected" xml:space="preserve">
+      <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
         <source>%lld contact(s) selected</source>
+        <target state="translated">%lld contato(s) selecionado(s)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve">
+      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve" approved="no">
         <source>%lld file(s) with total size of %@</source>
+        <target state="translated">%lld arquivo(s) com tamanho total de %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld members" xml:space="preserve">
+      <trans-unit id="%lld members" xml:space="preserve" approved="no">
         <source>%lld members</source>
+        <target state="translated">%lld membros</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld minutes" xml:space="preserve">
+      <trans-unit id="%lld minutes" xml:space="preserve" approved="no">
         <source>%lld minutes</source>
+        <target state="translated">%lld minutos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
+      <trans-unit id="%lld second(s)" xml:space="preserve" approved="no">
         <source>%lld second(s)</source>
+        <target state="translated">%lld segundo(s)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld seconds" xml:space="preserve">
+      <trans-unit id="%lld seconds" xml:space="preserve" approved="no">
         <source>%lld seconds</source>
+        <target state="translated">%lld segundos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldd" xml:space="preserve">
@@ -159,12 +183,14 @@ Available in v5.1</source>
         <source>%lldw</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%u messages failed to decrypt." xml:space="preserve">
+      <trans-unit id="%u messages failed to decrypt." xml:space="preserve" approved="no">
         <source>%u messages failed to decrypt.</source>
+        <target state="translated">%u mensagens não foram descriptografadas.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%u messages skipped." xml:space="preserve">
+      <trans-unit id="%u messages skipped." xml:space="preserve" approved="no">
         <source>%u messages skipped.</source>
+        <target state="translated">%u mensagens ignoradas.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="(" xml:space="preserve">
@@ -175,48 +201,56 @@ Available in v5.1</source>
         <source>)</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
+      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve" approved="no">
         <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
+        <target state="translated">**Adicionar novo contato**: para criar seu QR Code único ou link para seu contato.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
         <source>**Create link / QR code** for your contact to use.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
+      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve" approved="no">
         <source>**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have.</source>
+        <target state="translated">**Mais privado**: verifique novas mensagens a cada 20 minutos. O token do dispositivo é compartilhado com o servidor SimpleX Chat, mas não com quantos contatos ou mensagens você possui.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." xml:space="preserve">
+      <trans-unit id="**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." xml:space="preserve" approved="no">
         <source>**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app).</source>
+        <target state="translated">**Totalmente privado**: não use o servidor de notificações do SimpleX Chat, verifique as mensagens periodicamente em segundo plano (depende da frequência com que você usa o aplicativo).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
         <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
+      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve" approved="no">
         <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
+        <target state="translated">**Atenção**: Você NÃO poderá recuperar ou alterar a senha caso a perca.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." xml:space="preserve">
+      <trans-unit id="**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." xml:space="preserve" approved="no">
         <source>**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from.</source>
+        <target state="translated">**Recomendado**: O token do dispositivo e as notificações são enviados ao servidor de notificação do SimpleX Chat, mas não o conteúdo, o tamanho da mensagem ou de quem ela é.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
         <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
+      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve" approved="no">
         <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
+        <target state="translated">**Aviso**: As notificações push instantâneas exigem uma senha salva nas Chaves.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
+      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve" approved="no">
         <source>**e2e encrypted** audio call</source>
+        <target state="translated">** Criptografado e2e** chamada de áudio</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="**e2e encrypted** video call" xml:space="preserve">
+      <trans-unit id="**e2e encrypted** video call" xml:space="preserve" approved="no">
         <source>**e2e encrypted** video call</source>
+        <target state="translated">**Criptografado e2e** chamada de vídeo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="*bold*" xml:space="preserve">
@@ -353,144 +387,175 @@ Available in v5.1</source>
         <source>All group members will remain connected.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve">
+      <trans-unit id="All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you." xml:space="preserve" approved="no">
         <source>All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</source>
+        <target state="translated">Todas as mensagens serão apagadas – isso não pode ser desfeito! As mensagens serão apagadas SOMENTE para você.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected" xml:space="preserve">
         <source>All your contacts will remain connected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow" xml:space="preserve">
+      <trans-unit id="Allow" xml:space="preserve" approved="no">
         <source>Allow</source>
+        <target state="translated">Permitir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve">
+      <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve" approved="no">
         <source>Allow calls only if your contact allows them.</source>
+        <target state="translated">Permita chamadas somente se seu contato permitir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
+      <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve" approved="no">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
+        <target state="translated">Permita o desaparecimento de mensagens somente se o seu contato permitir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending direct messages to members." xml:space="preserve">
+      <trans-unit id="Allow sending direct messages to members." xml:space="preserve" approved="no">
         <source>Allow sending direct messages to members.</source>
+        <target state="translated">Permitir o envio de mensagens diretas aos membros.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow sending disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow sending disappearing messages." xml:space="preserve" approved="no">
         <source>Allow sending disappearing messages.</source>
+        <target state="translated">Permitir o envio de mensagens que desaparecem.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow to send voice messages." xml:space="preserve" approved="no">
         <source>Allow to send voice messages.</source>
+        <target state="translated">Permitir enviar mensagens de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
+      <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve" approved="no">
         <source>Allow voice messages only if your contact allows them.</source>
+        <target state="translated">Permita mensagens de voz apenas se o seu contato permitir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow voice messages?" xml:space="preserve">
+      <trans-unit id="Allow voice messages?" xml:space="preserve" approved="no">
         <source>Allow voice messages?</source>
+        <target state="translated">Permitir mensagens de voz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to call you." xml:space="preserve">
+      <trans-unit id="Allow your contacts to call you." xml:space="preserve" approved="no">
         <source>Allow your contacts to call you.</source>
+        <target state="translated">Permita que seus contatos liguem para você.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
         <source>Allow your contacts to irreversibly delete sent messages.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send disappearing messages.</source>
+        <target state="translated">Permita que seus contatos enviem mensagens que desaparecem.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
+      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send voice messages.</source>
+        <target state="translated">Permita que seus contatos enviem mensagens de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Already connected?" xml:space="preserve">
+      <trans-unit id="Already connected?" xml:space="preserve" approved="no">
         <source>Already connected?</source>
+        <target state="translated">Já conectado?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Always use relay" xml:space="preserve">
+      <trans-unit id="Always use relay" xml:space="preserve" approved="no">
         <source>Always use relay</source>
+        <target state="translated">Sempre usar retransmissão</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Answer call" xml:space="preserve">
+      <trans-unit id="Answer call" xml:space="preserve" approved="no">
         <source>Answer call</source>
+        <target state="translated">Atender chamada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App build: %@" xml:space="preserve">
+      <trans-unit id="App build: %@" xml:space="preserve" approved="no">
         <source>App build: %@</source>
+        <target state="translated">Versão do Aplicativo: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App icon" xml:space="preserve">
+      <trans-unit id="App icon" xml:space="preserve" approved="no">
         <source>App icon</source>
+        <target state="translated">Ícone do Aplicativo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App passcode" xml:space="preserve">
+      <trans-unit id="App passcode" xml:space="preserve" approved="no">
         <source>App passcode</source>
+        <target state="translated">Senha do Aplicativo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version" xml:space="preserve">
+      <trans-unit id="App version" xml:space="preserve" approved="no">
         <source>App version</source>
+        <target state="translated">Versão do Aplicativo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App version: v%@" xml:space="preserve">
+      <trans-unit id="App version: v%@" xml:space="preserve" approved="no">
         <source>App version: v%@</source>
+        <target state="translated">Versão do Aplicativo: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Appearance" xml:space="preserve">
+      <trans-unit id="Appearance" xml:space="preserve" approved="no">
         <source>Appearance</source>
+        <target state="translated">Aparência</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Attach" xml:space="preserve">
+      <trans-unit id="Attach" xml:space="preserve" approved="no">
         <source>Attach</source>
+        <target state="translated">Anexar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio &amp; video calls" xml:space="preserve">
+      <trans-unit id="Audio &amp; video calls" xml:space="preserve" approved="no">
         <source>Audio &amp; video calls</source>
+        <target state="translated">Chamadas de áudio e vídeo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio and video calls" xml:space="preserve">
+      <trans-unit id="Audio and video calls" xml:space="preserve" approved="no">
         <source>Audio and video calls</source>
+        <target state="translated">Chamadas de áudio e vídeo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Audio/video calls" xml:space="preserve">
+      <trans-unit id="Audio/video calls" xml:space="preserve" approved="no">
         <source>Audio/video calls</source>
+        <target state="translated">Chamadas de áudio/vídeo</target>
         <note>chat feature</note>
       </trans-unit>
-      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
+      <trans-unit id="Audio/video calls are prohibited." xml:space="preserve" approved="no">
         <source>Audio/video calls are prohibited.</source>
+        <target state="translated">Chamadas de áudio/vídeo são proibidas.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication cancelled" xml:space="preserve">
+      <trans-unit id="Authentication cancelled" xml:space="preserve" approved="no">
         <source>Authentication cancelled</source>
+        <target state="translated">Autenticação cancelada</target>
         <note>PIN entry</note>
       </trans-unit>
-      <trans-unit id="Authentication failed" xml:space="preserve">
+      <trans-unit id="Authentication failed" xml:space="preserve" approved="no">
         <source>Authentication failed</source>
+        <target state="translated">Falha na autenticação</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve">
+      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve" approved="no">
         <source>Authentication is required before the call is connected, but you may miss calls.</source>
+        <target state="translated">A autenticação é necessária antes que a chamada seja conectada, mas você pode perder chamadas.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Authentication unavailable" xml:space="preserve">
+      <trans-unit id="Authentication unavailable" xml:space="preserve" approved="no">
         <source>Authentication unavailable</source>
+        <target state="translated">Autenticação indisponível</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Auto-accept contact requests" xml:space="preserve">
+      <trans-unit id="Auto-accept contact requests" xml:space="preserve" approved="no">
         <source>Auto-accept contact requests</source>
+        <target state="translated">Aceitar solicitações de contato automaticamente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Auto-accept images" xml:space="preserve">
@@ -4162,6 +4227,226 @@ SimpleX servers cannot see your profile.</source>
         <source>\~strike~</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## Em resposta a</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@ enviado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%d weeks" xml:space="preserve" approved="no">
+        <source>%d weeks</source>
+        <target state="translated">%d semanas</target>
+        <note>time interval</note>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
+        <source>%lld messages blocked by admin</source>
+        <target state="translated">%lld mensagens bloqueadas pelo administrador</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld novas interface de idiomas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <target state="translated">**Adicionar contato**: para criar um novo link de convite ou conectar-se por meio de um link que você recebeu.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
+        <source>**Create group**: to create a new group.</source>
+        <target state="translated">**Criar grupo**: para criar um novo grupo.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve" approved="no">
+        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
+        <target state="translated">**Observação**: usar o mesmo banco de dados em dois dispositivos interromperá a descriptografia de mensagens de suas conexões, como proteção de segurança.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## Histórico</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve" approved="no">
+        <source>**Warning**: the archive will be removed.</source>
+        <target state="translated">**Atenção**: O arquivo será removido.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ e %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ e %@ conectado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ em %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ conectado</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ e %lld membros</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ e %lld outros membros conectados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
+        <source>%lld group events</source>
+        <target state="translated">%lld eventos de grupo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">%lld mensagens marcadas como excluídas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">%lld mensagens bloqueadas</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
+        <source>%lld messages moderated by %@</source>
+        <target state="translated">%lld mensagens moderadas por %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">(este dispositivo v%@)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All data is erased when it is entered." xml:space="preserve" approved="no">
+        <source>All data is erased when it is entered.</source>
+        <target state="translated">Todos os dados são apagados quando são inseridos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target state="translated">Permita a exclusão irreversível de mensagens somente se o seu contato permitir. (24 horas)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">Aplicar</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archive and upload" xml:space="preserve" approved="no">
+        <source>Archive and upload</source>
+        <target state="translated">Arquivar e fazer envio</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve" approved="no">
+        <source>All new messages from %@ will be hidden!</source>
+        <target state="translated">Todas as novas mensagens de %@ ficarão ocultas!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">Já conectando!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve" approved="no">
+        <source>App encrypts new local files (except videos).</source>
+        <target state="translated">O aplicativo criptografa novos arquivos locais (exceto vídeos).</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="App passcode is replaced with self-destruct passcode." xml:space="preserve" approved="no">
+        <source>App passcode is replaced with self-destruct passcode.</source>
+        <target state="translated">A senha do Aplicativo é substituída pela senha de autodestruição.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected.</source>
+        <target state="translated">Todos os seus contatos permanecerão conectados.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
+        <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
+        <target state="translated">Todos os seus contatos permanecerão conectados. A atualização do perfil será enviada para seus contatos.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
+        <source>Allow to send files and media.</source>
+        <target state="translated">Permitir o envio de arquivos e mídia.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="App data migration" xml:space="preserve" approved="no">
+        <source>App data migration</source>
+        <target state="translated">Migração de dados de aplicativos</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">Arquivando banco de dados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>All messages will be deleted - this cannot be undone!</source>
+        <target state="translated">Todas as mensagens serão apagadas – isso não pode ser desfeito!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
+        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target state="translated">Todos os seus contatos, conversas e arquivos serão criptografados com segurança e enviados em partes para retransmissões XFTP configuradas.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve" approved="no">
+        <source>Allow message reactions only if your contact allows them.</source>
+        <target state="translated">Permita reações às mensagens somente se o seu contato permitir.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow message reactions." xml:space="preserve" approved="no">
+        <source>Allow message reactions.</source>
+        <target state="translated">Permitir reações às mensagens.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Permita que seus contatos apaguem irreversivelmente as mensagens enviadas. (24 horas)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">Entrando no grupo!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve" approved="no">
+        <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
+        <target state="translated">Um perfil de conversa vazio com o nome fornecido é criado e o aplicativo abre normalmente.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Auto-accept" xml:space="preserve" approved="no">
+        <source>Auto-accept</source>
+        <target state="translated">Aceitar automaticamente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow your contacts adding message reactions." xml:space="preserve" approved="no">
+        <source>Allow your contacts adding message reactions.</source>
+        <target state="translated">Permita que seus contatos adicionem reações às mensagens.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Permitir apagar irreversivelmente as mensagens enviadas. (24 horas)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt" datatype="plaintext">
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
index f78bdd0384..7d5f119b9d 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
@@ -6082,7 +6082,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
-        <target>Внимание: запуск чата на нескольких устройствах не поддерживается и приведет к сбоям доставки сообщений.</target>
+        <target>Внимание: запуск чата на нескольких устройствах не поддерживается и приведет к сбоям доставки сообщений</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff
index 51ef266312..05c68ea21e 100644
--- a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
+++ b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
@@ -99,7 +99,7 @@
       </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
-        <target>%1$@, %2$@ de</target>
+        <target>1$@, %2$@'de:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
       <trans-unit id="%@ connected" xml:space="preserve">
@@ -2340,6 +2340,7 @@ Bu geri alınamaz!</target>
       </trans-unit>
       <trans-unit id="Error allowing contact PQ encryption" xml:space="preserve">
         <source>Error allowing contact PQ encryption</source>
+        <target>İletişim PQ şifrelemesine izin verirken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -3024,6 +3025,7 @@ Bu geri alınamaz!</target>
       </trans-unit>
       <trans-unit id="Hungarian interface" xml:space="preserve">
         <source>Hungarian interface</source>
+        <target>Macarca arayüz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="ICE servers (one per line)" xml:space="preserve">
@@ -3628,34 +3630,42 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Mesajlar, dosyalar ve aramalar **uçtan uca şifreleme** ile mükemmel ileri gizlilik, inkar ve izinsiz giriş kurtarma ile korunur.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Mesajlar, dosyalar ve aramalar **kuantum dirençli e2e şifreleme** ile mükemmel ileri gizlilik, inkar ve zorla girme kurtarma ile korunur.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
         <source>Migrate device</source>
+        <target>Cihazı taşıma</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>Başka bir cihazdan geçiş yapın</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
         <source>Migrate here</source>
+        <target>Buraya göç edin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device" xml:space="preserve">
         <source>Migrate to another device</source>
+        <target>Başka bir cihaza taşıma</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
+        <target>QR kodu aracılığıyla başka bir cihaza geçiş yapın.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
         <source>Migrating</source>
+        <target>Göçmenlik</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
@@ -3665,6 +3675,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Migration complete" xml:space="preserve">
         <source>Migration complete</source>
+        <target>Geçiş tamamlandı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
@@ -4028,6 +4039,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
+        <target>Başka bir cihaza açık geçiş</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
@@ -4047,6 +4059,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
         <source>Or paste archive link</source>
+        <target>Veya arşiv bağlantısını yapıştırın</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or scan QR code" xml:space="preserve">
@@ -4056,6 +4069,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Or securely share this file link" xml:space="preserve">
         <source>Or securely share this file link</source>
+        <target>Veya bu dosya bağlantısını güvenli bir şekilde paylaşın</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
@@ -4145,6 +4159,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Picture-in-picture calls" xml:space="preserve">
         <source>Picture-in-picture calls</source>
+        <target>Resim içinde resim aramaları</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -4169,6 +4184,7 @@ Bu senin grup için bağlantın %@!</target>
       </trans-unit>
       <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
         <source>Please confirm that network settings are correct for this device.</source>
+        <target>Lütfen bu cihaz için ağ ayarlarının doğru olduğunu onaylayın.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
@@ -4230,6 +4246,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Post-quantum E2EE" xml:space="preserve">
         <source>Post-quantum E2EE</source>
+        <target>Kuantum sonrası E2EE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -4369,10 +4386,12 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Push server" xml:space="preserve">
         <source>Push server</source>
+        <target>Push sunucu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
+        <target>Kuantum dirençli şifreleme</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -4422,7 +4441,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Receipts are disabled" xml:space="preserve">
         <source>Receipts are disabled</source>
-        <target>Görüldü devre dışı bırakıldı</target>
+        <target>Makbuzlar devre dışı bırakıldı</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
@@ -4562,10 +4581,12 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
         <source>Repeat download</source>
+        <target>Tekrar indir</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat import" xml:space="preserve">
         <source>Repeat import</source>
+        <target>İthalatı tekrarla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
@@ -4575,6 +4596,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
         <source>Repeat upload</source>
+        <target>Yüklemeyi tekrarla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
@@ -4679,6 +4701,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
+        <target>Daha güvenli gruplar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
@@ -4938,7 +4961,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
         <source>Sending delivery receipts will be enabled for all contacts.</source>
-        <target>Görüldü bilgisi bütün kişileri için etkinleştirilecektir.</target>
+        <target>Teslimat makbuzlarının gönderilmesi tüm kişiler için etkinleştirilecektir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -5048,6 +5071,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Set passphrase" xml:space="preserve">
         <source>Set passphrase</source>
+        <target>Parolayı ayarla</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passphrase to export" xml:space="preserve">
@@ -5107,6 +5131,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
+        <target>QR kodunu göster</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show calls in phone history" xml:space="preserve">
@@ -5251,6 +5276,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
+        <target>Sohbeti kes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
@@ -5295,6 +5321,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
         <source>Stopping chat</source>
+        <target>Sohbeti durdurma</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -5324,7 +5351,7 @@ Hata: %@</target>
       </trans-unit>
       <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
         <source>TCP_KEEPCNT</source>
-        <target>TCP_CNTYİTUT</target>
+        <target>TCP_KEEPCNT</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP_KEEPIDLE" xml:space="preserve">
@@ -5546,10 +5573,12 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
       </trans-unit>
       <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by end-to-end encryption.</source>
+        <target>Bu sohbet uçtan uca şifreleme ile korunmaktadır.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
+        <target>Bu sohbet kuantum dirençli uçtan uca şifreleme ile korunmaktadır.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
@@ -5848,6 +5877,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Upload failed" xml:space="preserve">
         <source>Upload failed</source>
+        <target>Yükleme başarısız</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
@@ -5857,6 +5887,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Uploading archive" xml:space="preserve">
         <source>Uploading archive</source>
+        <target>Arşiv yükleme</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -5911,6 +5942,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
         <source>Use the app while in the call.</source>
+        <target>Görüşme sırasında uygulamayı kullanın.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -5950,10 +5982,12 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Verify database passphrase" xml:space="preserve">
         <source>Verify database passphrase</source>
+        <target>Veritabanı parolasını doğrulayın</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify passphrase" xml:space="preserve">
         <source>Verify passphrase</source>
+        <target>Parolayı doğrula</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
@@ -6048,6 +6082,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
+        <target>Uyarı: birden fazla cihazda sohbet başlatmak desteklenmez ve mesaj teslim hatalarına neden olur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -6072,6 +6107,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="Welcome message is too long" xml:space="preserve">
         <source>Welcome message is too long</source>
+        <target>Hoş geldiniz mesajı çok uzun</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="What's new" xml:space="preserve">
@@ -6131,6 +6167,7 @@ Bağlanmak için lütfen kişinizden başka bir bağlantı oluşturmasını iste
       </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
+        <target>Aynı veritabanını iki cihazda **kullanmamalısınız**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You accepted connection" xml:space="preserve">
@@ -6222,6 +6259,7 @@ Katılma isteği tekrarlansın mı?</target>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
         <source>You can give another try.</source>
+        <target>Bir kez daha deneyebilirsiniz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -7129,6 +7167,7 @@ SimpleX sunucuları profilinizi göremez.</target>
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
+        <target>kuantuma dayanıklı e2e şifreleme</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -7208,6 +7247,7 @@ SimpleX sunucuları profilinizi göremez.</target>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
         <source>standard end-to-end encryption</source>
+        <target>standart uçtan uca şifreleme</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff
index 19b46bfc45..29edc0b9ac 100644
--- a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
+++ b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
@@ -109,6 +109,7 @@
       </trans-unit>
       <trans-unit id="%@ downloaded" xml:space="preserve">
         <source>%@ downloaded</source>
+        <target>%@ встановлено</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -133,6 +134,7 @@
       </trans-unit>
       <trans-unit id="%@ uploaded" xml:space="preserve">
         <source>%@ uploaded</source>
+        <target>%@ завантажено</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ wants to connect!" xml:space="preserve">
@@ -352,6 +354,7 @@
       </trans-unit>
       <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve">
         <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
+        <target>**Зверніть увагу**: використання однієї і тієї ж бази даних на двох пристроях порушить розшифровку повідомлень з ваших з'єднань, як захист безпеки.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
@@ -371,6 +374,7 @@
       </trans-unit>
       <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve">
         <source>**Warning**: the archive will be removed.</source>
+        <target>**Попередження**: архів буде видалено.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
@@ -631,6 +635,7 @@
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
         <source>Admins can block a member for all.</source>
+        <target>Адміністратори можуть заблокувати користувача для всіх.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -690,6 +695,7 @@
       </trans-unit>
       <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
         <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target>Всі ваші контакти, розмови та файли будуть надійно зашифровані та завантажені частинами на налаштовані XFTP-реле.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow" xml:space="preserve">
@@ -819,6 +825,7 @@
       </trans-unit>
       <trans-unit id="App data migration" xml:space="preserve">
         <source>App data migration</source>
+        <target>Міграція даних додатків</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
@@ -858,14 +865,17 @@
       </trans-unit>
       <trans-unit id="Apply" xml:space="preserve">
         <source>Apply</source>
+        <target>Подати заявку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
+        <target>Архівування та завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
         <source>Archiving database</source>
+        <target>Архівування бази даних</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Attach" xml:space="preserve">
@@ -1060,6 +1070,7 @@
       </trans-unit>
       <trans-unit id="Cancel migration" xml:space="preserve">
         <source>Cancel migration</source>
+        <target>Скасувати міграцію</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
@@ -1165,6 +1176,7 @@
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
         <source>Chat migrated!</source>
+        <target>Чат перемістився!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat preferences" xml:space="preserve">
@@ -1189,6 +1201,7 @@
       </trans-unit>
       <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve">
         <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
+        <target>Виберіть _Перемістити з іншого пристрою_ на новому пристрої та відскануйте QR-код.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Choose file" xml:space="preserve">
@@ -1218,6 +1231,7 @@
       </trans-unit>
       <trans-unit id="Clear private notes?" xml:space="preserve">
         <source>Clear private notes?</source>
+        <target>Чисті приватні нотатки?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Clear verification" xml:space="preserve">
@@ -1262,6 +1276,7 @@
       </trans-unit>
       <trans-unit id="Confirm network settings" xml:space="preserve">
         <source>Confirm network settings</source>
+        <target>Підтвердьте налаштування мережі</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm new passphrase…" xml:space="preserve">
@@ -1276,10 +1291,12 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
+        <target>Переконайтеся, що ви пам'ятаєте пароль до бази даних для її перенесення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
         <source>Confirm upload</source>
+        <target>Підтвердити завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect" xml:space="preserve">
@@ -1348,6 +1365,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connected to desktop" xml:space="preserve">
         <source>Connected to desktop</source>
+        <target>Підключено до настільного комп'ютера</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1362,6 +1380,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connecting to desktop" xml:space="preserve">
         <source>Connecting to desktop</source>
+        <target>Підключення до ПК</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection" xml:space="preserve">
@@ -1386,6 +1405,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connection terminated" xml:space="preserve">
         <source>Connection terminated</source>
+        <target>З'єднання розірвано</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection timeout" xml:space="preserve">
@@ -1455,6 +1475,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
+        <target>Виправити ім'я на %@?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create" xml:space="preserve">
@@ -1469,6 +1490,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create a group using a random profile." xml:space="preserve">
         <source>Create a group using a random profile.</source>
+        <target>Створіть групу, використовуючи випадковий профіль.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
@@ -1483,6 +1505,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create group" xml:space="preserve">
         <source>Create group</source>
+        <target>Створити групу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create group link" xml:space="preserve">
@@ -1497,10 +1520,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
         <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
+        <target>Створіть новий профіль у [desktop app](https://simplex.chat/downloads/). 💻</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create profile" xml:space="preserve">
         <source>Create profile</source>
+        <target>Створити профіль</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -1520,10 +1545,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Created at" xml:space="preserve">
         <source>Created at</source>
+        <target>Створено за адресою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created at: %@" xml:space="preserve">
         <source>Created at: %@</source>
+        <target>Створено за адресою: %@</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Created on %@" xml:space="preserve">
@@ -1533,10 +1560,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Creating archive link" xml:space="preserve">
         <source>Creating archive link</source>
+        <target>Створення архівного посилання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Creating link…" xml:space="preserve">
         <source>Creating link…</source>
+        <target>Створення посилання…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Current Passcode" xml:space="preserve">
@@ -1679,6 +1708,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete %lld messages?" xml:space="preserve">
         <source>Delete %lld messages?</source>
+        <target>Видалити %lld повідомлень?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete Contact" xml:space="preserve">
@@ -1708,6 +1738,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete and notify contact" xml:space="preserve">
         <source>Delete and notify contact</source>
+        <target>Видалити та повідомити контакт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete archive" xml:space="preserve">
@@ -1743,6 +1774,8 @@ This is your own one-time link!</source>
       <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
         <source>Delete contact?
 This cannot be undone!</source>
+        <target>Видалити контакт?
+Це не можна скасувати!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -1752,6 +1785,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Delete database from this device" xml:space="preserve">
         <source>Delete database from this device</source>
+        <target>Видалити базу даних з цього пристрою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete file" xml:space="preserve">
@@ -1891,14 +1925,17 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Desktop address" xml:space="preserve">
         <source>Desktop address</source>
+        <target>Адреса робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
         <source>Desktop app version %@ is not compatible with this app.</source>
+        <target>Версія програми для настільних комп'ютерів %@ не сумісна з цією програмою.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Desktop devices" xml:space="preserve">
         <source>Desktop devices</source>
+        <target>Настільні пристрої</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Develop" xml:space="preserve">
@@ -1993,14 +2030,17 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Disconnect desktop?" xml:space="preserve">
         <source>Disconnect desktop?</source>
+        <target>Відключити робочий стіл?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
         <source>Discover and join groups</source>
+        <target>Знаходьте та приєднуйтесь до груп</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Discover via local network" xml:space="preserve">
         <source>Discover via local network</source>
+        <target>Відкриття через локальну мережу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2015,6 +2055,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Do not send history to new members." xml:space="preserve">
         <source>Do not send history to new members.</source>
+        <target>Не надсилайте історію новим користувачам.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
@@ -2039,6 +2080,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Download failed" xml:space="preserve">
         <source>Download failed</source>
+        <target>Не вдалося завантажити</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Download file" xml:space="preserve">
@@ -2048,10 +2090,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Downloading archive" xml:space="preserve">
         <source>Downloading archive</source>
+        <target>Завантажити архів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downloading link details" xml:space="preserve">
         <source>Downloading link details</source>
+        <target>Деталі посилання для завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Duplicate display name!" xml:space="preserve">
@@ -2101,6 +2145,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enable camera access" xml:space="preserve">
         <source>Enable camera access</source>
+        <target>Увімкніть доступ до камери</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable for all" xml:space="preserve">
@@ -2110,6 +2155,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
         <source>Enable in direct chats (BETA)!</source>
+        <target>Увімкнути в прямих чатах (BETA)!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enable instant notifications?" xml:space="preserve">
@@ -2154,10 +2200,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encrypt local files" xml:space="preserve">
         <source>Encrypt local files</source>
+        <target>Шифрування локальних файлів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
         <source>Encrypt stored files &amp; media</source>
+        <target>Шифрування збережених файлів і носіїв</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
@@ -2172,6 +2220,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
         <source>Encrypted message: app is stopped</source>
+        <target>Зашифроване повідомлення: додаток зупинено</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Encrypted message: database error" xml:space="preserve">
@@ -2201,10 +2250,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
         <source>Encryption re-negotiation error</source>
+        <target>Помилка повторного узгодження шифрування</target>
         <note>message decrypt error item</note>
       </trans-unit>
       <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
         <source>Encryption re-negotiation failed.</source>
+        <target>Повторне узгодження шифрування не вдалося.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter Passcode" xml:space="preserve">
@@ -2219,10 +2270,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter group name…" xml:space="preserve">
         <source>Enter group name…</source>
+        <target>Введіть назву групи…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase" xml:space="preserve">
         <source>Enter passphrase</source>
+        <target>Введіть парольну фразу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter passphrase…" xml:space="preserve">
@@ -2242,6 +2295,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter this device name…" xml:space="preserve">
         <source>Enter this device name…</source>
+        <target>Введіть назву пристрою…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
@@ -2256,6 +2310,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Enter your name…" xml:space="preserve">
         <source>Enter your name…</source>
+        <target>Введіть своє ім'я…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error" xml:space="preserve">
@@ -2285,6 +2340,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error allowing contact PQ encryption" xml:space="preserve">
         <source>Error allowing contact PQ encryption</source>
+        <target>Помилка, що дозволяє шифрування контакту PQ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing address" xml:space="preserve">
@@ -2319,10 +2375,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error creating member contact" xml:space="preserve">
         <source>Error creating member contact</source>
+        <target>Помилка при створенні контакту користувача</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating message" xml:space="preserve">
         <source>Error creating message</source>
+        <target>Повідомлення про створення помилки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2332,6 +2390,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error decrypting file" xml:space="preserve">
         <source>Error decrypting file</source>
+        <target>Помилка розшифрування файлу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
@@ -2376,6 +2435,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error downloading the archive" xml:space="preserve">
         <source>Error downloading the archive</source>
+        <target>Помилка завантаження архіву</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
@@ -2415,6 +2475,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
         <source>Error opening chat</source>
+        <target>Помилка відкриття чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error receiving file" xml:space="preserve">
@@ -2454,6 +2515,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error saving settings" xml:space="preserve">
         <source>Error saving settings</source>
+        <target>Налаштування збереження помилок</target>
         <note>when migrating</note>
       </trans-unit>
       <trans-unit id="Error saving user password" xml:space="preserve">
@@ -2463,6 +2525,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error scanning code: %@" xml:space="preserve">
         <source>Error scanning code: %@</source>
+        <target>Код помилки сканування: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending email" xml:space="preserve">
@@ -2472,6 +2535,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error sending member contact invitation" xml:space="preserve">
         <source>Error sending member contact invitation</source>
+        <target>Помилка надсилання запрошення до контактів учасника</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
@@ -2526,10 +2590,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Error uploading the archive" xml:space="preserve">
         <source>Error uploading the archive</source>
+        <target>Помилка при завантаженні архіву</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error verifying passphrase:" xml:space="preserve">
         <source>Error verifying passphrase:</source>
+        <target>Помилка при перевірці парольної фрази:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: " xml:space="preserve">
@@ -2564,6 +2630,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Expand" xml:space="preserve">
         <source>Expand</source>
+        <target>Розгорнути</target>
         <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Export database" xml:space="preserve">
@@ -2583,6 +2650,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Exported file doesn't exist" xml:space="preserve">
         <source>Exported file doesn't exist</source>
+        <target>Експортований файл не існує</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Exporting database archive…" xml:space="preserve">
@@ -2602,6 +2670,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
         <source>Faster joining and more reliable messages.</source>
+        <target>Швидше приєднання та надійніші повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Favorite" xml:space="preserve">
@@ -2656,10 +2725,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Finalize migration" xml:space="preserve">
         <source>Finalize migration</source>
+        <target>Завершити міграцію</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finalize migration on another device." xml:space="preserve">
         <source>Finalize migration on another device.</source>
+        <target>Завершіть міграцію на іншому пристрої.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
@@ -2709,6 +2780,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Found desktop" xml:space="preserve">
         <source>Found desktop</source>
+        <target>Знайдено робочий стіл</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="French interface" xml:space="preserve">
@@ -2733,6 +2805,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
         <source>Fully decentralized – visible only to members.</source>
+        <target>Повністю децентралізована - видима лише для учасників.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
@@ -2757,10 +2830,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Group already exists" xml:space="preserve">
         <source>Group already exists</source>
+        <target>Група вже існує</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group already exists!" xml:space="preserve">
         <source>Group already exists!</source>
+        <target>Група вже існує!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group display name" xml:space="preserve">
@@ -2920,6 +2995,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="History is not sent to new members." xml:space="preserve">
         <source>History is not sent to new members.</source>
+        <target>Історія не надсилається новим учасникам.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
@@ -2949,6 +3025,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Hungarian interface" xml:space="preserve">
         <source>Hungarian interface</source>
+        <target>Інтерфейс угорською мовою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="ICE servers (one per line)" xml:space="preserve">
@@ -3018,14 +3095,17 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Import failed" xml:space="preserve">
         <source>Import failed</source>
+        <target>Не вдалося імпортувати</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Importing archive" xml:space="preserve">
         <source>Importing archive</source>
+        <target>Імпорт архіву</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
+        <target>Покращена доставка повідомлень</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Improved privacy and security" xml:space="preserve">
@@ -3040,6 +3120,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
         <source>In order to continue, chat should be stopped.</source>
+        <target>Для того, щоб продовжити, чат слід зупинити.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
@@ -3054,6 +3135,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Incognito groups" xml:space="preserve">
         <source>Incognito groups</source>
+        <target>Групи інкогніто</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incognito mode" xml:space="preserve">
@@ -3088,6 +3170,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Incompatible version" xml:space="preserve">
         <source>Incompatible version</source>
+        <target>Несумісна версія</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incorrect passcode" xml:space="preserve">
@@ -3134,6 +3217,7 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Invalid QR code" xml:space="preserve">
         <source>Invalid QR code</source>
+        <target>Неправильний QR-код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid connection link" xml:space="preserve">
@@ -3143,22 +3227,27 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Invalid display name!" xml:space="preserve">
         <source>Invalid display name!</source>
+        <target>Неправильне ім'я користувача!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid link" xml:space="preserve">
         <source>Invalid link</source>
+        <target>Невірне посилання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid migration confirmation" xml:space="preserve">
         <source>Invalid migration confirmation</source>
+        <target>Недійсне підтвердження міграції</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid name!" xml:space="preserve">
         <source>Invalid name!</source>
+        <target>Неправильне ім'я!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid response" xml:space="preserve">
         <source>Invalid response</source>
+        <target>Неправильна відповідь</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid server address!" xml:space="preserve">
@@ -3254,10 +3343,12 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Join group conversations" xml:space="preserve">
         <source>Join group conversations</source>
+        <target>Приєднуйтесь до групових розмов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Join group?" xml:space="preserve">
         <source>Join group?</source>
+        <target>Приєднатися до групи?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
@@ -3267,11 +3358,14 @@ This cannot be undone!</source>
       </trans-unit>
       <trans-unit id="Join with current profile" xml:space="preserve">
         <source>Join with current profile</source>
+        <target>Приєднатися з поточним профілем</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
         <source>Join your group?
 This is your link for group %@!</source>
+        <target>Приєднатися до групи?
+Це ваше посилання на групу %@!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
@@ -3281,14 +3375,17 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Keep" xml:space="preserve">
         <source>Keep</source>
+        <target>Тримай</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
         <source>Keep the app open to use it from desktop</source>
+        <target>Тримайте додаток відкритим, щоб використовувати його з робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep unused invitation?" xml:space="preserve">
         <source>Keep unused invitation?</source>
+        <target>Зберігати невикористані запрошення?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
@@ -3353,14 +3450,17 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
         <source>Link mobile and desktop apps! 🔗</source>
+        <target>Зв'яжіть мобільні та десктопні додатки! 🔗</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Linked desktop options" xml:space="preserve">
         <source>Linked desktop options</source>
+        <target>Параметри пов'язаного робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Linked desktops" xml:space="preserve">
         <source>Linked desktops</source>
+        <target>Пов'язані робочі столи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Live message!" xml:space="preserve">
@@ -3510,6 +3610,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message too large" xml:space="preserve">
         <source>Message too large</source>
+        <target>Повідомлення занадто велике</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages" xml:space="preserve">
@@ -3524,38 +3625,47 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
         <source>Messages from %@ will be shown!</source>
+        <target>Повідомлення від %@ будуть показані!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Повідомлення, файли та дзвінки захищені **наскрізним шифруванням** з ідеальною секретністю переадресації, відмовою та відновленням після злому.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
+        <target>Повідомлення, файли та дзвінки захищені **квантово-стійким шифруванням e2e** з ідеальною секретністю переадресації, відмовою та відновленням після злому.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
         <source>Migrate device</source>
+        <target>Перенести пристрій</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate from another device" xml:space="preserve">
         <source>Migrate from another device</source>
+        <target>Перехід з іншого пристрою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate here" xml:space="preserve">
         <source>Migrate here</source>
+        <target>Мігруйте сюди</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device" xml:space="preserve">
         <source>Migrate to another device</source>
+        <target>Перехід на інший пристрій</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
         <source>Migrate to another device via QR code.</source>
+        <target>Перейдіть на інший пристрій за допомогою QR-коду.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating" xml:space="preserve">
         <source>Migrating</source>
+        <target>Міграція</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive…" xml:space="preserve">
@@ -3565,6 +3675,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Migration complete" xml:space="preserve">
         <source>Migration complete</source>
+        <target>Міграція завершена</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migration error:" xml:space="preserve">
@@ -3659,6 +3770,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
+        <target>Новий чат</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New contact request" xml:space="preserve">
@@ -3678,6 +3790,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New desktop app!" xml:space="preserve">
         <source>New desktop app!</source>
+        <target>Новий десктопний додаток!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
@@ -3762,6 +3875,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Not compatible!" xml:space="preserve">
         <source>Not compatible!</source>
+        <target>Не сумісні!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
@@ -3785,6 +3899,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="OK" xml:space="preserve">
         <source>OK</source>
+        <target>ОК</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Off" xml:space="preserve">
@@ -3899,6 +4014,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open" xml:space="preserve">
         <source>Open</source>
+        <target>Відкрито</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
@@ -3918,10 +4034,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Open group" xml:space="preserve">
         <source>Open group</source>
+        <target>Відкрита група</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open migration to another device" xml:space="preserve">
         <source>Open migration to another device</source>
+        <target>Відкрита міграція на інший пристрій</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Open user profiles" xml:space="preserve">
@@ -3936,22 +4054,27 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
+        <target>Відкриваємо програму…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or paste archive link" xml:space="preserve">
         <source>Or paste archive link</source>
+        <target>Або вставте посилання на архів</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or scan QR code" xml:space="preserve">
         <source>Or scan QR code</source>
+        <target>Або відскануйте QR-код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or securely share this file link" xml:space="preserve">
         <source>Or securely share this file link</source>
+        <target>Або безпечно поділіться цим посиланням на файл</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Or show this code" xml:space="preserve">
         <source>Or show this code</source>
+        <target>Або покажіть цей код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
@@ -3996,10 +4119,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Past member %@" xml:space="preserve">
         <source>Past member %@</source>
+        <target>Колишній учасник %@</target>
         <note>past/unknown group member</note>
       </trans-unit>
       <trans-unit id="Paste desktop address" xml:space="preserve">
         <source>Paste desktop address</source>
+        <target>Вставте адресу робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Paste image" xml:space="preserve">
@@ -4009,10 +4134,12 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Paste link to connect!" xml:space="preserve">
         <source>Paste link to connect!</source>
+        <target>Вставте посилання для підключення!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Paste the link you received" xml:space="preserve">
         <source>Paste the link you received</source>
+        <target>Вставте отримане посилання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
@@ -4032,6 +4159,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Picture-in-picture calls" xml:space="preserve">
         <source>Picture-in-picture calls</source>
+        <target>Дзвінки "картинка в картинці</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -4056,11 +4184,14 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
         <source>Please confirm that network settings are correct for this device.</source>
+        <target>Переконайтеся, що налаштування мережі для цього пристрою є правильними.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
         <source>Please contact developers.
 Error: %@</source>
+        <target>Зверніться до розробників.
+Помилка: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please contact group admin." xml:space="preserve">
@@ -4115,6 +4246,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Post-quantum E2EE" xml:space="preserve">
         <source>Post-quantum E2EE</source>
+        <target>Пост-квантовий E2EE</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -4154,6 +4286,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
         <source>Private notes</source>
+        <target>Приватні нотатки</target>
         <note>name of notes to self</note>
       </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
@@ -4168,10 +4301,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Profile name" xml:space="preserve">
         <source>Profile name</source>
+        <target>Назва профілю</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile name:" xml:space="preserve">
         <source>Profile name:</source>
+        <target>Ім'я профілю:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile password" xml:space="preserve">
@@ -4251,10 +4386,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Push server" xml:space="preserve">
         <source>Push server</source>
+        <target>Push-сервер</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Quantum resistant encryption" xml:space="preserve">
         <source>Quantum resistant encryption</source>
+        <target>Квантово-стійке шифрування</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Rate the app" xml:space="preserve">
@@ -4284,6 +4421,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
         <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <target>Читайте більше в [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
@@ -4343,6 +4481,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Recent history and improved [directory bot](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)." xml:space="preserve">
         <source>Recent history and improved [directory bot](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).</source>
+        <target>Нещодавня історія та покращення [directory bot](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
@@ -4437,22 +4576,27 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Repeat connection request?" xml:space="preserve">
         <source>Repeat connection request?</source>
+        <target>Повторити запит на підключення?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat download" xml:space="preserve">
         <source>Repeat download</source>
+        <target>Повторити завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat import" xml:space="preserve">
         <source>Repeat import</source>
+        <target>Повторний імпорт</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat join request?" xml:space="preserve">
         <source>Repeat join request?</source>
+        <target>Повторити запит на приєднання?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Repeat upload" xml:space="preserve">
         <source>Repeat upload</source>
+        <target>Повторне завантаження</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reply" xml:space="preserve">
@@ -4512,6 +4656,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Retry" xml:space="preserve">
         <source>Retry</source>
+        <target>Спробуйте ще раз</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reveal" xml:space="preserve">
@@ -4556,6 +4701,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Safer groups" xml:space="preserve">
         <source>Safer groups</source>
+        <target>Безпечніші групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save" xml:space="preserve">
@@ -4610,7 +4756,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Save preferences?" xml:space="preserve">
         <source>Save preferences?</source>
-        <target>Зберегти налаштування?</target>
+        <target>Зберегти настройки?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save profile password" xml:space="preserve">
@@ -4645,6 +4791,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Saved message" xml:space="preserve">
         <source>Saved message</source>
+        <target>Збережене повідомлення</target>
         <note>message info title</note>
       </trans-unit>
       <trans-unit id="Scan QR code" xml:space="preserve">
@@ -4654,6 +4801,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Scan QR code from desktop" xml:space="preserve">
         <source>Scan QR code from desktop</source>
+        <target>Відскануйте QR-код з робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Scan code" xml:space="preserve">
@@ -4678,10 +4826,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Search bar accepts invitation links." xml:space="preserve">
         <source>Search bar accepts invitation links.</source>
+        <target>Рядок пошуку приймає посилання-запрошення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
         <source>Search or paste SimpleX link</source>
+        <target>Знайдіть або вставте посилання SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Secure queue" xml:space="preserve">
@@ -4746,6 +4896,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
+        <target>Надішліть пряме повідомлення, щоб підключитися</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4790,6 +4941,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
         <source>Send up to 100 last messages to new members.</source>
+        <target>Надішліть до 100 останніх повідомлень новим користувачам.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
@@ -4889,6 +5041,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Session code" xml:space="preserve">
         <source>Session code</source>
+        <target>Код сесії</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set 1 day" xml:space="preserve">
@@ -4918,6 +5071,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Set passphrase" xml:space="preserve">
         <source>Set passphrase</source>
+        <target>Встановити парольну фразу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set passphrase to export" xml:space="preserve">
@@ -4967,6 +5121,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
+        <target>Поділіться цим одноразовим посиланням-запрошенням</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4976,6 +5131,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Show QR code" xml:space="preserve">
         <source>Show QR code</source>
+        <target>Показати QR-код</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show calls in phone history" xml:space="preserve">
@@ -5065,6 +5221,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
+        <target>Спрощений режим інкогніто</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
@@ -5099,6 +5256,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Start chat?" xml:space="preserve">
         <source>Start chat?</source>
+        <target>Почати чат?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Start migration" xml:space="preserve">
@@ -5118,6 +5276,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
+        <target>Припинити чат</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
@@ -5162,6 +5321,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Stopping chat" xml:space="preserve">
         <source>Stopping chat</source>
+        <target>Зупинка чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -5216,6 +5376,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Tap to Connect" xml:space="preserve">
         <source>Tap to Connect</source>
+        <target>Натисніть, щоб підключитися</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
@@ -5235,10 +5396,12 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Tap to paste link" xml:space="preserve">
         <source>Tap to paste link</source>
+        <target>Натисніть, щоб вставити посилання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap to scan" xml:space="preserve">
         <source>Tap to scan</source>
+        <target>Натисніть, щоб сканувати</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap to start a new chat" xml:space="preserve">
@@ -5305,6 +5468,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
         <source>The code you scanned is not a SimpleX link QR code.</source>
+        <target>Відсканований вами код не є QR-кодом посилання SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
@@ -5374,6 +5538,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
         <source>The text you pasted is not a SimpleX link.</source>
+        <target>Текст, який ви вставили, не є посиланням SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Theme" xml:space="preserve">
@@ -5408,18 +5573,22 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by end-to-end encryption.</source>
+        <target>Цей чат захищений наскрізним шифруванням.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
         <source>This chat is protected by quantum resistant end-to-end encryption.</source>
+        <target>Цей чат захищений квантово-стійким наскрізним шифруванням.</target>
         <note>E2EE info chat item</note>
       </trans-unit>
       <trans-unit id="This device name" xml:space="preserve">
         <source>This device name</source>
+        <target>Це ім'я пристрою</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
         <source>This display name is invalid. Please choose another name.</source>
+        <target>Це ім'я для відображення є недійсним. Будь ласка, виберіть інше ім'я.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
@@ -5434,10 +5603,12 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
         <source>This is your own SimpleX address!</source>
+        <target>Це ваша власна SimpleX-адреса!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This is your own one-time link!" xml:space="preserve">
         <source>This is your own one-time link!</source>
+        <target>Це ваше власне одноразове посилання!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
@@ -5457,6 +5628,7 @@ It can happen because of some bug or when the connection is compromised.</source
       </trans-unit>
       <trans-unit id="To hide unwanted messages." xml:space="preserve">
         <source>To hide unwanted messages.</source>
+        <target>Приховати небажані повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To make a new connection" xml:space="preserve">
@@ -5503,6 +5675,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
         <source>Toggle incognito when connecting.</source>
+        <target>Увімкніть інкогніто при підключенні.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
@@ -5522,6 +5695,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Turkish interface" xml:space="preserve">
         <source>Turkish interface</source>
+        <target>Турецький інтерфейс</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Turn off" xml:space="preserve">
@@ -5541,22 +5715,27 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Unblock" xml:space="preserve">
         <source>Unblock</source>
+        <target>Розблoкувати</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock for all" xml:space="preserve">
         <source>Unblock for all</source>
+        <target>Розблокування для всіх</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock member" xml:space="preserve">
         <source>Unblock member</source>
+        <target>Розблокувати учасника</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock member for all?" xml:space="preserve">
         <source>Unblock member for all?</source>
+        <target>Розблокувати учасника для всіх?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unblock member?" xml:space="preserve">
         <source>Unblock member?</source>
+        <target>Розблокувати учасника?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
@@ -5623,10 +5802,12 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Unlink" xml:space="preserve">
         <source>Unlink</source>
+        <target>Роз'єднати зв'язок</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unlink desktop?" xml:space="preserve">
         <source>Unlink desktop?</source>
+        <target>Від'єднати робочий стіл?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unlock" xml:space="preserve">
@@ -5651,6 +5832,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
         <source>Up to 100 last messages are sent to new members.</source>
+        <target>Новим користувачам надсилається до 100 останніх повідомлень.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Update" xml:space="preserve">
@@ -5695,6 +5877,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Upload failed" xml:space="preserve">
         <source>Upload failed</source>
+        <target>Не вдалося завантфжити</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
@@ -5704,6 +5887,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Uploading archive" xml:space="preserve">
         <source>Uploading archive</source>
+        <target>Завантаження архіву</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use .onion hosts" xml:space="preserve">
@@ -5733,6 +5917,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use from desktop" xml:space="preserve">
         <source>Use from desktop</source>
+        <target>Використання з робочого столу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use iOS call interface" xml:space="preserve">
@@ -5747,6 +5932,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use only local notifications?" xml:space="preserve">
         <source>Use only local notifications?</source>
+        <target>Використовувати лише локальні сповіщення?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
@@ -5756,6 +5942,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Use the app while in the call." xml:space="preserve">
         <source>Use the app while in the call.</source>
+        <target>Використовуйте додаток під час розмови.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -5775,10 +5962,12 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Verify code with desktop" xml:space="preserve">
         <source>Verify code with desktop</source>
+        <target>Перевірте код на робочому столі</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify connection" xml:space="preserve">
         <source>Verify connection</source>
+        <target>Перевірте з'єднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
@@ -5788,14 +5977,17 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Verify connections" xml:space="preserve">
         <source>Verify connections</source>
+        <target>Пeревірте з'єднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify database passphrase" xml:space="preserve">
         <source>Verify database passphrase</source>
+        <target>Перевірте пароль до бази даних</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify passphrase" xml:space="preserve">
         <source>Verify passphrase</source>
+        <target>Підтвердіть парольну фразу</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify security code" xml:space="preserve">
@@ -5810,6 +6002,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
         <source>Via secure quantum resistant protocol.</source>
+        <target>Через безпечний квантово-стійкий протокол.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Video call" xml:space="preserve">
@@ -5839,6 +6032,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Visible history" xml:space="preserve">
         <source>Visible history</source>
+        <target>Видима історія</target>
         <note>chat feature</note>
       </trans-unit>
       <trans-unit id="Voice messages" xml:space="preserve">
@@ -5868,6 +6062,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Waiting for desktop..." xml:space="preserve">
         <source>Waiting for desktop...</source>
+        <target>Чекаємо на десктопну версію...</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Waiting for file" xml:space="preserve">
@@ -5887,6 +6082,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
         <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
+        <target>Попередження: запуск чату на декількох пристроях не підтримується і може призвести до збоїв у доставці повідомлень</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
@@ -5911,6 +6107,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Welcome message is too long" xml:space="preserve">
         <source>Welcome message is too long</source>
+        <target>Привітальне повідомлення занадто довге</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="What's new" xml:space="preserve">
@@ -5935,6 +6132,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="With encrypted files and media." xml:space="preserve">
         <source>With encrypted files and media.</source>
+        <target>З зашифрованими файлами та медіа.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="With optional welcome message." xml:space="preserve">
@@ -5944,6 +6142,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="With reduced battery usage." xml:space="preserve">
         <source>With reduced battery usage.</source>
+        <target>З меншим споживанням заряду акумулятора.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
@@ -5968,6 +6167,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
+        <target>Ви **не повинні використовувати** одну і ту ж базу даних на двох пристроях.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You accepted connection" xml:space="preserve">
@@ -5992,31 +6192,39 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="You are already connecting to %@." xml:space="preserve">
         <source>You are already connecting to %@.</source>
+        <target>Ви вже з'єднані з %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
         <source>You are already connecting via this one-time link!</source>
+        <target>Ви вже підключаєтеся до %@.Ви вже підключаєтеся за цим одноразовим посиланням!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already in group %@." xml:space="preserve">
         <source>You are already in group %@.</source>
+        <target>Ви вже перебуваєте в групі %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already joining the group %@." xml:space="preserve">
         <source>You are already joining the group %@.</source>
+        <target>Ви вже приєдналися до групи %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
         <source>You are already joining the group via this link!</source>
+        <target>Ви вже приєдналися до групи за цим посиланням!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already joining the group via this link." xml:space="preserve">
         <source>You are already joining the group via this link.</source>
+        <target>Ви вже приєдналися до групи за цим посиланням.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
         <source>You are already joining the group!
 Repeat join request?</source>
+        <target>Ви вже приєдналися до групи!
+Повторити запит на приєднання?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
@@ -6051,6 +6259,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
         <source>You can give another try.</source>
+        <target>Ви можете спробувати ще раз.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
@@ -6060,6 +6269,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
         <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <target>Ви можете зробити його видимим для ваших контактів у SimpleX за допомогою налаштувань.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can now send messages to %@" xml:space="preserve">
@@ -6104,6 +6314,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
         <source>You can view invitation link again in connection details.</source>
+        <target>Ви можете переглянути посилання на запрошення ще раз у деталях підключення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can't send messages!" xml:space="preserve">
@@ -6123,11 +6334,14 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
         <source>You have already requested connection via this address!</source>
+        <target>Ви вже надсилали запит на підключення за цією адресою!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
         <source>You have already requested connection!
 Repeat connection request?</source>
+        <target>Ви вже надіслали запит на підключення!
+Повторити запит на підключення?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You have no chats" xml:space="preserve">
@@ -6182,6 +6396,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
         <source>You will be connected when group link host's device is online, please wait or check later!</source>
+        <target>Ви будете підключені, коли пристрій хоста групового посилання буде онлайн, будь ласка, зачекайте або перевірте пізніше!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
@@ -6201,6 +6416,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="You will connect to all group members." xml:space="preserve">
         <source>You will connect to all group members.</source>
+        <target>Ви з'єднаєтеся з усіма учасниками групи.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -6317,6 +6533,7 @@ You can cancel this connection and remove the contact (and try later with a new
       </trans-unit>
       <trans-unit id="Your profile" xml:space="preserve">
         <source>Your profile</source>
+        <target>Ваш профіль</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
@@ -6413,6 +6630,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="and %lld other events" xml:space="preserve">
         <source>and %lld other events</source>
+        <target>та %lld інших подій</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
@@ -6422,6 +6640,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="author" xml:space="preserve">
         <source>author</source>
+        <target>автор</target>
         <note>member role</note>
       </trans-unit>
       <trans-unit id="bad message ID" xml:space="preserve">
@@ -6436,14 +6655,17 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="blocked" xml:space="preserve">
         <source>blocked</source>
+        <target>заблоковано</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="blocked %@" xml:space="preserve">
         <source>blocked %@</source>
+        <target>заблоковано %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="blocked by admin" xml:space="preserve">
         <source>blocked by admin</source>
+        <target>заблоковано адміністратором</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="bold" xml:space="preserve">
@@ -6518,6 +6740,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="connected directly" xml:space="preserve">
         <source>connected directly</source>
+        <target>з'єднані безпосередньо</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
@@ -6567,6 +6790,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="contact %@ changed to %@" xml:space="preserve">
         <source>contact %1$@ changed to %2$@</source>
+        <target>контакт %1$@ змінено на %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="contact has e2e encryption" xml:space="preserve">
@@ -6621,6 +6845,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="deleted contact" xml:space="preserve">
         <source>deleted contact</source>
+        <target>видалений контакт</target>
         <note>rcv direct event chat item</note>
       </trans-unit>
       <trans-unit id="deleted group" xml:space="preserve">
@@ -6840,6 +7065,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="member %@ changed to %@" xml:space="preserve">
         <source>member %1$@ changed to %2$@</source>
+        <target>учасника %1$@ змінено на %2$@</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
@@ -6926,7 +7152,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="on" xml:space="preserve">
         <source>on</source>
-        <target>увімкнено</target>
+        <target>увімкненo</target>
         <note>group pref value</note>
       </trans-unit>
       <trans-unit id="owner" xml:space="preserve">
@@ -6941,6 +7167,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
         <source>quantum resistant e2e encryption</source>
+        <target>квантово-стійке шифрування e2e</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="received answer…" xml:space="preserve">
@@ -6970,10 +7197,12 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="removed contact address" xml:space="preserve">
         <source>removed contact address</source>
+        <target>видалено контактну адресу</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
+        <target>видалено зображення профілю</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="removed you" xml:space="preserve">
@@ -7003,18 +7232,22 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="send direct message" xml:space="preserve">
         <source>send direct message</source>
+        <target>надіслати пряме повідомлення</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="set new contact address" xml:space="preserve">
         <source>set new contact address</source>
+        <target>встановити нову контактну адресу</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="set new profile picture" xml:space="preserve">
         <source>set new profile picture</source>
+        <target>встановити нове зображення профілю</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
         <source>standard end-to-end encryption</source>
+        <target>стандартне наскрізне шифрування</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
@@ -7034,6 +7267,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="unblocked %@" xml:space="preserve">
         <source>unblocked %@</source>
+        <target>розблоковано %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="unknown" xml:space="preserve">
@@ -7043,6 +7277,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="unknown status" xml:space="preserve">
         <source>unknown status</source>
+        <target>невідомий статус</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="updated group profile" xml:space="preserve">
@@ -7052,10 +7287,12 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="updated profile" xml:space="preserve">
         <source>updated profile</source>
+        <target>оновлений профіль</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="v%@" xml:space="preserve">
         <source>v%@</source>
+        <target>v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="v%@ (%@)" xml:space="preserve">
@@ -7125,6 +7362,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="you blocked %@" xml:space="preserve">
         <source>you blocked %@</source>
+        <target>ви заблокували %@</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you changed address" xml:space="preserve">
@@ -7169,6 +7407,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="you unblocked %@" xml:space="preserve">
         <source>you unblocked %@</source>
+        <target>ви розблокували %@</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you: " xml:space="preserve">
@@ -7205,6 +7444,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
         <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
+        <target>SimpleX використовує доступ до локальної мережі, щоб дозволити користувачеві користуватися профілем чату через десктопну програму в тій же мережі.</target>
         <note>Privacy - Local Network Usage Description</note>
       </trans-unit>
       <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
diff --git a/apps/ios/SimpleX NSE/ConcurrentQueue.swift b/apps/ios/SimpleX NSE/ConcurrentQueue.swift
deleted file mode 100644
index 274a683c00..0000000000
--- a/apps/ios/SimpleX NSE/ConcurrentQueue.swift	
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  ConcurrentQueue.swift
-//  SimpleX NSE
-//
-//  Created by Evgeny on 08/12/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-
-struct DequeueElement<T> {
-    var elementId: UUID?
-    var task: Task<T?, Never>
-}
-
-class ConcurrentQueue<T> {
-    private var queue: [T] = []
-    private var queueLock = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.concurrent-queue.lock.\(UUID())")
-    private var continuations = [(elementId: UUID, continuation: CheckedContinuation<T?, Never>)]()
-
-    func enqueue(_ el: T) {
-        resumeContinuation(el) { self.queue.append(el) }
-    }
-
-    func frontEnqueue(_ el: T) {
-        resumeContinuation(el) { self.queue.insert(el, at: 0) }
-    }
-
-    private func resumeContinuation(_ el: T, add: @escaping () -> Void) {
-        queueLock.sync {
-            if let (_, cont) = continuations.first {
-                continuations.remove(at: 0)
-                cont.resume(returning: el)
-            } else {
-                add()
-            }
-        }
-    }
-
-    func dequeue() -> DequeueElement<T> {
-        queueLock.sync {
-            if queue.isEmpty {
-                let elementId = UUID()
-                let task = Task {
-                    await withCheckedContinuation { cont in
-                        continuations.append((elementId, cont))
-                    }
-                }
-                return DequeueElement(elementId: elementId, task: task)
-            } else {
-                let el = queue.remove(at: 0)
-                return DequeueElement(task: Task { el })
-            }
-        }
-    }
-
-    func cancelDequeue(_ elementId: UUID) {
-        queueLock.sync {
-            let cancelled = continuations.filter { $0.elementId == elementId }
-            continuations.removeAll { $0.elementId == elementId }
-            cancelled.forEach { $0.continuation.resume(returning: nil) }
-        }
-    }
-}
diff --git a/apps/ios/SimpleX NSE/NotificationService.swift b/apps/ios/SimpleX NSE/NotificationService.swift
index 6f76781837..efd8f33dd8 100644
--- a/apps/ios/SimpleX NSE/NotificationService.swift	
+++ b/apps/ios/SimpleX NSE/NotificationService.swift	
@@ -22,110 +22,6 @@ let nseSuspendSchedule: SuspendSchedule = (2, 4)
 
 let fastNSESuspendSchedule: SuspendSchedule = (1, 1)
 
-typealias NtfStream = ConcurrentQueue<NSENotification>
-
-// Notifications are delivered via concurrent queues, as they are all received from chat controller in a single loop that
-// writes to ConcurrentQueue and when notification is processed, the instance of Notification service extension reads from the queue.
-// One queue per connection (entity) is used.
-// The concurrent queues allow read cancellation, to ensure that notifications are not lost in case the current thread completes
-// before expected notification is read (multiple notifications can be expected, because one notification can be delivered for several messages).
-actor PendingNtfs {
-    static let shared = PendingNtfs()
-    private var ntfStreams: [String: NtfStream] = [:]
-
-    func createStream(_ id: String) async {
-        logger.debug("NotificationService PendingNtfs.createStream: \(id)")
-        if ntfStreams[id] == nil {
-            ntfStreams[id] = ConcurrentQueue()
-            logger.debug("NotificationService PendingNtfs.createStream: created ConcurrentQueue")
-        }
-    }
-
-    func readStream(_ id: String, for nse: NotificationService, ntfInfo: NtfMessages) async {
-        logger.debug("NotificationService PendingNtfs.readStream: \(id) \(ntfInfo.ntfMessages.count)")
-        if !ntfInfo.user.showNotifications {
-            nse.setBestAttemptNtf(.empty)
-        }
-        if let s = ntfStreams[id] {
-            logger.debug("NotificationService PendingNtfs.readStream: has stream")
-            var expected = Set(ntfInfo.ntfMessages.map { $0.msgId })
-            logger.debug("NotificationService PendingNtfs.readStream: expecting: \(expected)")
-            var readCancelled = false
-            var dequeued: DequeueElement<NSENotification>?
-            nse.cancelRead = {
-                readCancelled = true
-                if let elementId = dequeued?.elementId {
-                    s.cancelDequeue(elementId)
-                }
-            }
-            while !readCancelled {
-                dequeued = s.dequeue()
-                if let ntf = await dequeued?.task.value {
-                    if readCancelled {
-                        logger.debug("NotificationService PendingNtfs.readStream: read cancelled, put ntf to queue front")
-                        s.frontEnqueue(ntf)
-                        break
-                    } else if case let .msgInfo(info) = ntf {
-                        let found = expected.remove(info.msgId)
-                        if found != nil {
-                            logger.debug("NotificationService PendingNtfs.readStream: msgInfo, last: \(expected.isEmpty)")
-                            if expected.isEmpty { break }
-                        } else if let msgTs = ntfInfo.msgTs, info.msgTs > msgTs {
-                            logger.debug("NotificationService PendingNtfs.readStream: unexpected msgInfo")
-                            s.frontEnqueue(ntf)
-                            break
-                        }
-                    } else if ntfInfo.user.showNotifications {
-                        logger.debug("NotificationService PendingNtfs.readStream: setting best attempt")
-                        nse.setBestAttemptNtf(ntf)
-                        if ntf.isCallInvitation { break }
-                    }
-                } else {
-                    break
-                }
-            }
-            nse.cancelRead = nil
-            logger.debug("NotificationService PendingNtfs.readStream: exiting")
-        }
-    }
-
-    func writeStream(_ id: String, _ ntf: NSENotification) async {
-        logger.debug("NotificationService PendingNtfs.writeStream: \(id)")
-        if let s = ntfStreams[id] {
-            logger.debug("NotificationService PendingNtfs.writeStream: writing ntf")
-            s.enqueue(ntf)
-        }
-    }
-}
-
-// The current implementation assumes concurrent notification delivery and uses semaphores
-// to process only one notification per connection (entity) at a time.
-class NtfStreamSemaphores {
-    static let shared = NtfStreamSemaphores()
-    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-semaphores.lock")
-    private var semaphores: [String: DispatchSemaphore] = [:]
-
-    func waitForStream(_ id: String) {
-        streamSemaphore(id, value: 0)?.wait()
-    }
-
-    func signalStreamReady(_ id: String) {
-        streamSemaphore(id, value: 1)?.signal()
-    }
-
-    // this function returns nil if semaphore is just created, so passed value shoud be coordinated with the desired end value of the semaphore
-    private func streamSemaphore(_ id: String, value: Int) -> DispatchSemaphore? {
-        NtfStreamSemaphores.queue.sync {
-            if let s = semaphores[id] {
-                return s
-            } else {
-                semaphores[id] = DispatchSemaphore(value: value)
-                return nil
-            }
-        }
-    }
-}
-
 enum NSENotification {
     case nse(UNMutableNotificationContent)
     case callkit(RcvCallInvitation)
@@ -149,7 +45,7 @@ class NSEThreads {
     static let shared = NSEThreads()
     private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
     private var allThreads: Set<UUID> = []
-    private var activeThreads: Set<UUID> = []
+    private var activeThreads: [(UUID, NotificationService)] = []
 
     func newThread() -> UUID {
         NSEThreads.queue.sync {
@@ -158,19 +54,42 @@ class NSEThreads {
         }
     }
 
-    func startThread(_ t: UUID) {
+    func startThread(_ t: UUID, _ service: NotificationService) {
         NSEThreads.queue.sync {
             if allThreads.contains(t) {
-                _ = activeThreads.insert(t)
+                activeThreads.append((t, service))
             } else {
                 logger.warning("NotificationService startThread: thread \(t) was removed before it started")
             }
         }
     }
 
+    func processNotification(_ id: ChatId, _ ntf: NSENotification) async -> Void {
+        var waitTime: Int64 = 5_000_000000
+        while waitTime > 0 {
+            if let (_, nse) = rcvEntityThread(id),
+               nse.shouldProcessNtf && nse.processReceivedNtf(ntf) {
+                break
+            } else {
+                try? await Task.sleep(nanoseconds: 10_000000)
+                waitTime -= 10_000000
+            }
+        }
+    }
+
+    private func rcvEntityThread(_ id: ChatId) -> (UUID, NotificationService)? {
+        NSEThreads.queue.sync {
+            activeThreads.first(where: { (_, nse) in nse.receiveEntityId == id })
+        }
+    }
+
     func endThread(_ t: UUID) -> Bool {
         NSEThreads.queue.sync {
-            let tActive = activeThreads.remove(t)
+            let tActive: UUID? = if let index = activeThreads.firstIndex(where: { $0.0 == t }) {
+                activeThreads.remove(at: index).0
+            } else {
+                nil
+            }
             let t = allThreads.remove(t)
             if tActive != nil && activeThreads.isEmpty {
                 return true
@@ -198,8 +117,11 @@ class NotificationService: UNNotificationServiceExtension {
     // thread is added to allThreads here - if thread did not start chat,
     // chat does not need to be suspended but NSE state still needs to be set to "suspended".
     var threadId: UUID? = NSEThreads.shared.newThread()
+    var notificationInfo: NtfMessages?
     var receiveEntityId: String?
-    var cancelRead: (() -> Void)?
+    var expectedMessages: Set<String> = []
+    // return true if the message is taken - it prevents sending it to another NotificationService instance for processing
+    var shouldProcessNtf = false
     var appSubscriber: AppSubscriber?
     var returnedSuspension = false
 
@@ -265,7 +187,7 @@ class NotificationService: UNNotificationServiceExtension {
            // check it here again
            appStateGroupDefault.get().inactive {
             // thread is added to activeThreads tracking set here - if thread started chat it needs to be suspended
-            if let t = threadId { NSEThreads.shared.startThread(t) }
+            if let t = threadId { NSEThreads.shared.startThread(t, self) }
             let dbStatus = startChat()
             if case .ok = dbStatus,
                let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
@@ -276,17 +198,11 @@ class NotificationService: UNNotificationServiceExtension {
                         ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
                         : .empty
                     )
-                    if let id = connEntity.id {
+                    if let id = connEntity.id, ntfInfo.msgTs != nil {
+                        notificationInfo = ntfInfo
                         receiveEntityId = id
-                        NtfStreamSemaphores.shared.waitForStream(id)
-                        if receiveEntityId != nil {
-                            Task {
-                                logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id)")
-                                await PendingNtfs.shared.createStream(id)
-                                await PendingNtfs.shared.readStream(id, for: self, ntfInfo: ntfInfo)
-                                deliverBestAttemptNtf()
-                            }
-                        }
+                        expectedMessages = Set(ntfInfo.ntfMessages.map { $0.msgId })
+                        shouldProcessNtf = true
                         return
                     }
                 }
@@ -302,6 +218,38 @@ class NotificationService: UNNotificationServiceExtension {
         deliverBestAttemptNtf(urgent: true)
     }
 
+    func processReceivedNtf(_ ntf: NSENotification) -> Bool {
+        guard let ntfInfo = notificationInfo, let msgTs = ntfInfo.msgTs else { return false }
+        if !ntfInfo.user.showNotifications {
+            self.setBestAttemptNtf(.empty)
+        }
+        if case let .msgInfo(info) = ntf {
+            let found = expectedMessages.remove(info.msgId)
+            if found != nil {
+                logger.debug("NotificationService processNtf: msgInfo, last: \(self.expectedMessages.isEmpty)")
+                if expectedMessages.isEmpty {
+                    self.deliverBestAttemptNtf()
+                }
+                return true
+            } else if info.msgTs > msgTs {
+                logger.debug("NotificationService processNtf: unexpected msgInfo, let other instance to process it, stopping this one")
+                self.deliverBestAttemptNtf()
+                return false
+            } else {
+                logger.debug("NotificationService processNtf: unknown message, let other instance to process it")
+                return false
+            }
+        } else if ntfInfo.user.showNotifications {
+            logger.debug("NotificationService processNtf: setting best attempt")
+            self.setBestAttemptNtf(ntf)
+            if ntf.isCallInvitation {
+                self.deliverBestAttemptNtf()
+            }
+            return true
+        }
+        return false
+    }
+
     func setBadgeCount() {
         badgeCount = ntfBadgeCountGroupDefault.get() + 1
         ntfBadgeCountGroupDefault.set(badgeCount)
@@ -323,14 +271,9 @@ class NotificationService: UNNotificationServiceExtension {
 
     private func deliverBestAttemptNtf(urgent: Bool = false) {
         logger.debug("NotificationService.deliverBestAttemptNtf")
-        if let cancel = cancelRead {
-            cancelRead = nil
-            cancel()
-        }
-        if let id = receiveEntityId {
-            receiveEntityId = nil
-            NtfStreamSemaphores.shared.signalStreamReady(id)
-        }
+        // stop processing other messages
+        shouldProcessNtf = false
+
         let suspend: Bool
         if let t = threadId {
             threadId = nil
@@ -572,7 +515,7 @@ func chatSuspended() {
 }
 
 // A single loop is used per Notification service extension process to receive and process all messages depending on the NSE state
-// If the extension is not active yet, or suspended/suspending, or the app is running, the notifications will no be received.
+// If the extension is not active yet, or suspended/suspending, or the app is running, the notifications will not be received.
 func receiveMessages() async {
     logger.debug("NotificationService receiveMessages")
     while true {
@@ -591,8 +534,7 @@ func receiveMessages() async {
             logger.debug("NotificationService receiveMsg: message")
             if let (id, ntf) = await receivedMsgNtf(msg) {
                 logger.debug("NotificationService receiveMsg: notification")
-                await PendingNtfs.shared.createStream(id)
-                await PendingNtfs.shared.writeStream(id, ntf)
+                await NSEThreads.shared.processNotification(id, ntf)
             }
         }
     }
diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj
index 9e43249650..6443c21b9e 100644
--- a/apps/ios/SimpleX.xcodeproj/project.pbxproj
+++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj
@@ -36,11 +36,6 @@
 		5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C35CFC727B2782E00FB6C6D /* BGManager.swift */; };
 		5C35CFCB27B2E91D00FB6C6D /* NtfManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */; };
 		5C36027327F47AD5009F19D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C36027227F47AD5009F19D9 /* AppDelegate.swift */; };
-		5C371E742BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C371E6F2BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a */; };
-		5C371E752BACC5D600100AD3 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C371E702BACC5D600100AD3 /* libgmpxx.a */; };
-		5C371E762BACC5D600100AD3 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C371E712BACC5D600100AD3 /* libffi.a */; };
-		5C371E772BACC5D600100AD3 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C371E722BACC5D600100AD3 /* libgmp.a */; };
-		5C371E782BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C371E732BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a */; };
 		5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
 		5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
 		5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */; };
@@ -116,6 +111,11 @@
 		5CC2C0FC2809BF11000C35E3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FA2809BF11000C35E3 /* Localizable.strings */; };
 		5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */; };
 		5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */; };
+		5CC932F52BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC932F02BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a */; };
+		5CC932F62BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC932F12BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a */; };
+		5CC932F72BBDD9FA008A1EB6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC932F22BBDD9F9008A1EB6 /* libgmpxx.a */; };
+		5CC932F82BBDD9FA008A1EB6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC932F32BBDD9F9008A1EB6 /* libgmp.a */; };
+		5CC932F92BBDD9FA008A1EB6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CC932F42BBDD9F9008A1EB6 /* libffi.a */; };
 		5CCB939C297EFCB100399E78 /* NavStackCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCB939B297EFCB100399E78 /* NavStackCompat.swift */; };
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
@@ -144,7 +144,6 @@
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
-		5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
@@ -291,11 +290,6 @@
 		5C371E4E2BA9AAA200100AD3 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C371E4F2BA9AB6400100AD3 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = "hu.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C371E502BA9AB6400100AD3 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		5C371E6F2BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5C371E702BACC5D600100AD3 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C371E712BACC5D600100AD3 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5C371E722BACC5D600100AD3 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C371E732BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a"; sourceTree = "<group>"; };
 		5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetermineWidth.swift; sourceTree = "<group>"; };
 		5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = "<group>"; };
 		5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectDesktopView.swift; sourceTree = "<group>"; };
@@ -408,6 +402,11 @@
 		5CC2C0FB2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CC2C0FE2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIRcvDecryptionError.swift; sourceTree = "<group>"; };
+		5CC932F02BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5CC932F12BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a"; sourceTree = "<group>"; };
+		5CC932F22BBDD9F9008A1EB6 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CC932F32BBDD9F9008A1EB6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CC932F42BBDD9F9008A1EB6 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CCB939B297EFCB100399E78 /* NavStackCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavStackCompat.swift; sourceTree = "<group>"; };
 		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
 		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
@@ -437,7 +436,6 @@
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
-		5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrentQueue.swift; sourceTree = "<group>"; };
 		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
 		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
@@ -523,12 +521,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C371E752BACC5D600100AD3 /* libgmpxx.a in Frameworks */,
-				5C371E742BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C371E782BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a in Frameworks */,
-				5C371E762BACC5D600100AD3 /* libffi.a in Frameworks */,
-				5C371E772BACC5D600100AD3 /* libgmp.a in Frameworks */,
+				5CC932F72BBDD9FA008A1EB6 /* libgmpxx.a in Frameworks */,
+				5CC932F62BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a in Frameworks */,
+				5CC932F52BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a in Frameworks */,
+				5CC932F92BBDD9FA008A1EB6 /* libffi.a in Frameworks */,
+				5CC932F82BBDD9FA008A1EB6 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -592,11 +590,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C371E712BACC5D600100AD3 /* libffi.a */,
-				5C371E722BACC5D600100AD3 /* libgmp.a */,
-				5C371E702BACC5D600100AD3 /* libgmpxx.a */,
-				5C371E6F2BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv-ghc9.6.3.a */,
-				5C371E732BACC5D600100AD3 /* libHSsimplex-chat-5.6.0.4-E0iWSIg8fcR48og4na41Dv.a */,
+				5CC932F42BBDD9F9008A1EB6 /* libffi.a */,
+				5CC932F32BBDD9F9008A1EB6 /* libgmp.a */,
+				5CC932F22BBDD9F9008A1EB6 /* libgmpxx.a */,
+				5CC932F02BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto-ghc9.6.3.a */,
+				5CC932F12BBDD9F9008A1EB6 /* libHSsimplex-chat-5.6.1.1-KSjuZv7tE7cHRWd28F1Zto.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -800,7 +798,6 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
-				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -1285,7 +1282,6 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
-				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1445,6 +1441,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1506,6 +1503,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1534,12 +1532,16 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
+				GCC_OPTIMIZATION_LEVEL = s;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
@@ -1558,11 +1560,13 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES_THIN;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1577,12 +1581,16 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
-				ENABLE_PREVIEWS = YES;
+				ENABLE_CODE_COVERAGE = NO;
+				ENABLE_PREVIEWS = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
@@ -1601,7 +1609,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1657,12 +1666,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SimpleX NSE/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "SimpleX NSE";
@@ -1673,13 +1685,15 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Osize";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1689,12 +1703,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
+				ENABLE_CODE_COVERAGE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "SimpleX NSE/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "SimpleX NSE";
@@ -1705,13 +1722,15 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Osize";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALIDATE_PRODUCT = YES;
@@ -1723,14 +1742,17 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 SimpleX Chat. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1748,7 +1770,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1757,6 +1780,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = ./SimpleXChat/SimpleX.h;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1769,14 +1793,17 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 204;
+				CURRENT_PROJECT_VERSION = 206;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
+				ENABLE_CODE_COVERAGE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 SimpleX Chat. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1794,7 +1821,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.6;
+				LLVM_LTO = YES;
+				MARKETING_VERSION = 5.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1803,6 +1831,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = ./SimpleXChat/SimpleX.h;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
diff --git a/apps/ios/SimpleXChat/APITypes.swift b/apps/ios/SimpleXChat/APITypes.swift
index f55c69a349..b18022cfec 100644
--- a/apps/ios/SimpleXChat/APITypes.swift
+++ b/apps/ios/SimpleXChat/APITypes.swift
@@ -557,11 +557,6 @@ public enum ChatResponse: Decodable, Error {
     case contactRequestRejected(user: UserRef)
     case contactUpdated(user: UserRef, toContact: Contact)
     case groupMemberUpdated(user: UserRef, groupInfo: GroupInfo, fromMember: GroupMember, toMember: GroupMember)
-    // TODO remove events below
-    case contactsSubscribed(server: String, contactRefs: [ContactRef])
-    case contactsDisconnected(server: String, contactRefs: [ContactRef])
-    case contactSubSummary(user: UserRef, contactSubscriptions: [ContactSubStatus])
-    // TODO remove events above
     case networkStatus(networkStatus: NetworkStatus, connections: [String])
     case networkStatuses(user_: UserRef?, networkStatuses: [ConnNetworkStatus])
     case groupSubscribed(user: UserRef, groupInfo: GroupRef)
@@ -724,9 +719,6 @@ public enum ChatResponse: Decodable, Error {
             case .contactRequestRejected: return "contactRequestRejected"
             case .contactUpdated: return "contactUpdated"
             case .groupMemberUpdated: return "groupMemberUpdated"
-            case .contactsSubscribed: return "contactsSubscribed"
-            case .contactsDisconnected: return "contactsDisconnected"
-            case .contactSubSummary: return "contactSubSummary"
             case .networkStatus: return "networkStatus"
             case .networkStatuses: return "networkStatuses"
             case .groupSubscribed: return "groupSubscribed"
@@ -885,9 +877,6 @@ public enum ChatResponse: Decodable, Error {
             case .contactRequestRejected: return noDetails
             case let .contactUpdated(u, toContact): return withUser(u, String(describing: toContact))
             case let .groupMemberUpdated(u, groupInfo, fromMember, toMember): return withUser(u, "groupInfo: \(groupInfo)\nfromMember: \(fromMember)\ntoMember: \(toMember)")
-            case let .contactsSubscribed(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
-            case let .contactsDisconnected(server, contactRefs): return "server: \(server)\ncontacts:\n\(String(describing: contactRefs))"
-            case let .contactSubSummary(u, contactSubscriptions): return withUser(u, String(describing: contactSubscriptions))
             case let .networkStatus(status, conns): return "networkStatus: \(String(describing: status))\nconnections: \(String(describing: conns))"
             case let .networkStatuses(u, statuses): return withUser(u, String(describing: statuses))
             case let .groupSubscribed(u, groupInfo): return withUser(u, String(describing: groupInfo))
@@ -1827,6 +1816,7 @@ public enum AgentErrorType: Decodable {
     case BROKER(brokerAddress: String, brokerErr: BrokerErrorType)
     case AGENT(agentErr: SMPAgentError)
     case INTERNAL(internalErr: String)
+    case CRITICAL(offerRestart: Bool, criticalErr: String)
     case INACTIVE
 }
 
@@ -1878,6 +1868,8 @@ public enum XFTPErrorType: Decodable {
     case NO_FILE
     case HAS_FILE
     case FILE_IO
+    case TIMEOUT
+    case REDIRECT(redirectError: String)
     case INTERNAL
 }
 
@@ -1885,6 +1877,8 @@ public enum RCErrorType: Decodable {
     case `internal`(internalErr: String)
     case identity
     case noLocalAddress
+    case newController
+    case notDiscovered
     case tlsStartFailed
     case exception(exception: String)
     case ctrlAuth
@@ -1910,6 +1904,7 @@ public enum ProtocolTransportError: Decodable {
     case badBlock
     case largeMsg
     case badSession
+    case noServerAuth
     case handshake(handshakeErr: SMPHandshakeError)
 }
 
@@ -1917,6 +1912,7 @@ public enum SMPHandshakeError: Decodable {
     case PARSE
     case VERSION
     case IDENTITY
+    case BAD_AUTH
 }
 
 public enum SMPAgentError: Decodable {
@@ -1938,10 +1934,13 @@ public enum RemoteCtrlError: Decodable {
     case badState
     case busy
     case timeout
+    case noKnownControllers
+    case badController
     case disconnected(remoteCtrlId: Int64, reason: String)
     case badInvitation
     case badVersion(appVersion: String)
-//    case protocolError(protocolError: RemoteProtocolError)
+    case hTTP2Error(http2Error: String)
+    case protocolError
 }
 
 public struct MigrationFileLinkData: Codable {
diff --git a/apps/ios/SimpleXChat/AppGroup.swift b/apps/ios/SimpleXChat/AppGroup.swift
index 4fbe78dc7a..df4de134c2 100644
--- a/apps/ios/SimpleXChat/AppGroup.swift
+++ b/apps/ios/SimpleXChat/AppGroup.swift
@@ -197,7 +197,7 @@ public let confirmDBUpgradesGroupDefault = BoolDefault(defaults: groupDefaults,
 
 public let callKitEnabledGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CALL_KIT_ENABLED)
 
-public let pqExperimentalEnabledDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)
+public let pqExperimentalEnabledDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED)
 
 public class DateDefault {
     var defaults: UserDefaults
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index b74a2517c7..ed62b5c9ac 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -2120,7 +2120,7 @@ public enum ConnectionEntity: Decodable {
     public var id: String? {
         switch self {
         case let .rcvDirectMsgConnection(contact):
-            return contact?.id ?? nil
+            return contact?.id
         case let .rcvGroupMsgConnection(_, groupMember):
             return groupMember.id
         case let .userContactConnection(userContact):
@@ -3209,6 +3209,14 @@ public enum MsgContent: Equatable {
         }
     }
 
+    public var isImageOrVideo: Bool {
+        switch self {
+        case .image: true
+        case .video: true
+        default: false
+        }
+    }
+
     var cmdString: String {
         "json \(encodeJSON(self))"
     }
diff --git a/apps/ios/bg.lproj/Localizable.strings b/apps/ios/bg.lproj/Localizable.strings
index 580c20d65a..44b4c6de9f 100644
--- a/apps/ios/bg.lproj/Localizable.strings
+++ b/apps/ios/bg.lproj/Localizable.strings
@@ -377,6 +377,9 @@
 /* member role */
 "admin" = "админ";
 
+/* No comment provided by engineer. */
+"Admins can block a member for all." = "Администраторите могат да блокират член за всички.";
+
 /* No comment provided by engineer. */
 "Admins can create the links to join groups." = "Админите могат да създадат линкове за присъединяване към групи.";
 
@@ -416,6 +419,9 @@
 /* No comment provided by engineer. */
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "Всички ваши контакти ще останат свързани. Актуализацията на профила ще бъде изпратена до вашите контакти.";
 
+/* No comment provided by engineer. */
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Всички ваши контакти, разговори и файлове ще бъдат сигурно криптирани и качени на парчета в конфигурираните XFTP релета.";
+
 /* No comment provided by engineer. */
 "Allow" = "Позволи";
 
@@ -497,6 +503,9 @@
 /* No comment provided by engineer. */
 "App build: %@" = "Компилация на приложението: %@";
 
+/* No comment provided by engineer. */
+"App data migration" = "Миграция на данните от приложението";
+
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Приложението криптира нови локални файлове (с изключение на видеоклипове).";
 
@@ -518,6 +527,15 @@
 /* No comment provided by engineer. */
 "Appearance" = "Изглед";
 
+/* No comment provided by engineer. */
+"Apply" = "Приложи";
+
+/* No comment provided by engineer. */
+"Archive and upload" = "Архивиране и качване";
+
+/* No comment provided by engineer. */
+"Archiving database" = "Архивиране на база данни";
+
 /* No comment provided by engineer. */
 "Attach" = "Прикачи";
 
@@ -665,6 +683,9 @@
 /* No comment provided by engineer. */
 "Cancel" = "Отказ";
 
+/* No comment provided by engineer. */
+"Cancel migration" = "Отмени миграцията";
+
 /* feature offered item */
 "cancelled %@" = "отменен %@";
 
@@ -744,6 +765,9 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Чатът е спрян. Ако вече сте използвали тази база данни на друго устройство, трябва да я прехвърлите обратно, преди да стартирате чата отново.";
 
+/* No comment provided by engineer. */
+"Chat migrated!" = "Чатът е мигриран!";
+
 /* No comment provided by engineer. */
 "Chat preferences" = "Чат настройки";
 
@@ -801,6 +825,9 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Потвърди актуализаациите на базата данни";
 
+/* No comment provided by engineer. */
+"Confirm network settings" = "Потвърди мрежовите настройки";
+
 /* No comment provided by engineer. */
 "Confirm new passphrase…" = "Потвърди новата парола…";
 
@@ -810,6 +837,12 @@
 /* No comment provided by engineer. */
 "Confirm password" = "Потвърди парола";
 
+/* No comment provided by engineer. */
+"Confirm that you remember database passphrase to migrate it." = "Потвърдете, че помните паролата на базата данни, преди да я мигрирате.";
+
+/* No comment provided by engineer. */
+"Confirm upload" = "Потвърди качването";
+
 /* server test step */
 "Connect" = "Свързване";
 
@@ -1008,6 +1041,9 @@
 /* No comment provided by engineer. */
 "Created on %@" = "Създаден на %@";
 
+/* No comment provided by engineer. */
+"Creating archive link" = "Създаване на архивен линк";
+
 /* No comment provided by engineer. */
 "Creating link…" = "Линкът се създава…";
 
@@ -1155,6 +1191,9 @@
 /* No comment provided by engineer. */
 "Delete database" = "Изтрий базата данни";
 
+/* No comment provided by engineer. */
+"Delete database from this device" = "Изтриване на базата данни от това устройство";
+
 /* server test step */
 "Delete file" = "Изтрий файл";
 
@@ -1347,9 +1386,18 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Понижи версията и отвори чата";
 
+/* No comment provided by engineer. */
+"Download failed" = "Неуспешно изтегляне";
+
 /* server test step */
 "Download file" = "Свали файл";
 
+/* No comment provided by engineer. */
+"Downloading archive" = "Архива се изтегля";
+
+/* No comment provided by engineer. */
+"Downloading link details" = "Подробности за линка се изтеглят";
+
 /* No comment provided by engineer. */
 "Duplicate display name!" = "Дублирано име!";
 
@@ -1383,6 +1431,9 @@
 /* No comment provided by engineer. */
 "Enable for all" = "Активиране за всички";
 
+/* No comment provided by engineer. */
+"Enable in direct chats (BETA)!" = "Активиране в личните чатове (БЕТА)!";
+
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "Активирай незабавни известия?";
 
@@ -1497,6 +1548,9 @@
 /* No comment provided by engineer. */
 "Enter Passcode" = "Въведете kодa за достъп";
 
+/* No comment provided by engineer. */
+"Enter passphrase" = "Въведи парола";
+
 /* No comment provided by engineer. */
 "Enter passphrase…" = "Въведи парола…";
 
@@ -1536,6 +1590,9 @@
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Грешка при добавяне на член(ове)";
 
+/* No comment provided by engineer. */
+"Error allowing contact PQ encryption" = "Грешка при разрешаване на PQ криптиране за контакт";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Грешка при промяна на адреса";
 
@@ -1590,6 +1647,9 @@
 /* No comment provided by engineer. */
 "Error deleting user profile" = "Грешка при изтриване на потребителския профил";
 
+/* No comment provided by engineer. */
+"Error downloading the archive" = "Грешка при изтеглянето на архива";
+
 /* No comment provided by engineer. */
 "Error enabling delivery receipts!" = "Грешка при активирането на потвърждениeто за доставка!";
 
@@ -1635,6 +1695,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Грешка при запазване на парола в Кeychain";
 
+/* when migrating */
+"Error saving settings" = "Грешка при запазване на настройките";
+
 /* No comment provided by engineer. */
 "Error saving user password" = "Грешка при запазване на потребителска парола";
 
@@ -1677,6 +1740,12 @@
 /* No comment provided by engineer. */
 "Error updating user privacy" = "Грешка при актуализиране на поверителността на потребителя";
 
+/* No comment provided by engineer. */
+"Error uploading the archive" = "Грешка при качването на архива";
+
+/* No comment provided by engineer. */
+"Error verifying passphrase:" = "Грешка при проверката на паролата:";
+
 /* No comment provided by engineer. */
 "Error: " = "Грешка: ";
 
@@ -1710,6 +1779,9 @@
 /* No comment provided by engineer. */
 "Exported database archive." = "Експортиран архив на базата данни.";
 
+/* No comment provided by engineer. */
+"Exported file doesn't exist" = "Експортираният файл не съществува";
+
 /* No comment provided by engineer. */
 "Exporting database archive…" = "Експортиране на архив на базата данни…";
 
@@ -1752,6 +1824,12 @@
 /* No comment provided by engineer. */
 "Filter unread and favorite chats." = "Филтрирайте непрочетените и любимите чатове.";
 
+/* No comment provided by engineer. */
+"Finalize migration" = "Завърши миграцията";
+
+/* No comment provided by engineer. */
+"Finalize migration on another device." = "Завършете миграцията на другото устройство.";
+
 /* No comment provided by engineer. */
 "Finally, we have them! 🚀" = "Най-накрая ги имаме! 🚀";
 
@@ -1935,6 +2013,9 @@
 /* No comment provided by engineer. */
 "How to use your servers" = "Как да използвате вашите сървъри";
 
+/* No comment provided by engineer. */
+"Hungarian interface" = "Унгарски интерфейс";
+
 /* No comment provided by engineer. */
 "ICE servers (one per line)" = "ICE сървъри (по един на ред)";
 
@@ -1974,6 +2055,12 @@
 /* No comment provided by engineer. */
 "Import database" = "Импортиране на база данни";
 
+/* No comment provided by engineer. */
+"Import failed" = "Неуспешно импортиране";
+
+/* No comment provided by engineer. */
+"Importing archive" = "Импортиране на архив";
+
 /* No comment provided by engineer. */
 "Improved message delivery" = "Подобрена доставка на съобщения";
 
@@ -1983,6 +2070,9 @@
 /* No comment provided by engineer. */
 "Improved server configuration" = "Подобрена конфигурация на сървъра";
 
+/* No comment provided by engineer. */
+"In order to continue, chat should be stopped." = "За да продължите, чатът трябва да бъде спрян.";
+
 /* No comment provided by engineer. */
 "In reply to" = "В отговор на";
 
@@ -2067,6 +2157,9 @@
 /* No comment provided by engineer. */
 "Invalid link" = "Невалиден линк";
 
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Невалидно потвърждение за мигриране";
+
 /* No comment provided by engineer. */
 "Invalid name!" = "Невалидно име!";
 
@@ -2331,6 +2424,9 @@
 /* No comment provided by engineer. */
 "Message text" = "Текст на съобщението";
 
+/* No comment provided by engineer. */
+"Message too large" = "Съобщението е твърде голямо";
+
 /* No comment provided by engineer. */
 "Messages" = "Съобщения";
 
@@ -2340,9 +2436,30 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "Съобщенията от %@ ще бъдат показани!";
 
+/* No comment provided by engineer. */
+"Migrate device" = "Мигрирай устройството";
+
+/* No comment provided by engineer. */
+"Migrate from another device" = "Мигриране от друго устройство";
+
+/* No comment provided by engineer. */
+"Migrate here" = "Мигрирай тук";
+
+/* No comment provided by engineer. */
+"Migrate to another device" = "Миграция към друго устройство";
+
+/* No comment provided by engineer. */
+"Migrate to another device via QR code." = "Мигрирайте към друго устройство чрез QR код.";
+
+/* No comment provided by engineer. */
+"Migrating" = "Мигриране";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "Архивът на базата данни се мигрира…";
 
+/* No comment provided by engineer. */
+"Migration complete" = "Миграцията е завършена";
+
 /* No comment provided by engineer. */
 "Migration error:" = "Грешка при мигриране:";
 
@@ -2600,6 +2717,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Отвори група";
 
+/* authentication reason */
+"Open migration to another device" = "Отвори миграцията към друго устройство";
+
 /* No comment provided by engineer. */
 "Open Settings" = "Отвори настройки";
 
@@ -2612,9 +2732,15 @@
 /* No comment provided by engineer. */
 "Opening app…" = "Приложението се отваря…";
 
+/* No comment provided by engineer. */
+"Or paste archive link" = "Или постави архивен линк";
+
 /* No comment provided by engineer. */
 "Or scan QR code" = "Или сканирай QR код";
 
+/* No comment provided by engineer. */
+"Or securely share this file link" = "Или сигурно споделете този линк към файла";
+
 /* No comment provided by engineer. */
 "Or show this code" = "Или покажи този код";
 
@@ -2666,6 +2792,9 @@
 /* message decrypt error item */
 "Permanent decryption error" = "Постоянна грешка при декриптиране";
 
+/* No comment provided by engineer. */
+"Picture-in-picture calls" = "Обаждания \"картина в картина\"";
+
 /* No comment provided by engineer. */
 "PING count" = "PING бройка";
 
@@ -2684,6 +2813,9 @@
 /* No comment provided by engineer. */
 "Please check yours and your contact preferences." = "Моля, проверете вашите настройки и тези вашия за контакт.";
 
+/* No comment provided by engineer. */
+"Please confirm that network settings are correct for this device." = "Моля, потвърдете, че мрежовите настройки са правилни за това устройство.";
+
 /* No comment provided by engineer. */
 "Please contact developers.\nError: %@" = "Моля, свържете се с разработчиците.\nГрешка: %@";
 
@@ -2717,6 +2849,9 @@
 /* server test error */
 "Possibly, certificate fingerprint in server address is incorrect" = "Въжможно е пръстовият отпечатък на сертификата в адреса на сървъра да е неправилен";
 
+/* No comment provided by engineer. */
+"Post-quantum E2EE" = "Постквантово E2EE";
+
 /* No comment provided by engineer. */
 "Preserve the last message draft, with attachments." = "Запазете последната чернова на съобщението с прикачени файлове.";
 
@@ -2798,6 +2933,15 @@
 /* No comment provided by engineer. */
 "Push notifications" = "Push известия";
 
+/* No comment provided by engineer. */
+"Push server" = "Push сървър";
+
+/* chat item text */
+"quantum resistant e2e encryption" = "квантово устойчиво e2e криптиране";
+
+/* No comment provided by engineer. */
+"Quantum resistant encryption" = "Квантово устойчиво криптиране";
+
 /* No comment provided by engineer. */
 "Rate the app" = "Оценете приложението";
 
@@ -2933,9 +3077,18 @@
 /* No comment provided by engineer. */
 "Repeat connection request?" = "Изпрати отново заявката за свързване?";
 
+/* No comment provided by engineer. */
+"Repeat download" = "Повтори изтеглянето";
+
+/* No comment provided by engineer. */
+"Repeat import" = "Повтори импортирането";
+
 /* No comment provided by engineer. */
 "Repeat join request?" = "Изпрати отново заявката за присъединяване?";
 
+/* No comment provided by engineer. */
+"Repeat upload" = "Повтори качването";
+
 /* chat item action */
 "Reply" = "Отговори";
 
@@ -2993,6 +3146,9 @@
 /* No comment provided by engineer. */
 "Run chat" = "Стартиране на чат";
 
+/* No comment provided by engineer. */
+"Safer groups" = "По-безопасни групи";
+
 /* chat item action */
 "Save" = "Запази";
 
@@ -3233,6 +3389,9 @@
 /* No comment provided by engineer. */
 "Set passcode" = "Задай kод за достъп";
 
+/* No comment provided by engineer. */
+"Set passphrase" = "Задаване на парола";
+
 /* No comment provided by engineer. */
 "Set passphrase to export" = "Задай парола за експортиране";
 
@@ -3278,6 +3437,9 @@
 /* No comment provided by engineer. */
 "Show preview" = "Показване на визуализация";
 
+/* No comment provided by engineer. */
+"Show QR code" = "Покажи QR код";
+
 /* No comment provided by engineer. */
 "Show:" = "Покажи:";
 
@@ -3338,6 +3500,9 @@
 /* notification title */
 "Somebody" = "Някой";
 
+/* chat item text */
+"standard end-to-end encryption" = "стандартно криптиране от край до край";
+
 /* No comment provided by engineer. */
 "Start chat" = "Започни чат";
 
@@ -3353,6 +3518,9 @@
 /* No comment provided by engineer. */
 "Stop" = "Спри";
 
+/* No comment provided by engineer. */
+"Stop chat" = "Спри чата";
+
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "Спрете чата, за да активирате действията с базата данни";
 
@@ -3380,6 +3548,9 @@
 /* authentication reason */
 "Stop SimpleX" = "Спри SimpleX";
 
+/* No comment provided by engineer. */
+"Stopping chat" = "Спиране на чата";
+
 /* No comment provided by engineer. */
 "strike" = "зачеркнат";
 
@@ -3530,6 +3701,12 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Това действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.";
 
+/* E2EE info chat item */
+"This chat is protected by end-to-end encryption." = "Този чат е защитен чрез криптиране от край до край.";
+
+/* E2EE info chat item */
+"This chat is protected by quantum resistant end-to-end encryption." = "Този чат е защитен от квантово устойчиво криптиране от край до край.";
+
 /* notification title */
 "this contact" = "този контакт";
 
@@ -3722,9 +3899,15 @@
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Актуализирай и отвори чата";
 
+/* No comment provided by engineer. */
+"Upload failed" = "Неуспешно качване";
+
 /* server test step */
 "Upload file" = "Качи файл";
 
+/* No comment provided by engineer. */
+"Uploading archive" = "Архивът се качва";
+
 /* No comment provided by engineer. */
 "Use .onion hosts" = "Използвай .onion хостове";
 
@@ -3755,6 +3938,9 @@
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Използвай сървърите на SimpleX Chat?";
 
+/* No comment provided by engineer. */
+"Use the app while in the call." = "Използвайте приложението по време на разговора.";
+
 /* No comment provided by engineer. */
 "User profile" = "Потребителски профил";
 
@@ -3782,6 +3968,12 @@
 /* No comment provided by engineer. */
 "Verify connections" = "Потвърждение за свързване";
 
+/* No comment provided by engineer. */
+"Verify database passphrase" = "Проверете паролата на базата данни";
+
+/* No comment provided by engineer. */
+"Verify passphrase" = "Провери паролата";
+
 /* No comment provided by engineer. */
 "Verify security code" = "Потвърди кода за сигурност";
 
@@ -3860,6 +4052,9 @@
 /* No comment provided by engineer. */
 "wants to connect to you!" = "иска да се свърже с вас!";
 
+/* No comment provided by engineer. */
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Внимание: стартирането на чата на множество устройства не се поддържа и ще доведе до неуспешно изпращане на съобщения";
+
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Предупреждение: Може да загубите някои данни!";
 
@@ -3875,6 +4070,9 @@
 /* No comment provided by engineer. */
 "Welcome message" = "Съобщение при посрещане";
 
+/* No comment provided by engineer. */
+"Welcome message is too long" = "Съобщението при посрещане е твърде дълго";
+
 /* No comment provided by engineer. */
 "What's new" = "Какво е новото";
 
@@ -3971,6 +4169,9 @@
 /* No comment provided by engineer. */
 "You can enable them later via app Privacy & Security settings." = "Можете да ги активирате по-късно през настройките за \"Поверителност и сигурност\" на приложението.";
 
+/* No comment provided by engineer. */
+"You can give another try." = "Можете да опитате още веднъж.";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "Можете да скриете или заглушите известията за потребителски профил - плъзнете надясно.";
 
diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings
index 7074a4ee27..e2cfcee022 100644
--- a/apps/ios/de.lproj/Localizable.strings
+++ b/apps/ios/de.lproj/Localizable.strings
@@ -390,7 +390,7 @@
 "admin" = "Admin";
 
 /* No comment provided by engineer. */
-"Admins can block a member for all." = "Administratoren können für ein Mitglied alle Funktionen blockieren.";
+"Admins can block a member for all." = "Administratoren können ein Gruppenmitglied für Alle blockieren.";
 
 /* No comment provided by engineer. */
 "Admins can create the links to join groups." = "Administratoren können Links für den Beitritt zu Gruppen erzeugen.";
@@ -853,7 +853,7 @@
 "Confirm password" = "Passwort bestätigen";
 
 /* No comment provided by engineer. */
-"Confirm that you remember database passphrase to migrate it." = "Für die Migration bestätigen Sie bitte, dass Sie sich an das Datenbank-Passwort erinnern.";
+"Confirm that you remember database passphrase to migrate it." = "Bitte bestätigen Sie für die Migration, dass Sie sich an Ihr Datenbank-Passwort erinnern.";
 
 /* No comment provided by engineer. */
 "Confirm upload" = "Hochladen bestätigen";
@@ -2470,7 +2470,7 @@
 "Migrate to another device" = "Auf ein anderes Gerät migrieren";
 
 /* No comment provided by engineer. */
-"Migrate to another device via QR code." = "Über einen QR-Code auf ein anderes Gerät migrieren.";
+"Migrate to another device via QR code." = "Daten können über einen QR-Code auf ein anderes Gerät migriert werden.";
 
 /* No comment provided by engineer. */
 "Migrating" = "Migrieren";
@@ -3753,7 +3753,7 @@
 "This setting applies to messages in your current chat profile **%@**." = "Diese Einstellung gilt für Nachrichten in Ihrem aktuellen Chat-Profil **%@**.";
 
 /* No comment provided by engineer. */
-"To ask any questions and to receive updates:" = "Um Fragen zu stellen und Aktualisierungen zu erhalten:";
+"To ask any questions and to receive updates:" = "Um Fragen zu stellen und aktuelle Informationen zu erhalten:";
 
 /* No comment provided by engineer. */
 "To connect, your contact can scan QR code or use the link in the app." = "Um eine Verbindung herzustellen, kann Ihr Kontakt den QR-Code scannen oder den Link in der App verwenden.";
@@ -4359,7 +4359,7 @@
 "Your contacts can allow full message deletion." = "Ihre Kontakte können die unwiederbringliche Löschung von Nachrichten erlauben.";
 
 /* No comment provided by engineer. */
-"Your contacts will remain connected." = "Ihre Kontakte bleiben verbunden.";
+"Your contacts will remain connected." = "Ihre Kontakte bleiben weiterhin verbunden.";
 
 /* No comment provided by engineer. */
 "Your current chat database will be DELETED and REPLACED with the imported one." = "Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die Importierte ERSETZT.";
diff --git a/apps/ios/es.lproj/Localizable.strings b/apps/ios/es.lproj/Localizable.strings
index 7a60858bc1..7e82b77e2e 100644
--- a/apps/ios/es.lproj/Localizable.strings
+++ b/apps/ios/es.lproj/Localizable.strings
@@ -157,6 +157,9 @@
 /* No comment provided by engineer. */
 "%@ servers" = "Servidores %@";
 
+/* No comment provided by engineer. */
+"%@ uploaded" = "%@ cargado";
+
 /* notification title */
 "%@ wants to connect!" = "¡ %@ quiere contactar!";
 
@@ -852,6 +855,9 @@
 /* No comment provided by engineer. */
 "Confirm that you remember database passphrase to migrate it." = "Confirme que recuerda la frase secreta de la base de datos para migrarla.";
 
+/* No comment provided by engineer. */
+"Confirm upload" = "Confirmar subida";
+
 /* server test step */
 "Connect" = "Conectar";
 
@@ -1050,6 +1056,9 @@
 /* No comment provided by engineer. */
 "Created on %@" = "Creado en %@";
 
+/* No comment provided by engineer. */
+"Creating archive link" = "Creando enlace de archivo";
+
 /* No comment provided by engineer. */
 "Creating link…" = "Creando enlace…";
 
@@ -1197,6 +1206,9 @@
 /* No comment provided by engineer. */
 "Delete database" = "Eliminar base de datos";
 
+/* No comment provided by engineer. */
+"Delete database from this device" = "Eliminar base de datos de este dispositivo";
+
 /* server test step */
 "Delete file" = "Eliminar archivo";
 
@@ -1389,9 +1401,18 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Degradar y abrir Chat";
 
+/* No comment provided by engineer. */
+"Download failed" = "Error en la descarga";
+
 /* server test step */
 "Download file" = "Descargar archivo";
 
+/* No comment provided by engineer. */
+"Downloading archive" = "Descargando archivo";
+
+/* No comment provided by engineer. */
+"Downloading link details" = "Descargando detalles del enlace";
+
 /* No comment provided by engineer. */
 "Duplicate display name!" = "¡Nombre mostrado duplicado!";
 
@@ -1425,6 +1446,9 @@
 /* No comment provided by engineer. */
 "Enable for all" = "Activar para todos";
 
+/* No comment provided by engineer. */
+"Enable in direct chats (BETA)!" = "Activar en chats directos (BETA)!";
+
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "¿Activar notificación instantánea?";
 
@@ -1539,6 +1563,9 @@
 /* No comment provided by engineer. */
 "Enter Passcode" = "Introduce Código";
 
+/* No comment provided by engineer. */
+"Enter passphrase" = "Introducir frase de contraseña";
+
 /* No comment provided by engineer. */
 "Enter passphrase…" = "Introduce la contraseña…";
 
@@ -1578,6 +1605,9 @@
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Error al añadir miembro(s)";
 
+/* No comment provided by engineer. */
+"Error allowing contact PQ encryption" = "Error al permitir cifrado PQ al contacto";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Error al cambiar servidor";
 
@@ -1632,6 +1662,9 @@
 /* No comment provided by engineer. */
 "Error deleting user profile" = "Error al eliminar perfil";
 
+/* No comment provided by engineer. */
+"Error downloading the archive" = "Error al descargar el archivo";
+
 /* No comment provided by engineer. */
 "Error enabling delivery receipts!" = "¡Error al activar confirmaciones de entrega!";
 
@@ -1677,6 +1710,9 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Error al guardar contraseña en Keychain";
 
+/* when migrating */
+"Error saving settings" = "Error al guardar ajustes";
+
 /* No comment provided by engineer. */
 "Error saving user password" = "Error al guardar contraseña de usuario";
 
@@ -1719,6 +1755,12 @@
 /* No comment provided by engineer. */
 "Error updating user privacy" = "Error al actualizar privacidad de usuario";
 
+/* No comment provided by engineer. */
+"Error uploading the archive" = "Error al subir el archivo";
+
+/* No comment provided by engineer. */
+"Error verifying passphrase:" = "Error al verificar la frase de contraseña:";
+
 /* No comment provided by engineer. */
 "Error: " = "Error: ";
 
@@ -1752,6 +1794,9 @@
 /* No comment provided by engineer. */
 "Exported database archive." = "Archivo de base de datos exportado.";
 
+/* No comment provided by engineer. */
+"Exported file doesn't exist" = "El archivo exportado no existe";
+
 /* No comment provided by engineer. */
 "Exporting database archive…" = "Exportando base de datos…";
 
@@ -1794,6 +1839,12 @@
 /* No comment provided by engineer. */
 "Filter unread and favorite chats." = "Filtra chats no leídos y favoritos.";
 
+/* No comment provided by engineer. */
+"Finalize migration" = "Finalizar la migración";
+
+/* No comment provided by engineer. */
+"Finalize migration on another device." = "Finalizar la migración en otro dispositivo.";
+
 /* No comment provided by engineer. */
 "Finally, we have them! 🚀" = "¡Por fin los tenemos! 🚀";
 
@@ -1977,6 +2028,9 @@
 /* No comment provided by engineer. */
 "How to use your servers" = "Cómo usar los servidores";
 
+/* No comment provided by engineer. */
+"Hungarian interface" = "Interfaz húngara";
+
 /* No comment provided by engineer. */
 "ICE servers (one per line)" = "Servidores ICE (uno por línea)";
 
@@ -2016,6 +2070,12 @@
 /* No comment provided by engineer. */
 "Import database" = "Importar base de datos";
 
+/* No comment provided by engineer. */
+"Import failed" = "Error de importación";
+
+/* No comment provided by engineer. */
+"Importing archive" = "Importando archivo";
+
 /* No comment provided by engineer. */
 "Improved message delivery" = "Entrega de mensajes mejorada";
 
@@ -2025,6 +2085,9 @@
 /* No comment provided by engineer. */
 "Improved server configuration" = "Configuración del servidor mejorada";
 
+/* No comment provided by engineer. */
+"In order to continue, chat should be stopped." = "Para continuar, el chat debe ser interrumpido.";
+
 /* No comment provided by engineer. */
 "In reply to" = "En respuesta a";
 
@@ -2109,6 +2172,9 @@
 /* No comment provided by engineer. */
 "Invalid link" = "Enlace no válido";
 
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Confirmación de migración inválida";
+
 /* No comment provided by engineer. */
 "Invalid name!" = "¡Nombre no válido!";
 
@@ -2373,6 +2439,9 @@
 /* No comment provided by engineer. */
 "Message text" = "Contacto y texto";
 
+/* No comment provided by engineer. */
+"Message too large" = "Mensaje demasiado grande";
+
 /* No comment provided by engineer. */
 "Messages" = "Mensajes";
 
@@ -2382,9 +2451,36 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "¡Los mensajes de %@ serán mostrados!";
 
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Los mensajes, archivos y llamadas están protegidos por **cifrado de extremo a extremo** con perfecta confidencialidad, repudio y recuperación tras ataques.";
+
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Los mensajes, archivos y llamadas están protegidos por **cifrado de extremo a extremo resistente a la computación cuántica** con perfecta confidencialidad, repudio y recuperación tras ataques.";
+
+/* No comment provided by engineer. */
+"Migrate device" = "Migrar dispositivo";
+
+/* No comment provided by engineer. */
+"Migrate from another device" = "Migrar desde otro dispositivo";
+
+/* No comment provided by engineer. */
+"Migrate here" = "Migrar aquí";
+
+/* No comment provided by engineer. */
+"Migrate to another device" = "Migrar hacia otro dispositivo";
+
+/* No comment provided by engineer. */
+"Migrate to another device via QR code." = "Migrar hacia otro dispositivo mediante código QR.";
+
+/* No comment provided by engineer. */
+"Migrating" = "Migrando";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "Migrando base de datos…";
 
+/* No comment provided by engineer. */
+"Migration complete" = "Migración completada";
+
 /* No comment provided by engineer. */
 "Migration error:" = "Error de migración:";
 
@@ -2642,6 +2738,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Grupo abierto";
 
+/* authentication reason */
+"Open migration to another device" = "Abrir la migración hacia otro dispositivo";
+
 /* No comment provided by engineer. */
 "Open Settings" = "Abrir Configuración";
 
@@ -2654,9 +2753,15 @@
 /* No comment provided by engineer. */
 "Opening app…" = "Iniciando aplicación…";
 
+/* No comment provided by engineer. */
+"Or paste archive link" = "O pegar enlace del archivo";
+
 /* No comment provided by engineer. */
 "Or scan QR code" = "O escanear código QR";
 
+/* No comment provided by engineer. */
+"Or securely share this file link" = "O comparta de forma segura el enlace de este archivo";
+
 /* No comment provided by engineer. */
 "Or show this code" = "O mostrar este código";
 
@@ -2708,6 +2813,9 @@
 /* message decrypt error item */
 "Permanent decryption error" = "Error permanente descifrado";
 
+/* No comment provided by engineer. */
+"Picture-in-picture calls" = "Llamadas picture-in-picture";
+
 /* No comment provided by engineer. */
 "PING count" = "Contador PING";
 
@@ -2726,6 +2834,9 @@
 /* No comment provided by engineer. */
 "Please check yours and your contact preferences." = "Comprueba tus preferencias y las de tu contacto.";
 
+/* No comment provided by engineer. */
+"Please confirm that network settings are correct for this device." = "Por favor confirme que la configuración de red es correcta para este dispositivo.";
+
 /* No comment provided by engineer. */
 "Please contact developers.\nError: %@" = "Por favor, contacta con los desarrolladores.\nError: %@";
 
@@ -2759,6 +2870,9 @@
 /* server test error */
 "Possibly, certificate fingerprint in server address is incorrect" = "Posiblemente la huella digital del certificado en la dirección del servidor es incorrecta";
 
+/* No comment provided by engineer. */
+"Post-quantum E2EE" = "E2EE postcuántica";
+
 /* No comment provided by engineer. */
 "Preserve the last message draft, with attachments." = "Conserva el último borrador del mensaje con los datos adjuntos.";
 
@@ -2840,6 +2954,15 @@
 /* No comment provided by engineer. */
 "Push notifications" = "Notificaciones automáticas";
 
+/* No comment provided by engineer. */
+"Push server" = "Servidor push";
+
+/* chat item text */
+"quantum resistant e2e encryption" = "cifrado e2e resistente a la cuántica";
+
+/* No comment provided by engineer. */
+"Quantum resistant encryption" = "Cifrado resistente a la tecnología cuántica";
+
 /* No comment provided by engineer. */
 "Rate the app" = "Valora la aplicación";
 
@@ -2975,9 +3098,18 @@
 /* No comment provided by engineer. */
 "Repeat connection request?" = "¿Repetir solicitud de conexión?";
 
+/* No comment provided by engineer. */
+"Repeat download" = "Repetir descarga";
+
+/* No comment provided by engineer. */
+"Repeat import" = "Repetir importación";
+
 /* No comment provided by engineer. */
 "Repeat join request?" = "¿Repetir solicitud de admisión?";
 
+/* No comment provided by engineer. */
+"Repeat upload" = "Repetir la carga";
+
 /* chat item action */
 "Reply" = "Responder";
 
@@ -3035,6 +3167,9 @@
 /* No comment provided by engineer. */
 "Run chat" = "Ejecutar chat";
 
+/* No comment provided by engineer. */
+"Safer groups" = "Grupos más seguros";
+
 /* chat item action */
 "Save" = "Guardar";
 
@@ -3275,6 +3410,9 @@
 /* No comment provided by engineer. */
 "Set passcode" = "Código autodestrucción";
 
+/* No comment provided by engineer. */
+"Set passphrase" = "Definir frase de contraseña";
+
 /* No comment provided by engineer. */
 "Set passphrase to export" = "Escribe la contraseña para exportar";
 
@@ -3320,6 +3458,9 @@
 /* No comment provided by engineer. */
 "Show preview" = "Mostrar vista previa";
 
+/* No comment provided by engineer. */
+"Show QR code" = "Mostrar código QR";
+
 /* No comment provided by engineer. */
 "Show:" = "Mostrar:";
 
@@ -3380,6 +3521,9 @@
 /* notification title */
 "Somebody" = "Alguien";
 
+/* chat item text */
+"standard end-to-end encryption" = "cifrado estándar de extremo a extremo";
+
 /* No comment provided by engineer. */
 "Start chat" = "Iniciar chat";
 
@@ -3395,6 +3539,9 @@
 /* No comment provided by engineer. */
 "Stop" = "Detener";
 
+/* No comment provided by engineer. */
+"Stop chat" = "Detener el chat";
+
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "Detén SimpleX para habilitar las acciones sobre la base de datos";
 
@@ -3422,6 +3569,9 @@
 /* authentication reason */
 "Stop SimpleX" = "Detener SimpleX";
 
+/* No comment provided by engineer. */
+"Stopping chat" = "Detención del chat";
+
 /* No comment provided by engineer. */
 "strike" = "tachado";
 
@@ -3572,6 +3722,12 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Esta acción es irreversible. Tu perfil, contactos, mensajes y archivos se perderán irreversiblemente.";
 
+/* E2EE info chat item */
+"This chat is protected by end-to-end encryption." = "Este chat está protegido por cifrado de extremo a extremo.";
+
+/* E2EE info chat item */
+"This chat is protected by quantum resistant end-to-end encryption." = "Este chat está protegido por un cifrado de extremo a extremo resistente a tecnologías cuánticas.";
+
 /* notification title */
 "this contact" = "este contacto";
 
@@ -3764,9 +3920,15 @@
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Actualizar y abrir Chat";
 
+/* No comment provided by engineer. */
+"Upload failed" = "Error de carga";
+
 /* server test step */
 "Upload file" = "Subir archivo";
 
+/* No comment provided by engineer. */
+"Uploading archive" = "Subiendo el archivo";
+
 /* No comment provided by engineer. */
 "Use .onion hosts" = "Usar hosts .onion";
 
@@ -3797,6 +3959,9 @@
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "¿Usar servidores SimpleX Chat?";
 
+/* No comment provided by engineer. */
+"Use the app while in the call." = "Usar la app durante la llamada.";
+
 /* No comment provided by engineer. */
 "User profile" = "Perfil de usuario";
 
@@ -3824,6 +3989,12 @@
 /* No comment provided by engineer. */
 "Verify connections" = "Verificar conexiones";
 
+/* No comment provided by engineer. */
+"Verify database passphrase" = "Verificar la contraseña de la base de datos";
+
+/* No comment provided by engineer. */
+"Verify passphrase" = "Verificar frase de contraseña";
+
 /* No comment provided by engineer. */
 "Verify security code" = "Comprobar código de seguridad";
 
@@ -3902,6 +4073,9 @@
 /* No comment provided by engineer. */
 "wants to connect to you!" = "¡quiere contactar contigo!";
 
+/* No comment provided by engineer. */
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Advertencia: el inicio del chat en varios dispositivos no es compatible y provocará fallos en la entrega de mensajes";
+
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Atención: ¡puedes perder algunos datos!";
 
@@ -3917,6 +4091,9 @@
 /* No comment provided by engineer. */
 "Welcome message" = "Mensaje de bienvenida";
 
+/* No comment provided by engineer. */
+"Welcome message is too long" = "El mensaje de bienvenida es demasiado largo";
+
 /* No comment provided by engineer. */
 "What's new" = "Novedades";
 
@@ -3953,6 +4130,9 @@
 /* No comment provided by engineer. */
 "You" = "Tú";
 
+/* No comment provided by engineer. */
+"You **must not** use the same database on two devices." = "**No debe** usar la misma base de datos en dos dispositivos.";
+
 /* No comment provided by engineer. */
 "You accepted connection" = "Has aceptado la conexión";
 
@@ -4013,6 +4193,9 @@
 /* No comment provided by engineer. */
 "You can enable them later via app Privacy & Security settings." = "Puedes activarlos más tarde en la configuración de Privacidad y Seguridad.";
 
+/* No comment provided by engineer. */
+"You can give another try." = "Puede intentarlo de nuevo.";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "Puedes ocultar o silenciar un perfil deslizándolo a la derecha.";
 
diff --git a/apps/ios/fr.lproj/Localizable.strings b/apps/ios/fr.lproj/Localizable.strings
index 8a66611d39..cbc72479e3 100644
--- a/apps/ios/fr.lproj/Localizable.strings
+++ b/apps/ios/fr.lproj/Localizable.strings
@@ -1447,7 +1447,7 @@
 "Enable for all" = "Activer pour tous";
 
 /* No comment provided by engineer. */
-"Enable in direct chats (BETA)!" = "Activé dans les conversations directes (BETA) !";
+"Enable in direct chats (BETA)!" = "Activer dans les conversations directes (BETA) !";
 
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "Activer les notifications instantanées ?";
@@ -2455,7 +2455,7 @@
 "Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Les messages, fichiers et appels sont protégés par un chiffrement **de bout en bout** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Les messages, fichiers et appels sont protégés par un chiffrement **2e2 résistant post-quantique** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.";
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Les messages, fichiers et appels sont protégés par un chiffrement **e2e résistant post-quantique** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.";
 
 /* No comment provided by engineer. */
 "Migrate device" = "Transférer l'appareil";
@@ -3726,7 +3726,7 @@
 "This chat is protected by end-to-end encryption." = "Cette discussion est protégée par un chiffrement de bout en bout.";
 
 /* E2EE info chat item */
-"This chat is protected by quantum resistant end-to-end encryption." = "Cette discussion est protégée par un chiffrement de bout en bout résistant post-quantique.";
+"This chat is protected by quantum resistant end-to-end encryption." = "Cette discussion est protégée par un chiffrement de bout en bout résistant aux technologies quantiques.";
 
 /* notification title */
 "this contact" = "ce contact";
@@ -4074,7 +4074,7 @@
 "wants to connect to you!" = "veut établir une connexion !";
 
 /* No comment provided by engineer. */
-"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Attention : démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages";
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Attention: démarrer une session de chat sur plusieurs appareils n'est pas pris en charge et entraînera des dysfonctionnements au niveau de la transmission des messages";
 
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Attention : vous risquez de perdre des données !";
diff --git a/apps/ios/it.lproj/Localizable.strings b/apps/ios/it.lproj/Localizable.strings
index 88b3497758..5ebda7396f 100644
--- a/apps/ios/it.lproj/Localizable.strings
+++ b/apps/ios/it.lproj/Localizable.strings
@@ -2455,7 +2455,7 @@
 "Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "I messaggi, i file e le chiamate sono protetti da **crittografia end-to-end** con perfect forward secrecy, ripudio e recupero da intrusione.";
 
 /* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "I messaggi, i file e le chiamate sono protetti da **crittografia e2e resistente al quantistico** con perfect forward secrecy, ripudio e recupero da intrusione.";
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "I messaggi, i file e le chiamate sono protetti da **crittografia e2e resistente alla quantistica** con perfect forward secrecy, ripudio e recupero da intrusione.";
 
 /* No comment provided by engineer. */
 "Migrate device" = "Migra dispositivo";
@@ -2958,10 +2958,10 @@
 "Push server" = "Server push";
 
 /* chat item text */
-"quantum resistant e2e encryption" = "crittografia e2e resistente al quantistico";
+"quantum resistant e2e encryption" = "crittografia e2e resistente alla quantistica";
 
 /* No comment provided by engineer. */
-"Quantum resistant encryption" = "Crittografia resistente al quantistico";
+"Quantum resistant encryption" = "Crittografia resistente alla quantistica";
 
 /* No comment provided by engineer. */
 "Rate the app" = "Valuta l'app";
@@ -3726,7 +3726,7 @@
 "This chat is protected by end-to-end encryption." = "Questa chat è protetta da crittografia end-to-end.";
 
 /* E2EE info chat item */
-"This chat is protected by quantum resistant end-to-end encryption." = "Questa chat è protetta da crittografia end-to-end resistente al quantistico.";
+"This chat is protected by quantum resistant end-to-end encryption." = "Questa chat è protetta da crittografia end-to-end resistente alla quantistica.";
 
 /* notification title */
 "this contact" = "questo contatto";
@@ -4014,7 +4014,7 @@
 "via relay" = "via relay";
 
 /* No comment provided by engineer. */
-"Via secure quantum resistant protocol." = "Tramite protocollo sicuro resistente al quantistico.";
+"Via secure quantum resistant protocol." = "Tramite protocollo sicuro resistente alla quantistica.";
 
 /* No comment provided by engineer. */
 "Video call" = "Videochiamata";
diff --git a/apps/ios/nl.lproj/Localizable.strings b/apps/ios/nl.lproj/Localizable.strings
index bfd97f3f43..6ba5b419f6 100644
--- a/apps/ios/nl.lproj/Localizable.strings
+++ b/apps/ios/nl.lproj/Localizable.strings
@@ -2730,7 +2730,7 @@
 "Open" = "Open";
 
 /* No comment provided by engineer. */
-"Open chat" = "Gesprekken openen";
+"Open chat" = "Chat openen";
 
 /* authentication reason */
 "Open chat console" = "Chat console openen";
diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings
index c3f981d144..e82ab7a07f 100644
--- a/apps/ios/ru.lproj/Localizable.strings
+++ b/apps/ios/ru.lproj/Localizable.strings
@@ -4074,7 +4074,7 @@
 "wants to connect to you!" = "хочет соединиться с Вами!";
 
 /* No comment provided by engineer. */
-"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Внимание: запуск чата на нескольких устройствах не поддерживается и приведет к сбоям доставки сообщений.";
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Внимание: запуск чата на нескольких устройствах не поддерживается и приведет к сбоям доставки сообщений";
 
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Предупреждение: Вы можете потерять какие то данные!";
diff --git a/apps/ios/tr.lproj/Localizable.strings b/apps/ios/tr.lproj/Localizable.strings
index bded9498b9..2e866ebe08 100644
--- a/apps/ios/tr.lproj/Localizable.strings
+++ b/apps/ios/tr.lproj/Localizable.strings
@@ -137,7 +137,7 @@
 "%@ and %@ connected" = "%@ ve %@ bağlandı";
 
 /* copied message info, <sender> at <time> */
-"%@ at %@:" = "%1$@, %2$@ de";
+"%@ at %@:" = "1$@, %2$@'de:";
 
 /* No comment provided by engineer. */
 "%@ connected" = "%@ bağlandı";
@@ -1605,6 +1605,9 @@
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Üye(ler) eklenirken hata oluştu";
 
+/* No comment provided by engineer. */
+"Error allowing contact PQ encryption" = "İletişim PQ şifrelemesine izin verirken hata oluştu";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Adres değiştirilirken hata oluştu";
 
@@ -2025,6 +2028,9 @@
 /* No comment provided by engineer. */
 "How to use your servers" = "Sunucularını nasıl kullanabilirsin";
 
+/* No comment provided by engineer. */
+"Hungarian interface" = "Macarca arayüz";
+
 /* No comment provided by engineer. */
 "ICE servers (one per line)" = "ICE sunucuları (her satıra bir tane)";
 
@@ -2445,9 +2451,36 @@
 /* No comment provided by engineer. */
 "Messages from %@ will be shown!" = "%@ den gelen mesajlar gösterilecektir!";
 
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Mesajlar, dosyalar ve aramalar **uçtan uca şifreleme** ile mükemmel ileri gizlilik, inkar ve izinsiz giriş kurtarma ile korunur.";
+
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Mesajlar, dosyalar ve aramalar **kuantum dirençli e2e şifreleme** ile mükemmel ileri gizlilik, inkar ve zorla girme kurtarma ile korunur.";
+
+/* No comment provided by engineer. */
+"Migrate device" = "Cihazı taşıma";
+
+/* No comment provided by engineer. */
+"Migrate from another device" = "Başka bir cihazdan geçiş yapın";
+
+/* No comment provided by engineer. */
+"Migrate here" = "Buraya göç edin";
+
+/* No comment provided by engineer. */
+"Migrate to another device" = "Başka bir cihaza taşıma";
+
+/* No comment provided by engineer. */
+"Migrate to another device via QR code." = "QR kodu aracılığıyla başka bir cihaza geçiş yapın.";
+
+/* No comment provided by engineer. */
+"Migrating" = "Göçmenlik";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "Veritabanı arşivine geçiliyor…";
 
+/* No comment provided by engineer. */
+"Migration complete" = "Geçiş tamamlandı";
+
 /* No comment provided by engineer. */
 "Migration error:" = "Geçiş hatası:";
 
@@ -2705,6 +2738,9 @@
 /* No comment provided by engineer. */
 "Open group" = "Grubu aç";
 
+/* authentication reason */
+"Open migration to another device" = "Başka bir cihaza açık geçiş";
+
 /* No comment provided by engineer. */
 "Open Settings" = "Ayarları aç";
 
@@ -2717,9 +2753,15 @@
 /* No comment provided by engineer. */
 "Opening app…" = "Uygulama açılıyor…";
 
+/* No comment provided by engineer. */
+"Or paste archive link" = "Veya arşiv bağlantısını yapıştırın";
+
 /* No comment provided by engineer. */
 "Or scan QR code" = "Veya QR kodu okut";
 
+/* No comment provided by engineer. */
+"Or securely share this file link" = "Veya bu dosya bağlantısını güvenli bir şekilde paylaşın";
+
 /* No comment provided by engineer. */
 "Or show this code" = "Veya bu kodu göster";
 
@@ -2771,6 +2813,9 @@
 /* message decrypt error item */
 "Permanent decryption error" = "Kalıcı şifre çözümü hatası";
 
+/* No comment provided by engineer. */
+"Picture-in-picture calls" = "Resim içinde resim aramaları";
+
 /* No comment provided by engineer. */
 "PING count" = "PING sayısı";
 
@@ -2789,6 +2834,9 @@
 /* No comment provided by engineer. */
 "Please check yours and your contact preferences." = "Lütfen sizinkini ve iletişim tercihlerinizi kontrol edin.";
 
+/* No comment provided by engineer. */
+"Please confirm that network settings are correct for this device." = "Lütfen bu cihaz için ağ ayarlarının doğru olduğunu onaylayın.";
+
 /* No comment provided by engineer. */
 "Please contact developers.\nError: %@" = "Lütfen geliştiricilerle irtibata geçin.\nHata: %@";
 
@@ -2822,6 +2870,9 @@
 /* server test error */
 "Possibly, certificate fingerprint in server address is incorrect" = "Muhtemelen, sunucu adresindeki parmakizi sertifikası doğru değil";
 
+/* No comment provided by engineer. */
+"Post-quantum E2EE" = "Kuantum sonrası E2EE";
+
 /* No comment provided by engineer. */
 "Preserve the last message draft, with attachments." = "Son mesaj taslağını ekleriyle birlikte koru.";
 
@@ -2903,6 +2954,15 @@
 /* No comment provided by engineer. */
 "Push notifications" = "Anında bildirimler";
 
+/* No comment provided by engineer. */
+"Push server" = "Push sunucu";
+
+/* chat item text */
+"quantum resistant e2e encryption" = "kuantuma dayanıklı e2e şifreleme";
+
+/* No comment provided by engineer. */
+"Quantum resistant encryption" = "Kuantum dirençli şifreleme";
+
 /* No comment provided by engineer. */
 "Rate the app" = "Uygulamayı değerlendir";
 
@@ -2931,7 +2991,7 @@
 "Read more in our GitHub repository." = "Daha fazlasını GitHub depomuzdan oku.";
 
 /* No comment provided by engineer. */
-"Receipts are disabled" = "Görüldü devre dışı bırakıldı";
+"Receipts are disabled" = "Makbuzlar devre dışı bırakıldı";
 
 /* No comment provided by engineer. */
 "received answer…" = "alınan cevap…";
@@ -3038,9 +3098,18 @@
 /* No comment provided by engineer. */
 "Repeat connection request?" = "Bağlantı isteği tekrarlansın mı?";
 
+/* No comment provided by engineer. */
+"Repeat download" = "Tekrar indir";
+
+/* No comment provided by engineer. */
+"Repeat import" = "İthalatı tekrarla";
+
 /* No comment provided by engineer. */
 "Repeat join request?" = "Katılma isteği tekrarlansın mı?";
 
+/* No comment provided by engineer. */
+"Repeat upload" = "Yüklemeyi tekrarla";
+
 /* chat item action */
 "Reply" = "Yanıtla";
 
@@ -3098,6 +3167,9 @@
 /* No comment provided by engineer. */
 "Run chat" = "Sohbeti çalıştır";
 
+/* No comment provided by engineer. */
+"Safer groups" = "Daha güvenli gruplar";
+
 /* chat item action */
 "Save" = "Kaydet";
 
@@ -3267,7 +3339,7 @@
 "Sending delivery receipts will be enabled for all contacts in all visible chat profiles." = "Görüldü bilgisi, tüm görünür sohbet profillerindeki tüm kişiler için etkinleştirilecektir.";
 
 /* No comment provided by engineer. */
-"Sending delivery receipts will be enabled for all contacts." = "Görüldü bilgisi bütün kişileri için etkinleştirilecektir.";
+"Sending delivery receipts will be enabled for all contacts." = "Teslimat makbuzlarının gönderilmesi tüm kişiler için etkinleştirilecektir.";
 
 /* No comment provided by engineer. */
 "Sending file will be stopped." = "Dosya gönderimi durdurulacaktır.";
@@ -3338,6 +3410,9 @@
 /* No comment provided by engineer. */
 "Set passcode" = "Şifre ayarla";
 
+/* No comment provided by engineer. */
+"Set passphrase" = "Parolayı ayarla";
+
 /* No comment provided by engineer. */
 "Set passphrase to export" = "Dışa aktarmak için parola ayarla";
 
@@ -3383,6 +3458,9 @@
 /* No comment provided by engineer. */
 "Show preview" = "Ön gösterimi göser";
 
+/* No comment provided by engineer. */
+"Show QR code" = "QR kodunu göster";
+
 /* No comment provided by engineer. */
 "Show:" = "Göster:";
 
@@ -3443,6 +3521,9 @@
 /* notification title */
 "Somebody" = "Biri";
 
+/* chat item text */
+"standard end-to-end encryption" = "standart uçtan uca şifreleme";
+
 /* No comment provided by engineer. */
 "Start chat" = "Sohbeti başlat";
 
@@ -3458,6 +3539,9 @@
 /* No comment provided by engineer. */
 "Stop" = "Dur";
 
+/* No comment provided by engineer. */
+"Stop chat" = "Sohbeti kes";
+
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "Veritabanı eylemlerini etkinleştirmek için sohbeti durdur";
 
@@ -3485,6 +3569,9 @@
 /* authentication reason */
 "Stop SimpleX" = "SimpleX'i durdur";
 
+/* No comment provided by engineer. */
+"Stopping chat" = "Sohbeti durdurma";
+
 /* No comment provided by engineer. */
 "strike" = "çizik";
 
@@ -3531,7 +3618,7 @@
 "TCP connection timeout" = "TCP bağlantı zaman aşımı";
 
 /* No comment provided by engineer. */
-"TCP_KEEPCNT" = "TCP_CNTYİTUT";
+"TCP_KEEPCNT" = "TCP_KEEPCNT";
 
 /* No comment provided by engineer. */
 "TCP_KEEPIDLE" = "TCP_BOŞTAKAL";
@@ -3635,6 +3722,12 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Bu işlem geri alınamaz - profiliniz, kişileriniz, mesajlarınız ve dosyalarınız geri döndürülemez şekilde kaybolacaktır.";
 
+/* E2EE info chat item */
+"This chat is protected by end-to-end encryption." = "Bu sohbet uçtan uca şifreleme ile korunmaktadır.";
+
+/* E2EE info chat item */
+"This chat is protected by quantum resistant end-to-end encryption." = "Bu sohbet kuantum dirençli uçtan uca şifreleme ile korunmaktadır.";
+
 /* notification title */
 "this contact" = "Bu kişi";
 
@@ -3827,9 +3920,15 @@
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Yükselt ve sohbeti aç";
 
+/* No comment provided by engineer. */
+"Upload failed" = "Yükleme başarısız";
+
 /* server test step */
 "Upload file" = "Dosya yükle";
 
+/* No comment provided by engineer. */
+"Uploading archive" = "Arşiv yükleme";
+
 /* No comment provided by engineer. */
 "Use .onion hosts" = ".onion ana bilgisayarlarını kullan";
 
@@ -3860,6 +3959,9 @@
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "SimpleX Chat sunucuları kullanılsın mı?";
 
+/* No comment provided by engineer. */
+"Use the app while in the call." = "Görüşme sırasında uygulamayı kullanın.";
+
 /* No comment provided by engineer. */
 "User profile" = "Kullanıcı profili";
 
@@ -3887,6 +3989,12 @@
 /* No comment provided by engineer. */
 "Verify connections" = "Bağlantıları doğrula";
 
+/* No comment provided by engineer. */
+"Verify database passphrase" = "Veritabanı parolasını doğrulayın";
+
+/* No comment provided by engineer. */
+"Verify passphrase" = "Parolayı doğrula";
+
 /* No comment provided by engineer. */
 "Verify security code" = "Güvenlik kodunu doğrula";
 
@@ -3965,6 +4073,9 @@
 /* No comment provided by engineer. */
 "wants to connect to you!" = "bağlanmak istiyor!";
 
+/* No comment provided by engineer. */
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Uyarı: birden fazla cihazda sohbet başlatmak desteklenmez ve mesaj teslim hatalarına neden olur";
+
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Uyarı: Bazı verileri kaybedebilirsin!";
 
@@ -3980,6 +4091,9 @@
 /* No comment provided by engineer. */
 "Welcome message" = "Karşılama mesajı";
 
+/* No comment provided by engineer. */
+"Welcome message is too long" = "Hoş geldiniz mesajı çok uzun";
+
 /* No comment provided by engineer. */
 "What's new" = "Neler yeni";
 
@@ -4016,6 +4130,9 @@
 /* No comment provided by engineer. */
 "You" = "Sen";
 
+/* No comment provided by engineer. */
+"You **must not** use the same database on two devices." = "Aynı veritabanını iki cihazda **kullanmamalısınız**.";
+
 /* No comment provided by engineer. */
 "You accepted connection" = "Bağlantıyı onayladın";
 
@@ -4076,6 +4193,9 @@
 /* No comment provided by engineer. */
 "You can enable them later via app Privacy & Security settings." = "Daha sonra uygulamanın Gizlilik ve Güvenlik ayarlarından etkinleştirebilirsiniz.";
 
+/* No comment provided by engineer. */
+"You can give another try." = "Bir kez daha deneyebilirsiniz.";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "Bir kullanıcı profilini gizleyebilir veya sessize alabilirsiniz - sağa kaydırın.";
 
diff --git a/apps/ios/uk.lproj/Localizable.strings b/apps/ios/uk.lproj/Localizable.strings
index 37c341f885..d6dd34b066 100644
--- a/apps/ios/uk.lproj/Localizable.strings
+++ b/apps/ios/uk.lproj/Localizable.strings
@@ -85,6 +85,9 @@
 /* No comment provided by engineer. */
 "**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." = "**Найбільш приватний**: не використовуйте сервер сповіщень SimpleX Chat, періодично перевіряйте повідомлення у фоновому режимі (залежить від того, як часто ви користуєтесь додатком).";
 
+/* No comment provided by engineer. */
+"**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." = "**Зверніть увагу**: використання однієї і тієї ж бази даних на двох пристроях порушить розшифровку повідомлень з ваших з'єднань, як захист безпеки.";
+
 /* No comment provided by engineer. */
 "**Please note**: you will NOT be able to recover or change passphrase if you lose it." = "**Зверніть увагу: ви НЕ зможете відновити або змінити пароль, якщо втратите його.";
 
@@ -94,6 +97,9 @@
 /* No comment provided by engineer. */
 "**Warning**: Instant push notifications require passphrase saved in Keychain." = "**Попередження**: Для отримання миттєвих пуш-сповіщень потрібна парольна фраза, збережена у брелоку.";
 
+/* No comment provided by engineer. */
+"**Warning**: the archive will be removed." = "**Попередження**: архів буде видалено.";
+
 /* No comment provided by engineer. */
 "*bold*" = "\\*жирний*";
 
@@ -136,6 +142,9 @@
 /* No comment provided by engineer. */
 "%@ connected" = "%@ підключено";
 
+/* No comment provided by engineer. */
+"%@ downloaded" = "%@ встановлено";
+
 /* notification title */
 "%@ is connected!" = "%@ підключено!";
 
@@ -148,6 +157,9 @@
 /* No comment provided by engineer. */
 "%@ servers" = "%@ сервери";
 
+/* No comment provided by engineer. */
+"%@ uploaded" = "%@ завантажено";
+
 /* notification title */
 "%@ wants to connect!" = "%@ хоче підключитися!";
 
@@ -377,6 +389,9 @@
 /* member role */
 "admin" = "адмін";
 
+/* No comment provided by engineer. */
+"Admins can block a member for all." = "Адміністратори можуть заблокувати користувача для всіх.";
+
 /* No comment provided by engineer. */
 "Admins can create the links to join groups." = "Адміни можуть створювати посилання для приєднання до груп.";
 
@@ -416,6 +431,9 @@
 /* No comment provided by engineer. */
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "Всі ваші контакти залишаться на зв'язку. Повідомлення про оновлення профілю буде надіслано вашим контактам.";
 
+/* No comment provided by engineer. */
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Всі ваші контакти, розмови та файли будуть надійно зашифровані та завантажені частинами на налаштовані XFTP-реле.";
+
 /* No comment provided by engineer. */
 "Allow" = "Дозволити";
 
@@ -488,12 +506,18 @@
 /* No comment provided by engineer. */
 "An empty chat profile with the provided name is created, and the app opens as usual." = "Створюється порожній профіль чату з вказаним ім'ям, і додаток відкривається у звичайному режимі.";
 
+/* No comment provided by engineer. */
+"and %lld other events" = "та %lld інших подій";
+
 /* No comment provided by engineer. */
 "Answer call" = "Відповісти на дзвінок";
 
 /* No comment provided by engineer. */
 "App build: %@" = "Збірка програми: %@";
 
+/* No comment provided by engineer. */
+"App data migration" = "Міграція даних додатків";
+
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "Додаток шифрує нові локальні файли (крім відео).";
 
@@ -515,6 +539,15 @@
 /* No comment provided by engineer. */
 "Appearance" = "Зовнішній вигляд";
 
+/* No comment provided by engineer. */
+"Apply" = "Подати заявку";
+
+/* No comment provided by engineer. */
+"Archive and upload" = "Архівування та завантаження";
+
+/* No comment provided by engineer. */
+"Archiving database" = "Архівування бази даних";
+
 /* No comment provided by engineer. */
 "Attach" = "Прикріпити";
 
@@ -545,6 +578,9 @@
 /* No comment provided by engineer. */
 "Authentication unavailable" = "Автентифікація недоступна";
 
+/* member role */
+"author" = "автор";
+
 /* No comment provided by engineer. */
 "Auto-accept" = "Автоприйняття";
 
@@ -596,6 +632,15 @@
 /* No comment provided by engineer. */
 "Block member?" = "Заблокувати користувача?";
 
+/* marked deleted chat item preview text */
+"blocked" = "заблоковано";
+
+/* rcv group event chat item */
+"blocked %@" = "заблоковано %@";
+
+/* marked deleted chat item preview text */
+"blocked by admin" = "заблоковано адміністратором";
+
 /* No comment provided by engineer. */
 "Blocked by admin" = "Заблокований адміністратором";
 
@@ -650,6 +695,9 @@
 /* No comment provided by engineer. */
 "Cancel" = "Скасувати";
 
+/* No comment provided by engineer. */
+"Cancel migration" = "Скасувати міграцію";
+
 /* feature offered item */
 "cancelled %@" = "скасовано %@";
 
@@ -729,6 +777,9 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Чат зупинено. Якщо ви вже використовували цю базу даних на іншому пристрої, перенесіть її назад перед запуском чату.";
 
+/* No comment provided by engineer. */
+"Chat migrated!" = "Чат перемістився!";
+
 /* No comment provided by engineer. */
 "Chat preferences" = "Налаштування чату";
 
@@ -741,6 +792,9 @@
 /* No comment provided by engineer. */
 "Chinese and Spanish interface" = "Інтерфейс китайською та іспанською мовами";
 
+/* No comment provided by engineer. */
+"Choose _Migrate from another device_ on the new device and scan QR code." = "Виберіть _Перемістити з іншого пристрою_ на новому пристрої та відскануйте QR-код.";
+
 /* No comment provided by engineer. */
 "Choose file" = "Виберіть файл";
 
@@ -756,6 +810,9 @@
 /* No comment provided by engineer. */
 "Clear conversation?" = "Відверта розмова?";
 
+/* No comment provided by engineer. */
+"Clear private notes?" = "Чисті приватні нотатки?";
+
 /* No comment provided by engineer. */
 "Clear verification" = "Очистити перевірку";
 
@@ -783,6 +840,9 @@
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Підтвердити оновлення бази даних";
 
+/* No comment provided by engineer. */
+"Confirm network settings" = "Підтвердьте налаштування мережі";
+
 /* No comment provided by engineer. */
 "Confirm new passphrase…" = "Підтвердіть нову парольну фразу…";
 
@@ -792,6 +852,12 @@
 /* No comment provided by engineer. */
 "Confirm password" = "Підтвердити пароль";
 
+/* No comment provided by engineer. */
+"Confirm that you remember database passphrase to migrate it." = "Переконайтеся, що ви пам'ятаєте пароль до бази даних для її перенесення.";
+
+/* No comment provided by engineer. */
+"Confirm upload" = "Підтвердити завантаження";
+
 /* server test step */
 "Connect" = "Підключіться";
 
@@ -834,6 +900,12 @@
 /* No comment provided by engineer. */
 "Connected desktop" = "Підключений робочий стіл";
 
+/* rcv group event chat item */
+"connected directly" = "з'єднані безпосередньо";
+
+/* No comment provided by engineer. */
+"Connected to desktop" = "Підключено до настільного комп'ютера";
+
 /* No comment provided by engineer. */
 "connecting" = "з'єднання";
 
@@ -858,6 +930,9 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Підключення до сервера... (помилка: %@)";
 
+/* No comment provided by engineer. */
+"Connecting to desktop" = "Підключення до ПК";
+
 /* chat list item title */
 "connecting…" = "з'єднання…";
 
@@ -876,12 +951,18 @@
 /* No comment provided by engineer. */
 "Connection request sent!" = "Запит на підключення відправлено!";
 
+/* No comment provided by engineer. */
+"Connection terminated" = "З'єднання розірвано";
+
 /* No comment provided by engineer. */
 "Connection timeout" = "Тайм-аут з'єднання";
 
 /* connection information */
 "connection:%@" = "з'єднання:%@";
 
+/* profile update event chat item */
+"contact %@ changed to %@" = "контакт %1$@ змінено на %2$@";
+
 /* No comment provided by engineer. */
 "Contact allows" = "Контакт дозволяє";
 
@@ -924,21 +1005,36 @@
 /* No comment provided by engineer. */
 "Core version: v%@" = "Основна версія: v%@";
 
+/* No comment provided by engineer. */
+"Correct name to %@?" = "Виправити ім'я на %@?";
+
 /* No comment provided by engineer. */
 "Create" = "Створити";
 
+/* No comment provided by engineer. */
+"Create a group using a random profile." = "Створіть групу, використовуючи випадковий профіль.";
+
 /* No comment provided by engineer. */
 "Create an address to let people connect with you." = "Створіть адресу, щоб люди могли з вами зв'язатися.";
 
 /* server test step */
 "Create file" = "Створити файл";
 
+/* No comment provided by engineer. */
+"Create group" = "Створити групу";
+
 /* No comment provided by engineer. */
 "Create group link" = "Створити групове посилання";
 
 /* No comment provided by engineer. */
 "Create link" = "Створити посилання";
 
+/* No comment provided by engineer. */
+"Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Створіть новий профіль у [desktop app](https://simplex.chat/downloads/). 💻";
+
+/* No comment provided by engineer. */
+"Create profile" = "Створити профіль";
+
 /* server test step */
 "Create queue" = "Створити чергу";
 
@@ -951,9 +1047,21 @@
 /* No comment provided by engineer. */
 "Create your profile" = "Створіть свій профіль";
 
+/* No comment provided by engineer. */
+"Created at" = "Створено за адресою";
+
+/* copied message info */
+"Created at: %@" = "Створено за адресою: %@";
+
 /* No comment provided by engineer. */
 "Created on %@" = "Створено %@";
 
+/* No comment provided by engineer. */
+"Creating archive link" = "Створення архівного посилання";
+
+/* No comment provided by engineer. */
+"Creating link…" = "Створення посилання…";
+
 /* No comment provided by engineer. */
 "creator" = "творець";
 
@@ -1053,6 +1161,9 @@
 /* chat item action */
 "Delete" = "Видалити";
 
+/* No comment provided by engineer. */
+"Delete %lld messages?" = "Видалити %lld повідомлень?";
+
 /* No comment provided by engineer. */
 "Delete address" = "Видалити адресу";
 
@@ -1065,6 +1176,9 @@
 /* No comment provided by engineer. */
 "Delete all files" = "Видалити всі файли";
 
+/* No comment provided by engineer. */
+"Delete and notify contact" = "Видалити та повідомити контакт";
+
 /* No comment provided by engineer. */
 "Delete archive" = "Видалити архів";
 
@@ -1086,9 +1200,15 @@
 /* No comment provided by engineer. */
 "Delete Contact" = "Видалити контакт";
 
+/* No comment provided by engineer. */
+"Delete contact?\nThis cannot be undone!" = "Видалити контакт?\nЦе не можна скасувати!";
+
 /* No comment provided by engineer. */
 "Delete database" = "Видалити базу даних";
 
+/* No comment provided by engineer. */
+"Delete database from this device" = "Видалити базу даних з цього пристрою";
+
 /* server test step */
 "Delete file" = "Видалити файл";
 
@@ -1161,6 +1281,9 @@
 /* copied message info */
 "Deleted at: %@" = "Видалено за: %@";
 
+/* rcv direct event chat item */
+"deleted contact" = "видалений контакт";
+
 /* rcv group event chat item */
 "deleted group" = "видалено групу";
 
@@ -1176,6 +1299,15 @@
 /* No comment provided by engineer. */
 "Description" = "Опис";
 
+/* No comment provided by engineer. */
+"Desktop address" = "Адреса робочого столу";
+
+/* No comment provided by engineer. */
+"Desktop app version %@ is not compatible with this app." = "Версія програми для настільних комп'ютерів %@ не сумісна з цією програмою.";
+
+/* No comment provided by engineer. */
+"Desktop devices" = "Настільні пристрої";
+
 /* No comment provided by engineer. */
 "Develop" = "Розробник";
 
@@ -1239,9 +1371,21 @@
 /* server test step */
 "Disconnect" = "Від'єднати";
 
+/* No comment provided by engineer. */
+"Disconnect desktop?" = "Відключити робочий стіл?";
+
+/* No comment provided by engineer. */
+"Discover and join groups" = "Знаходьте та приєднуйтесь до груп";
+
+/* No comment provided by engineer. */
+"Discover via local network" = "Відкриття через локальну мережу";
+
 /* No comment provided by engineer. */
 "Do it later" = "Зробіть це пізніше";
 
+/* No comment provided by engineer. */
+"Do not send history to new members." = "Не надсилайте історію новим користувачам.";
+
 /* No comment provided by engineer. */
 "Do NOT use SimpleX for emergency calls." = "НЕ використовуйте SimpleX для екстрених викликів.";
 
@@ -1257,9 +1401,18 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Пониження та відкритий чат";
 
+/* No comment provided by engineer. */
+"Download failed" = "Не вдалося завантажити";
+
 /* server test step */
 "Download file" = "Завантажити файл";
 
+/* No comment provided by engineer. */
+"Downloading archive" = "Завантажити архів";
+
+/* No comment provided by engineer. */
+"Downloading link details" = "Деталі посилання для завантаження";
+
 /* No comment provided by engineer. */
 "Duplicate display name!" = "Дублююче ім'я користувача!";
 
@@ -1287,9 +1440,15 @@
 /* No comment provided by engineer. */
 "Enable automatic message deletion?" = "Увімкнути автоматичне видалення повідомлень?";
 
+/* No comment provided by engineer. */
+"Enable camera access" = "Увімкніть доступ до камери";
+
 /* No comment provided by engineer. */
 "Enable for all" = "Увімкнути для всіх";
 
+/* No comment provided by engineer. */
+"Enable in direct chats (BETA)!" = "Увімкнути в прямих чатах (BETA)!";
+
 /* No comment provided by engineer. */
 "Enable instant notifications?" = "Увімкнути миттєві сповіщення?";
 
@@ -1329,12 +1488,21 @@
 /* No comment provided by engineer. */
 "Encrypt database?" = "Зашифрувати базу даних?";
 
+/* No comment provided by engineer. */
+"Encrypt local files" = "Шифрування локальних файлів";
+
+/* No comment provided by engineer. */
+"Encrypt stored files & media" = "Шифрування збережених файлів і носіїв";
+
 /* No comment provided by engineer. */
 "Encrypted database" = "Зашифрована база даних";
 
 /* notification */
 "Encrypted message or another event" = "Зашифроване повідомлення або інша подія";
 
+/* notification */
+"Encrypted message: app is stopped" = "Зашифроване повідомлення: додаток зупинено";
+
 /* notification */
 "Encrypted message: database error" = "Зашифроване повідомлення: помилка бази даних";
 
@@ -1368,6 +1536,12 @@
 /* chat item text */
 "encryption re-negotiation allowed for %@" = "переузгодження шифрування дозволено для %@";
 
+/* message decrypt error item */
+"Encryption re-negotiation error" = "Помилка повторного узгодження шифрування";
+
+/* No comment provided by engineer. */
+"Encryption re-negotiation failed." = "Повторне узгодження шифрування не вдалося.";
+
 /* chat item text */
 "encryption re-negotiation required" = "потрібне повторне узгодження шифрування";
 
@@ -1383,9 +1557,15 @@
 /* No comment provided by engineer. */
 "Enter correct passphrase." = "Введіть правильну парольну фразу.";
 
+/* No comment provided by engineer. */
+"Enter group name…" = "Введіть назву групи…";
+
 /* No comment provided by engineer. */
 "Enter Passcode" = "Введіть пароль";
 
+/* No comment provided by engineer. */
+"Enter passphrase" = "Введіть парольну фразу";
+
 /* No comment provided by engineer. */
 "Enter passphrase…" = "Введіть пароль…";
 
@@ -1395,12 +1575,18 @@
 /* No comment provided by engineer. */
 "Enter server manually" = "Увійдіть на сервер вручну";
 
+/* No comment provided by engineer. */
+"Enter this device name…" = "Введіть назву пристрою…";
+
 /* placeholder */
 "Enter welcome message…" = "Введіть вітальне повідомлення…";
 
 /* placeholder */
 "Enter welcome message… (optional)" = "Введіть вітальне повідомлення... (необов'язково)";
 
+/* No comment provided by engineer. */
+"Enter your name…" = "Введіть своє ім'я…";
+
 /* No comment provided by engineer. */
 "error" = "помилка";
 
@@ -1419,6 +1605,9 @@
 /* No comment provided by engineer. */
 "Error adding member(s)" = "Помилка додавання користувача(ів)";
 
+/* No comment provided by engineer. */
+"Error allowing contact PQ encryption" = "Помилка, що дозволяє шифрування контакту PQ";
+
 /* No comment provided by engineer. */
 "Error changing address" = "Помилка зміни адреси";
 
@@ -1437,9 +1626,18 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Помилка створення посилання на групу";
 
+/* No comment provided by engineer. */
+"Error creating member contact" = "Помилка при створенні контакту користувача";
+
+/* No comment provided by engineer. */
+"Error creating message" = "Повідомлення про створення помилки";
+
 /* No comment provided by engineer. */
 "Error creating profile!" = "Помилка створення профілю!";
 
+/* No comment provided by engineer. */
+"Error decrypting file" = "Помилка розшифрування файлу";
+
 /* No comment provided by engineer. */
 "Error deleting chat database" = "Помилка видалення бази даних чату";
 
@@ -1464,6 +1662,9 @@
 /* No comment provided by engineer. */
 "Error deleting user profile" = "Помилка видалення профілю користувача";
 
+/* No comment provided by engineer. */
+"Error downloading the archive" = "Помилка завантаження архіву";
+
 /* No comment provided by engineer. */
 "Error enabling delivery receipts!" = "Помилка активації підтвердження доставлення!";
 
@@ -1485,6 +1686,9 @@
 /* No comment provided by engineer. */
 "Error loading %@ servers" = "Помилка завантаження %@ серверів";
 
+/* No comment provided by engineer. */
+"Error opening chat" = "Помилка відкриття чату";
+
 /* No comment provided by engineer. */
 "Error receiving file" = "Помилка отримання файлу";
 
@@ -1506,12 +1710,21 @@
 /* No comment provided by engineer. */
 "Error saving passphrase to keychain" = "Помилка збереження пароля на keychain";
 
+/* when migrating */
+"Error saving settings" = "Налаштування збереження помилок";
+
 /* No comment provided by engineer. */
 "Error saving user password" = "Помилка збереження пароля користувача";
 
+/* No comment provided by engineer. */
+"Error scanning code: %@" = "Код помилки сканування: %@";
+
 /* No comment provided by engineer. */
 "Error sending email" = "Помилка надсилання електронного листа";
 
+/* No comment provided by engineer. */
+"Error sending member contact invitation" = "Помилка надсилання запрошення до контактів учасника";
+
 /* No comment provided by engineer. */
 "Error sending message" = "Помилка надсилання повідомлення";
 
@@ -1542,6 +1755,12 @@
 /* No comment provided by engineer. */
 "Error updating user privacy" = "Помилка оновлення конфіденційності користувача";
 
+/* No comment provided by engineer. */
+"Error uploading the archive" = "Помилка при завантаженні архіву";
+
+/* No comment provided by engineer. */
+"Error verifying passphrase:" = "Помилка при перевірці парольної фрази:";
+
 /* No comment provided by engineer. */
 "Error: " = "Помилка: ";
 
@@ -1563,6 +1782,9 @@
 /* No comment provided by engineer. */
 "Exit without saving" = "Вихід без збереження";
 
+/* chat item action */
+"Expand" = "Розгорнути";
+
 /* No comment provided by engineer. */
 "Export database" = "Експорт бази даних";
 
@@ -1572,6 +1794,9 @@
 /* No comment provided by engineer. */
 "Exported database archive." = "Експортований архів бази даних.";
 
+/* No comment provided by engineer. */
+"Exported file doesn't exist" = "Експортований файл не існує";
+
 /* No comment provided by engineer. */
 "Exporting database archive…" = "Експорт архіву бази даних…";
 
@@ -1581,6 +1806,9 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Швидко і без очікування, поки відправник буде онлайн!";
 
+/* No comment provided by engineer. */
+"Faster joining and more reliable messages." = "Швидше приєднання та надійніші повідомлення.";
+
 /* No comment provided by engineer. */
 "Favorite" = "Улюблений";
 
@@ -1611,6 +1839,12 @@
 /* No comment provided by engineer. */
 "Filter unread and favorite chats." = "Фільтруйте непрочитані та улюблені чати.";
 
+/* No comment provided by engineer. */
+"Finalize migration" = "Завершити міграцію";
+
+/* No comment provided by engineer. */
+"Finalize migration on another device." = "Завершіть міграцію на іншому пристрої.";
+
 /* No comment provided by engineer. */
 "Finally, we have them! 🚀" = "Нарешті, вони у нас є! 🚀";
 
@@ -1638,6 +1872,9 @@
 /* No comment provided by engineer. */
 "For console" = "Для консолі";
 
+/* No comment provided by engineer. */
+"Found desktop" = "Знайдено робочий стіл";
+
 /* No comment provided by engineer. */
 "French interface" = "Французький інтерфейс";
 
@@ -1650,6 +1887,9 @@
 /* No comment provided by engineer. */
 "Full name:" = "Повне ім'я:";
 
+/* No comment provided by engineer. */
+"Fully decentralized – visible only to members." = "Повністю децентралізована - видима лише для учасників.";
+
 /* No comment provided by engineer. */
 "Fully re-implemented - work in background!" = "Повністю перероблено - робота у фоновому режимі!";
 
@@ -1662,6 +1902,12 @@
 /* No comment provided by engineer. */
 "Group" = "Група";
 
+/* No comment provided by engineer. */
+"Group already exists" = "Група вже існує";
+
+/* No comment provided by engineer. */
+"Group already exists!" = "Група вже існує!";
+
 /* No comment provided by engineer. */
 "group deleted" = "групу видалено";
 
@@ -1761,6 +2007,9 @@
 /* No comment provided by engineer. */
 "History" = "Історія";
 
+/* No comment provided by engineer. */
+"History is not sent to new members." = "Історія не надсилається новим учасникам.";
+
 /* time unit */
 "hours" = "години";
 
@@ -1779,6 +2028,9 @@
 /* No comment provided by engineer. */
 "How to use your servers" = "Як користуватися вашими серверами";
 
+/* No comment provided by engineer. */
+"Hungarian interface" = "Інтерфейс угорською мовою";
+
 /* No comment provided by engineer. */
 "ICE servers (one per line)" = "Сервери ICE (по одному на лінію)";
 
@@ -1818,18 +2070,33 @@
 /* No comment provided by engineer. */
 "Import database" = "Імпорт бази даних";
 
+/* No comment provided by engineer. */
+"Import failed" = "Не вдалося імпортувати";
+
+/* No comment provided by engineer. */
+"Importing archive" = "Імпорт архіву";
+
+/* No comment provided by engineer. */
+"Improved message delivery" = "Покращена доставка повідомлень";
+
 /* No comment provided by engineer. */
 "Improved privacy and security" = "Покращена конфіденційність та безпека";
 
 /* No comment provided by engineer. */
 "Improved server configuration" = "Покращена конфігурація сервера";
 
+/* No comment provided by engineer. */
+"In order to continue, chat should be stopped." = "Для того, щоб продовжити, чат слід зупинити.";
+
 /* No comment provided by engineer. */
 "In reply to" = "У відповідь на";
 
 /* No comment provided by engineer. */
 "Incognito" = "Інкогніто";
 
+/* No comment provided by engineer. */
+"Incognito groups" = "Групи інкогніто";
+
 /* No comment provided by engineer. */
 "Incognito mode" = "Режим інкогніто";
 
@@ -1857,6 +2124,9 @@
 /* No comment provided by engineer. */
 "Incompatible database version" = "Несумісна версія бази даних";
 
+/* No comment provided by engineer. */
+"Incompatible version" = "Несумісна версія";
+
 /* PIN entry */
 "Incorrect passcode" = "Неправильний пароль";
 
@@ -1896,6 +2166,24 @@
 /* invalid chat item */
 "invalid data" = "невірні дані";
 
+/* No comment provided by engineer. */
+"Invalid display name!" = "Неправильне ім'я користувача!";
+
+/* No comment provided by engineer. */
+"Invalid link" = "Невірне посилання";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Недійсне підтвердження міграції";
+
+/* No comment provided by engineer. */
+"Invalid name!" = "Неправильне ім'я!";
+
+/* No comment provided by engineer. */
+"Invalid QR code" = "Неправильний QR-код";
+
+/* No comment provided by engineer. */
+"Invalid response" = "Неправильна відповідь";
+
 /* No comment provided by engineer. */
 "Invalid server address!" = "Неправильна адреса сервера!";
 
@@ -1974,12 +2262,33 @@
 /* No comment provided by engineer. */
 "Join group" = "Приєднуйтесь до групи";
 
+/* No comment provided by engineer. */
+"Join group conversations" = "Приєднуйтесь до групових розмов";
+
+/* No comment provided by engineer. */
+"Join group?" = "Приєднатися до групи?";
+
 /* No comment provided by engineer. */
 "Join incognito" = "Приєднуйтесь інкогніто";
 
+/* No comment provided by engineer. */
+"Join with current profile" = "Приєднатися з поточним профілем";
+
+/* No comment provided by engineer. */
+"Join your group?\nThis is your link for group %@!" = "Приєднатися до групи?\nЦе ваше посилання на групу %@!";
+
 /* No comment provided by engineer. */
 "Joining group" = "Приєднання до групи";
 
+/* No comment provided by engineer. */
+"Keep" = "Тримай";
+
+/* No comment provided by engineer. */
+"Keep the app open to use it from desktop" = "Тримайте додаток відкритим, щоб використовувати його з робочого столу";
+
+/* No comment provided by engineer. */
+"Keep unused invitation?" = "Зберігати невикористані запрошення?";
+
 /* No comment provided by engineer. */
 "Keep your connections" = "Зберігайте свої зв'язки";
 
@@ -2016,6 +2325,15 @@
 /* No comment provided by engineer. */
 "Limitations" = "Обмеження";
 
+/* No comment provided by engineer. */
+"Link mobile and desktop apps! 🔗" = "Зв'яжіть мобільні та десктопні додатки! 🔗";
+
+/* No comment provided by engineer. */
+"Linked desktop options" = "Параметри пов'язаного робочого столу";
+
+/* No comment provided by engineer. */
+"Linked desktops" = "Пов'язані робочі столи";
+
 /* No comment provided by engineer. */
 "LIVE" = "НАЖИВО";
 
@@ -2082,6 +2400,9 @@
 /* No comment provided by engineer. */
 "Member" = "Учасник";
 
+/* profile update event chat item */
+"member %@ changed to %@" = "учасника %1$@ змінено на %2$@";
+
 /* rcv group event chat item */
 "member connected" = "з'єднаний";
 
@@ -2118,15 +2439,48 @@
 /* No comment provided by engineer. */
 "Message text" = "Текст повідомлення";
 
+/* No comment provided by engineer. */
+"Message too large" = "Повідомлення занадто велике";
+
 /* No comment provided by engineer. */
 "Messages" = "Повідомлення";
 
 /* No comment provided by engineer. */
 "Messages & files" = "Повідомлення та файли";
 
+/* No comment provided by engineer. */
+"Messages from %@ will be shown!" = "Повідомлення від %@ будуть показані!";
+
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Повідомлення, файли та дзвінки захищені **наскрізним шифруванням** з ідеальною секретністю переадресації, відмовою та відновленням після злому.";
+
+/* No comment provided by engineer. */
+"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "Повідомлення, файли та дзвінки захищені **квантово-стійким шифруванням e2e** з ідеальною секретністю переадресації, відмовою та відновленням після злому.";
+
+/* No comment provided by engineer. */
+"Migrate device" = "Перенести пристрій";
+
+/* No comment provided by engineer. */
+"Migrate from another device" = "Перехід з іншого пристрою";
+
+/* No comment provided by engineer. */
+"Migrate here" = "Мігруйте сюди";
+
+/* No comment provided by engineer. */
+"Migrate to another device" = "Перехід на інший пристрій";
+
+/* No comment provided by engineer. */
+"Migrate to another device via QR code." = "Перейдіть на інший пристрій за допомогою QR-коду.";
+
+/* No comment provided by engineer. */
+"Migrating" = "Міграція";
+
 /* No comment provided by engineer. */
 "Migrating database archive…" = "Перенесення архіву бази даних…";
 
+/* No comment provided by engineer. */
+"Migration complete" = "Міграція завершена";
+
 /* No comment provided by engineer. */
 "Migration error:" = "Помилка міграції:";
 
@@ -2196,6 +2550,9 @@
 /* No comment provided by engineer. */
 "never" = "ніколи";
 
+/* No comment provided by engineer. */
+"New chat" = "Новий чат";
+
 /* notification */
 "New contact request" = "Новий запит на контакт";
 
@@ -2205,6 +2562,9 @@
 /* No comment provided by engineer. */
 "New database archive" = "Новий архів бази даних";
 
+/* No comment provided by engineer. */
+"New desktop app!" = "Новий десктопний додаток!";
+
 /* No comment provided by engineer. */
 "New display name" = "Нове ім'я відображення";
 
@@ -2268,6 +2628,9 @@
 /* copied message info in history */
 "no text" = "без тексту";
 
+/* No comment provided by engineer. */
+"Not compatible!" = "Не сумісні!";
+
 /* No comment provided by engineer. */
 "Notifications" = "Сповіщення";
 
@@ -2297,6 +2660,9 @@
 /* No comment provided by engineer. */
 "Ok" = "Гаразд";
 
+/* No comment provided by engineer. */
+"OK" = "ОК";
+
 /* No comment provided by engineer. */
 "Old database" = "Стара база даних";
 
@@ -2304,7 +2670,7 @@
 "Old database archive" = "Старий архів бази даних";
 
 /* group pref value */
-"on" = "увімкнено";
+"on" = "увімкненo";
 
 /* No comment provided by engineer. */
 "One-time invitation link" = "Посилання на одноразове запрошення";
@@ -2360,12 +2726,21 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Тільки ваш контакт може надсилати голосові повідомлення.";
 
+/* No comment provided by engineer. */
+"Open" = "Відкрито";
+
 /* No comment provided by engineer. */
 "Open chat" = "Відкритий чат";
 
 /* authentication reason */
 "Open chat console" = "Відкрийте консоль чату";
 
+/* No comment provided by engineer. */
+"Open group" = "Відкрита група";
+
+/* authentication reason */
+"Open migration to another device" = "Відкрита міграція на інший пристрій";
+
 /* No comment provided by engineer. */
 "Open Settings" = "Відкрийте Налаштування";
 
@@ -2375,6 +2750,21 @@
 /* No comment provided by engineer. */
 "Open-source protocol and code – anybody can run the servers." = "Протокол і код з відкритим вихідним кодом - будь-хто може запускати сервери.";
 
+/* No comment provided by engineer. */
+"Opening app…" = "Відкриваємо програму…";
+
+/* No comment provided by engineer. */
+"Or paste archive link" = "Або вставте посилання на архів";
+
+/* No comment provided by engineer. */
+"Or scan QR code" = "Або відскануйте QR-код";
+
+/* No comment provided by engineer. */
+"Or securely share this file link" = "Або безпечно поділіться цим посиланням на файл";
+
+/* No comment provided by engineer. */
+"Or show this code" = "Або покажіть цей код";
+
 /* member role */
 "owner" = "власник";
 
@@ -2396,9 +2786,21 @@
 /* No comment provided by engineer. */
 "Password to show" = "Показати пароль";
 
+/* past/unknown group member */
+"Past member %@" = "Колишній учасник %@";
+
+/* No comment provided by engineer. */
+"Paste desktop address" = "Вставте адресу робочого столу";
+
 /* No comment provided by engineer. */
 "Paste image" = "Вставити зображення";
 
+/* No comment provided by engineer. */
+"Paste link to connect!" = "Вставте посилання для підключення!";
+
+/* No comment provided by engineer. */
+"Paste the link you received" = "Вставте отримане посилання";
+
 /* No comment provided by engineer. */
 "peer-to-peer" = "одноранговий";
 
@@ -2411,6 +2813,9 @@
 /* message decrypt error item */
 "Permanent decryption error" = "Постійна помилка розшифрування";
 
+/* No comment provided by engineer. */
+"Picture-in-picture calls" = "Дзвінки \"картинка в картинці";
+
 /* No comment provided by engineer. */
 "PING count" = "Кількість PING";
 
@@ -2429,6 +2834,12 @@
 /* No comment provided by engineer. */
 "Please check yours and your contact preferences." = "Будь ласка, перевірте свої та контактні налаштування.";
 
+/* No comment provided by engineer. */
+"Please confirm that network settings are correct for this device." = "Переконайтеся, що налаштування мережі для цього пристрою є правильними.";
+
+/* No comment provided by engineer. */
+"Please contact developers.\nError: %@" = "Зверніться до розробників.\nПомилка: %@";
+
 /* No comment provided by engineer. */
 "Please contact group admin." = "Зверніться до адміністратора групи.";
 
@@ -2459,6 +2870,9 @@
 /* server test error */
 "Possibly, certificate fingerprint in server address is incorrect" = "Можливо, в адресі сервера неправильно вказано відбиток сертифіката";
 
+/* No comment provided by engineer. */
+"Post-quantum E2EE" = "Пост-квантовий E2EE";
+
 /* No comment provided by engineer. */
 "Preserve the last message draft, with attachments." = "Зберегти чернетку останнього повідомлення з вкладеннями.";
 
@@ -2480,12 +2894,21 @@
 /* No comment provided by engineer. */
 "Private filenames" = "Приватні імена файлів";
 
+/* name of notes to self */
+"Private notes" = "Приватні нотатки";
+
 /* No comment provided by engineer. */
 "Profile and server connections" = "З'єднання профілю та сервера";
 
 /* No comment provided by engineer. */
 "Profile image" = "Зображення профілю";
 
+/* No comment provided by engineer. */
+"Profile name" = "Назва профілю";
+
+/* No comment provided by engineer. */
+"Profile name:" = "Ім'я профілю:";
+
 /* No comment provided by engineer. */
 "Profile password" = "Пароль до профілю";
 
@@ -2531,6 +2954,15 @@
 /* No comment provided by engineer. */
 "Push notifications" = "Push-повідомлення";
 
+/* No comment provided by engineer. */
+"Push server" = "Push-сервер";
+
+/* chat item text */
+"quantum resistant e2e encryption" = "квантово-стійке шифрування e2e";
+
+/* No comment provided by engineer. */
+"Quantum resistant encryption" = "Квантово-стійке шифрування";
+
 /* No comment provided by engineer. */
 "Rate the app" = "Оцініть додаток";
 
@@ -2546,6 +2978,9 @@
 /* No comment provided by engineer. */
 "Read more in [User Guide](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address)." = "Читайте більше в [Посібнику користувача](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).";
 
+/* No comment provided by engineer. */
+"Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." = "Читайте більше в [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).";
+
 /* No comment provided by engineer. */
 "Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." = "Читайте більше в [Посібнику користувача](https://simplex.chat/docs/guide/readme.html#connect-to-friends).";
 
@@ -2585,6 +3020,9 @@
 /* No comment provided by engineer. */
 "Receiving via" = "Отримання через";
 
+/* No comment provided by engineer. */
+"Recent history and improved [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)." = "Нещодавня історія та покращення [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).";
+
 /* No comment provided by engineer. */
 "Recipients see updates as you type them." = "Одержувачі бачать оновлення, коли ви їх вводите.";
 
@@ -2639,6 +3077,12 @@
 /* rcv group event chat item */
 "removed %@" = "видалено %@";
 
+/* profile update event chat item */
+"removed contact address" = "видалено контактну адресу";
+
+/* profile update event chat item */
+"removed profile picture" = "видалено зображення профілю";
+
 /* rcv group event chat item */
 "removed you" = "прибрали вас";
 
@@ -2651,6 +3095,21 @@
 /* No comment provided by engineer. */
 "Renegotiate encryption?" = "Переузгодьте шифрування?";
 
+/* No comment provided by engineer. */
+"Repeat connection request?" = "Повторити запит на підключення?";
+
+/* No comment provided by engineer. */
+"Repeat download" = "Повторити завантаження";
+
+/* No comment provided by engineer. */
+"Repeat import" = "Повторний імпорт";
+
+/* No comment provided by engineer. */
+"Repeat join request?" = "Повторити запит на приєднання?";
+
+/* No comment provided by engineer. */
+"Repeat upload" = "Повторне завантаження";
+
 /* chat item action */
 "Reply" = "Відповісти";
 
@@ -2684,6 +3143,9 @@
 /* No comment provided by engineer. */
 "Restore database error" = "Відновлення помилки бази даних";
 
+/* No comment provided by engineer. */
+"Retry" = "Спробуйте ще раз";
+
 /* chat item action */
 "Reveal" = "Показувати";
 
@@ -2705,6 +3167,9 @@
 /* No comment provided by engineer. */
 "Run chat" = "Запустити чат";
 
+/* No comment provided by engineer. */
+"Safer groups" = "Безпечніші групи";
+
 /* chat item action */
 "Save" = "Зберегти";
 
@@ -2736,7 +3201,7 @@
 "Save passphrase in Keychain" = "Збережіть парольну фразу в Keychain";
 
 /* No comment provided by engineer. */
-"Save preferences?" = "Зберегти налаштування?";
+"Save preferences?" = "Зберегти настройки?";
 
 /* No comment provided by engineer. */
 "Save profile password" = "Зберегти пароль профілю";
@@ -2753,6 +3218,9 @@
 /* No comment provided by engineer. */
 "Save welcome message?" = "Зберегти вітальне повідомлення?";
 
+/* message info title */
+"Saved message" = "Збережене повідомлення";
+
 /* No comment provided by engineer. */
 "Saved WebRTC ICE servers will be removed" = "Збережені сервери WebRTC ICE буде видалено";
 
@@ -2762,6 +3230,9 @@
 /* No comment provided by engineer. */
 "Scan QR code" = "Відскануйте QR-код";
 
+/* No comment provided by engineer. */
+"Scan QR code from desktop" = "Відскануйте QR-код з робочого столу";
+
 /* No comment provided by engineer. */
 "Scan security code from your contact's app." = "Відскануйте код безпеки з додатку вашого контакту.";
 
@@ -2771,6 +3242,12 @@
 /* No comment provided by engineer. */
 "Search" = "Пошук";
 
+/* No comment provided by engineer. */
+"Search bar accepts invitation links." = "Рядок пошуку приймає посилання-запрошення.";
+
+/* No comment provided by engineer. */
+"Search or paste SimpleX link" = "Знайдіть або вставте посилання SimpleX";
+
 /* network option */
 "sec" = "сек";
 
@@ -2816,9 +3293,15 @@
 /* No comment provided by engineer. */
 "Send delivery receipts to" = "Надсилання звітів про доставку";
 
+/* No comment provided by engineer. */
+"send direct message" = "надіслати пряме повідомлення";
+
 /* No comment provided by engineer. */
 "Send direct message" = "Надішліть пряме повідомлення";
 
+/* No comment provided by engineer. */
+"Send direct message to connect" = "Надішліть пряме повідомлення, щоб підключитися";
+
 /* No comment provided by engineer. */
 "Send disappearing message" = "Надіслати зникаюче повідомлення";
 
@@ -2843,6 +3326,9 @@
 /* No comment provided by engineer. */
 "Send them from gallery or custom keyboards." = "Надсилайте їх із галереї чи власних клавіатур.";
 
+/* No comment provided by engineer. */
+"Send up to 100 last messages to new members." = "Надішліть до 100 останніх повідомлень новим користувачам.";
+
 /* No comment provided by engineer. */
 "Sender cancelled file transfer." = "Відправник скасував передачу файлу.";
 
@@ -2900,6 +3386,9 @@
 /* No comment provided by engineer. */
 "Servers" = "Сервери";
 
+/* No comment provided by engineer. */
+"Session code" = "Код сесії";
+
 /* No comment provided by engineer. */
 "Set 1 day" = "Встановити 1 день";
 
@@ -2912,9 +3401,18 @@
 /* No comment provided by engineer. */
 "Set it instead of system authentication." = "Встановіть його замість аутентифікації системи.";
 
+/* profile update event chat item */
+"set new contact address" = "встановити нову контактну адресу";
+
+/* profile update event chat item */
+"set new profile picture" = "встановити нове зображення профілю";
+
 /* No comment provided by engineer. */
 "Set passcode" = "Встановити пароль";
 
+/* No comment provided by engineer. */
+"Set passphrase" = "Встановити парольну фразу";
+
 /* No comment provided by engineer. */
 "Set passphrase to export" = "Встановити ключову фразу для експорту";
 
@@ -2942,6 +3440,9 @@
 /* No comment provided by engineer. */
 "Share link" = "Поділіться посиланням";
 
+/* No comment provided by engineer. */
+"Share this 1-time invite link" = "Поділіться цим одноразовим посиланням-запрошенням";
+
 /* No comment provided by engineer. */
 "Share with contacts" = "Поділіться з контактами";
 
@@ -2957,6 +3458,9 @@
 /* No comment provided by engineer. */
 "Show preview" = "Показати попередній перегляд";
 
+/* No comment provided by engineer. */
+"Show QR code" = "Показати QR-код";
+
 /* No comment provided by engineer. */
 "Show:" = "Показати:";
 
@@ -2996,6 +3500,9 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Одноразове запрошення SimpleX";
 
+/* No comment provided by engineer. */
+"Simplified incognito mode" = "Спрощений режим інкогніто";
+
 /* No comment provided by engineer. */
 "Skip" = "Пропустити";
 
@@ -3014,9 +3521,15 @@
 /* notification title */
 "Somebody" = "Хтось";
 
+/* chat item text */
+"standard end-to-end encryption" = "стандартне наскрізне шифрування";
+
 /* No comment provided by engineer. */
 "Start chat" = "Почати чат";
 
+/* No comment provided by engineer. */
+"Start chat?" = "Почати чат?";
+
 /* No comment provided by engineer. */
 "Start migration" = "Почати міграцію";
 
@@ -3026,6 +3539,9 @@
 /* No comment provided by engineer. */
 "Stop" = "Зупинити";
 
+/* No comment provided by engineer. */
+"Stop chat" = "Припинити чат";
+
 /* No comment provided by engineer. */
 "Stop chat to enable database actions" = "Зупиніть чат, щоб увімкнути дії з базою даних";
 
@@ -3053,6 +3569,9 @@
 /* authentication reason */
 "Stop SimpleX" = "Зупинити SimpleX";
 
+/* No comment provided by engineer. */
+"Stopping chat" = "Зупинка чату";
+
 /* No comment provided by engineer. */
 "strike" = "закреслено";
 
@@ -3077,12 +3596,21 @@
 /* No comment provided by engineer. */
 "Tap to activate profile." = "Натисніть, щоб активувати профіль.";
 
+/* No comment provided by engineer. */
+"Tap to Connect" = "Натисніть, щоб підключитися";
+
 /* No comment provided by engineer. */
 "Tap to join" = "Натисніть, щоб приєднатися";
 
 /* No comment provided by engineer. */
 "Tap to join incognito" = "Натисніть, щоб приєднатися інкогніто";
 
+/* No comment provided by engineer. */
+"Tap to paste link" = "Натисніть, щоб вставити посилання";
+
+/* No comment provided by engineer. */
+"Tap to scan" = "Натисніть, щоб сканувати";
+
 /* No comment provided by engineer. */
 "Tap to start a new chat" = "Натисніть, щоб почати новий чат";
 
@@ -3128,6 +3656,9 @@
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "Спроба змінити пароль до бази даних не була завершена.";
 
+/* No comment provided by engineer. */
+"The code you scanned is not a SimpleX link QR code." = "Відсканований вами код не є QR-кодом посилання SimpleX.";
+
 /* No comment provided by engineer. */
 "The connection you accepted will be cancelled!" = "Прийняте вами з'єднання буде скасовано!";
 
@@ -3170,6 +3701,9 @@
 /* No comment provided by engineer. */
 "The servers for new connections of your current chat profile **%@**." = "Сервери для нових підключень вашого поточного профілю чату **%@**.";
 
+/* No comment provided by engineer. */
+"The text you pasted is not a SimpleX link." = "Текст, який ви вставили, не є посиланням SimpleX.";
+
 /* No comment provided by engineer. */
 "Theme" = "Тема";
 
@@ -3188,15 +3722,33 @@
 /* No comment provided by engineer. */
 "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost." = "Цю дію неможливо скасувати - ваш профіль, контакти, повідомлення та файли будуть безповоротно втрачені.";
 
+/* E2EE info chat item */
+"This chat is protected by end-to-end encryption." = "Цей чат захищений наскрізним шифруванням.";
+
+/* E2EE info chat item */
+"This chat is protected by quantum resistant end-to-end encryption." = "Цей чат захищений квантово-стійким наскрізним шифруванням.";
+
 /* notification title */
 "this contact" = "цей контакт";
 
+/* No comment provided by engineer. */
+"This device name" = "Це ім'я пристрою";
+
+/* No comment provided by engineer. */
+"This display name is invalid. Please choose another name." = "Це ім'я для відображення є недійсним. Будь ласка, виберіть інше ім'я.";
+
 /* No comment provided by engineer. */
 "This group has over %lld members, delivery receipts are not sent." = "У цій групі більше %lld учасників, підтвердження доставки не надсилаються.";
 
 /* No comment provided by engineer. */
 "This group no longer exists." = "Цієї групи більше не існує.";
 
+/* No comment provided by engineer. */
+"This is your own one-time link!" = "Це ваше власне одноразове посилання!";
+
+/* No comment provided by engineer. */
+"This is your own SimpleX address!" = "Це ваша власна SimpleX-адреса!";
+
 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Це налаштування застосовується до повідомлень у вашому поточному профілі чату **%@**.";
 
@@ -3206,6 +3758,9 @@
 /* No comment provided by engineer. */
 "To connect, your contact can scan QR code or use the link in the app." = "Щоб підключитися, ваш контакт може відсканувати QR-код або скористатися посиланням у додатку.";
 
+/* No comment provided by engineer. */
+"To hide unwanted messages." = "Приховати небажані повідомлення.";
+
 /* No comment provided by engineer. */
 "To make a new connection" = "Щоб створити нове з'єднання";
 
@@ -3230,6 +3785,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Щоб перевірити наскрізне шифрування з вашим контактом, порівняйте (або відскануйте) код на ваших пристроях.";
 
+/* No comment provided by engineer. */
+"Toggle incognito when connecting." = "Увімкніть інкогніто при підключенні.";
+
 /* No comment provided by engineer. */
 "Transport isolation" = "Транспортна ізоляція";
 
@@ -3239,6 +3797,9 @@
 /* No comment provided by engineer. */
 "Trying to connect to the server used to receive messages from this contact." = "Спроба з'єднатися з сервером, який використовується для отримання повідомлень від цього контакту.";
 
+/* No comment provided by engineer. */
+"Turkish interface" = "Турецький інтерфейс";
+
 /* No comment provided by engineer. */
 "Turn off" = "Вимкнути";
 
@@ -3248,6 +3809,24 @@
 /* No comment provided by engineer. */
 "Unable to record voice message" = "Не вдається записати голосове повідомлення";
 
+/* No comment provided by engineer. */
+"Unblock" = "Розблoкувати";
+
+/* No comment provided by engineer. */
+"Unblock for all" = "Розблокування для всіх";
+
+/* No comment provided by engineer. */
+"Unblock member" = "Розблокувати учасника";
+
+/* No comment provided by engineer. */
+"Unblock member for all?" = "Розблокувати учасника для всіх?";
+
+/* No comment provided by engineer. */
+"Unblock member?" = "Розблокувати учасника?";
+
+/* rcv group event chat item */
+"unblocked %@" = "розблоковано %@";
+
 /* item status description */
 "Unexpected error: %@" = "Неочікувана помилка: %@";
 
@@ -3281,12 +3860,21 @@
 /* No comment provided by engineer. */
 "Unknown error" = "Невідома помилка";
 
+/* No comment provided by engineer. */
+"unknown status" = "невідомий статус";
+
 /* No comment provided by engineer. */
 "Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." = "Якщо ви не користуєтеся інтерфейсом виклику iOS, увімкніть режим \"Не турбувати\", щоб уникнути переривань.";
 
 /* No comment provided by engineer. */
 "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Якщо ваш контакт не видалив з'єднання або якщо це посилання вже використовувалося, це може бути помилкою - будь ласка, повідомте про це.\nЩоб підключитися, попросіть вашого контакта створити інше посилання і перевірте, чи маєте ви стабільне з'єднання з мережею.";
 
+/* No comment provided by engineer. */
+"Unlink" = "Роз'єднати зв'язок";
+
+/* No comment provided by engineer. */
+"Unlink desktop?" = "Від'єднати робочий стіл?";
+
 /* No comment provided by engineer. */
 "Unlock" = "Розблокувати";
 
@@ -3299,6 +3887,9 @@
 /* No comment provided by engineer. */
 "Unread" = "Непрочитане";
 
+/* No comment provided by engineer. */
+"Up to 100 last messages are sent to new members." = "Новим користувачам надсилається до 100 останніх повідомлень.";
+
 /* No comment provided by engineer. */
 "Update" = "Оновлення";
 
@@ -3317,6 +3908,9 @@
 /* rcv group event chat item */
 "updated group profile" = "оновлений профіль групи";
 
+/* profile update event chat item */
+"updated profile" = "оновлений профіль";
+
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Оновлення налаштувань призведе до перепідключення клієнта до всіх серверів.";
 
@@ -3326,9 +3920,15 @@
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Оновлення та відкритий чат";
 
+/* No comment provided by engineer. */
+"Upload failed" = "Не вдалося завантфжити";
+
 /* server test step */
 "Upload file" = "Завантажити файл";
 
+/* No comment provided by engineer. */
+"Uploading archive" = "Завантаження архіву";
+
 /* No comment provided by engineer. */
 "Use .onion hosts" = "Використовуйте хости .onion";
 
@@ -3341,18 +3941,27 @@
 /* No comment provided by engineer. */
 "Use for new connections" = "Використовуйте для нових з'єднань";
 
+/* No comment provided by engineer. */
+"Use from desktop" = "Використання з робочого столу";
+
 /* No comment provided by engineer. */
 "Use iOS call interface" = "Використовуйте інтерфейс виклику iOS";
 
 /* No comment provided by engineer. */
 "Use new incognito profile" = "Використовуйте новий профіль інкогніто";
 
+/* No comment provided by engineer. */
+"Use only local notifications?" = "Використовувати лише локальні сповіщення?";
+
 /* No comment provided by engineer. */
 "Use server" = "Використовувати сервер";
 
 /* No comment provided by engineer. */
 "Use SimpleX Chat servers?" = "Використовувати сервери SimpleX Chat?";
 
+/* No comment provided by engineer. */
+"Use the app while in the call." = "Використовуйте додаток під час розмови.";
+
 /* No comment provided by engineer. */
 "User profile" = "Профіль користувача";
 
@@ -3362,12 +3971,30 @@
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Використання серверів SimpleX Chat.";
 
+/* No comment provided by engineer. */
+"v%@" = "v%@";
+
 /* No comment provided by engineer. */
 "v%@ (%@)" = "v%@ (%@)";
 
+/* No comment provided by engineer. */
+"Verify code with desktop" = "Перевірте код на робочому столі";
+
+/* No comment provided by engineer. */
+"Verify connection" = "Перевірте з'єднання";
+
 /* No comment provided by engineer. */
 "Verify connection security" = "Перевірте безпеку з'єднання";
 
+/* No comment provided by engineer. */
+"Verify connections" = "Пeревірте з'єднання";
+
+/* No comment provided by engineer. */
+"Verify database passphrase" = "Перевірте пароль до бази даних";
+
+/* No comment provided by engineer. */
+"Verify passphrase" = "Підтвердіть парольну фразу";
+
 /* No comment provided by engineer. */
 "Verify security code" = "Підтвердіть код безпеки";
 
@@ -3386,6 +4013,9 @@
 /* No comment provided by engineer. */
 "via relay" = "за допомогою ретранслятора";
 
+/* No comment provided by engineer. */
+"Via secure quantum resistant protocol." = "Через безпечний квантово-стійкий протокол.";
+
 /* No comment provided by engineer. */
 "Video call" = "Відеодзвінок";
 
@@ -3404,6 +4034,9 @@
 /* No comment provided by engineer. */
 "View security code" = "Переглянути код безпеки";
 
+/* chat feature */
+"Visible history" = "Видима історія";
+
 /* No comment provided by engineer. */
 "Voice message…" = "Голосове повідомлення…";
 
@@ -3425,6 +4058,9 @@
 /* No comment provided by engineer. */
 "waiting for confirmation…" = "чекаємо на підтвердження…";
 
+/* No comment provided by engineer. */
+"Waiting for desktop..." = "Чекаємо на десктопну версію...";
+
 /* No comment provided by engineer. */
 "Waiting for file" = "Очікування файлу";
 
@@ -3437,6 +4073,9 @@
 /* No comment provided by engineer. */
 "wants to connect to you!" = "хоче зв'язатися з вами!";
 
+/* No comment provided by engineer. */
+"Warning: starting chat on multiple devices is not supported and will cause message delivery failures" = "Попередження: запуск чату на декількох пристроях не підтримується і може призвести до збоїв у доставці повідомлень";
+
 /* No comment provided by engineer. */
 "Warning: you may lose some data!" = "Попередження: ви можете втратити деякі дані!";
 
@@ -3452,6 +4091,9 @@
 /* No comment provided by engineer. */
 "Welcome message" = "Вітальне повідомлення";
 
+/* No comment provided by engineer. */
+"Welcome message is too long" = "Привітальне повідомлення занадто довге";
+
 /* No comment provided by engineer. */
 "What's new" = "Що нового";
 
@@ -3464,9 +4106,15 @@
 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Коли ви ділитеся з кимось своїм профілем інкогніто, цей профіль буде використовуватися для груп, до яких вас запрошують.";
 
+/* No comment provided by engineer. */
+"With encrypted files and media." = "З зашифрованими файлами та медіа.";
+
 /* No comment provided by engineer. */
 "With optional welcome message." = "З необов'язковим вітальним повідомленням.";
 
+/* No comment provided by engineer. */
+"With reduced battery usage." = "З меншим споживанням заряду акумулятора.";
+
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Неправильний пароль до бази даних";
 
@@ -3482,6 +4130,9 @@
 /* No comment provided by engineer. */
 "You" = "Ти";
 
+/* No comment provided by engineer. */
+"You **must not** use the same database on two devices." = "Ви **не повинні використовувати** одну і ту ж базу даних на двох пристроях.";
+
 /* No comment provided by engineer. */
 "You accepted connection" = "Ви прийняли підключення";
 
@@ -3494,6 +4145,27 @@
 /* No comment provided by engineer. */
 "You are already connected to %@." = "Ви вже підключені до %@.";
 
+/* No comment provided by engineer. */
+"You are already connecting to %@." = "Ви вже з'єднані з %@.";
+
+/* No comment provided by engineer. */
+"You are already connecting via this one-time link!" = "Ви вже підключаєтеся до %@.Ви вже підключаєтеся за цим одноразовим посиланням!";
+
+/* No comment provided by engineer. */
+"You are already in group %@." = "Ви вже перебуваєте в групі %@.";
+
+/* No comment provided by engineer. */
+"You are already joining the group %@." = "Ви вже приєдналися до групи %@.";
+
+/* No comment provided by engineer. */
+"You are already joining the group via this link!" = "Ви вже приєдналися до групи за цим посиланням!";
+
+/* No comment provided by engineer. */
+"You are already joining the group via this link." = "Ви вже приєдналися до групи за цим посиланням.";
+
+/* No comment provided by engineer. */
+"You are already joining the group!\nRepeat join request?" = "Ви вже приєдналися до групи!\nПовторити запит на приєднання?";
+
 /* No comment provided by engineer. */
 "You are connected to the server used to receive messages from this contact." = "Ви підключені до сервера, який використовується для отримання повідомлень від цього контакту.";
 
@@ -3506,6 +4178,9 @@
 /* No comment provided by engineer. */
 "you are observer" = "ви спостерігач";
 
+/* snd group event chat item */
+"you blocked %@" = "ви заблокували %@";
+
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Ви можете приймати дзвінки з екрана блокування без автентифікації пристрою та програми.";
 
@@ -3518,9 +4193,15 @@
 /* No comment provided by engineer. */
 "You can enable them later via app Privacy & Security settings." = "Ви можете увімкнути їх пізніше в налаштуваннях конфіденційності та безпеки програми.";
 
+/* No comment provided by engineer. */
+"You can give another try." = "Ви можете спробувати ще раз.";
+
 /* No comment provided by engineer. */
 "You can hide or mute a user profile - swipe it to the right." = "Ви можете приховати або вимкнути звук профілю користувача - проведіть по ньому вправо.";
 
+/* No comment provided by engineer. */
+"You can make it visible to your SimpleX contacts via Settings." = "Ви можете зробити його видимим для ваших контактів у SimpleX за допомогою налаштувань.";
+
 /* notification body */
 "You can now send messages to %@" = "Тепер ви можете надсилати повідомлення на адресу %@";
 
@@ -3545,6 +4226,9 @@
 /* No comment provided by engineer. */
 "You can use markdown to format messages:" = "Ви можете використовувати розмітку для форматування повідомлень:";
 
+/* No comment provided by engineer. */
+"You can view invitation link again in connection details." = "Ви можете переглянути посилання на запрошення ще раз у деталях підключення.";
+
 /* No comment provided by engineer. */
 "You can't send messages!" = "Ви не можете надсилати повідомлення!";
 
@@ -3566,6 +4250,12 @@
 /* No comment provided by engineer. */
 "You could not be verified; please try again." = "Вас не вдалося верифікувати, спробуйте ще раз.";
 
+/* No comment provided by engineer. */
+"You have already requested connection via this address!" = "Ви вже надсилали запит на підключення за цією адресою!";
+
+/* No comment provided by engineer. */
+"You have already requested connection!\nRepeat connection request?" = "Ви вже надіслали запит на підключення!\nПовторити запит на підключення?";
+
 /* No comment provided by engineer. */
 "You have no chats" = "У вас немає чатів";
 
@@ -3605,9 +4295,15 @@
 /* chat list item description */
 "you shared one-time link incognito" = "ви поділилися одноразовим посиланням інкогніто";
 
+/* snd group event chat item */
+"you unblocked %@" = "ви розблокували %@";
+
 /* No comment provided by engineer. */
 "You will be connected to group when the group host's device is online, please wait or check later!" = "Ви будете підключені до групи, коли пристрій господаря групи буде в мережі, будь ласка, зачекайте або перевірте пізніше!";
 
+/* No comment provided by engineer. */
+"You will be connected when group link host's device is online, please wait or check later!" = "Ви будете підключені, коли пристрій хоста групового посилання буде онлайн, будь ласка, зачекайте або перевірте пізніше!";
+
 /* No comment provided by engineer. */
 "You will be connected when your connection request is accepted, please wait or check later!" = "Ви будете підключені, коли ваш запит на підключення буде прийнято, будь ласка, зачекайте або перевірте пізніше!";
 
@@ -3617,6 +4313,9 @@
 /* No comment provided by engineer. */
 "You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Вам потрібно буде пройти автентифікацію при запуску або відновленні програми після 30 секунд роботи у фоновому режимі.";
 
+/* No comment provided by engineer. */
+"You will connect to all group members." = "Ви з'єднаєтеся з усіма учасниками групи.";
+
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Ви все одно отримуватимете дзвінки та сповіщення від вимкнених профілів, якщо вони активні.";
 
@@ -3677,6 +4376,9 @@
 /* No comment provided by engineer. */
 "Your privacy" = "Ваша конфіденційність";
 
+/* No comment provided by engineer. */
+"Your profile" = "Ваш профіль";
+
 /* No comment provided by engineer. */
 "Your profile **%@** will be shared." = "Ваш профіль **%@** буде опублікований.";
 
diff --git a/apps/ios/uk.lproj/SimpleX--iOS--InfoPlist.strings b/apps/ios/uk.lproj/SimpleX--iOS--InfoPlist.strings
index 2e3c6b8930..081ea9b074 100644
--- a/apps/ios/uk.lproj/SimpleX--iOS--InfoPlist.strings
+++ b/apps/ios/uk.lproj/SimpleX--iOS--InfoPlist.strings
@@ -7,6 +7,9 @@
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX використовує Face ID для локальної автентифікації";
 
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX використовує доступ до локальної мережі, щоб дозволити користувачеві користуватися профілем чату через десктопну програму в тій же мережі.";
+
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX потребує доступу до мікрофона для аудіо та відео дзвінків, а також для запису голосових повідомлень.";
 
diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts
index 0c77bdbe62..0a8b5ec91a 100644
--- a/apps/multiplatform/android/build.gradle.kts
+++ b/apps/multiplatform/android/build.gradle.kts
@@ -8,12 +8,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion(34)
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "chat.simplex.app"
-        minSdkVersion(28)
-        targetSdkVersion(33)
+        namespace = "chat.simplex.app"
+        minSdk = 28
+        //noinspection OldTargetApi
+        targetSdk = 33
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes
         versionCode = (extra["android.version_code"] as String).toInt()
@@ -46,12 +48,7 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    compileOptions {
-        sourceCompatibility =  JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
     kotlinOptions {
-        jvmTarget = "1.8"
         freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
         freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
         freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"
@@ -71,18 +68,20 @@ android {
             isMinifyEnabled = false
         }
     }
-    packagingOptions {
+    buildFeatures {
+        buildConfig = true
+    }
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
         jniLibs.useLegacyPackaging = rootProject.extra["compression.level"] as Int != 0
     }
     android.sourceSets["main"].assets.setSrcDirs(listOf("../common/src/commonMain/resources/assets"))
-    val isRelease = gradle.startParameter.taskNames.find { it.toLowerCase().contains("release") } != null
-    val isBundle = gradle.startParameter.taskNames.find { it.toLowerCase().contains("bundle") } != null
-    //    if (isRelease) {
+    val isRelease = gradle.startParameter.taskNames.find { it.lowercase().contains("release") } != null
+    val isBundle = gradle.startParameter.taskNames.find { it.lowercase().contains("bundle") } != null
     // Comma separated list of languages that will be included in the apk
-    android.defaultConfig.resConfigs(
+    android.defaultConfig.resourceConfigurations += listOf(
         "en",
         "ar",
         "bg",
@@ -104,7 +103,7 @@ android {
         "uk",
         "zh-rCN"
     )
-    //    }
+    ndkVersion = "23.1.7779620"
     if (isBundle) {
         defaultConfig.ndk.abiFilters("arm64-v8a", "armeabi-v7a")
     } else {
@@ -125,41 +124,44 @@ android {
 
 dependencies {
     implementation(project(":common"))
-    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.core:core-ktx:1.12.0")
     //implementation("androidx.compose.ui:ui:${rootProject.extra["compose.version"] as String}")
     //implementation("androidx.compose.material:material:$compose_version")
     //implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
-    implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1")
-    implementation("androidx.lifecycle:lifecycle-process:2.4.1")
-    implementation("androidx.activity:activity-compose:1.5.0")
-    val work_version = "2.7.1"
-    implementation("androidx.work:work-runtime-ktx:$work_version")
-    implementation("androidx.work:work-multiprocess:$work_version")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-process:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    val workVersion = "2.9.0"
+    implementation("androidx.work:work-runtime-ktx:$workVersion")
+    implementation("androidx.work:work-multiprocess:$workVersion")
 
-    implementation("com.jakewharton:process-phoenix:2.1.2")
+    implementation("com.jakewharton:process-phoenix:2.2.0")
+
+    //Camera Permission
+    implementation("com.google.accompanist:accompanist-permissions:0.23.0")
 
     //implementation("androidx.compose.material:material-icons-extended:$compose_version")
     //implementation("androidx.compose.ui:ui-util:$compose_version")
 
     testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     //androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_version")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.4.3")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.6.4")
 }
 
 tasks {
     val compressApk by creating {
         doLast {
-            val isRelease = gradle.startParameter.taskNames.find { it.toLowerCase().contains("release") } != null
+            val isRelease = gradle.startParameter.taskNames.find { it.lowercase().contains("release") } != null
             val buildType: String = if (isRelease) "release" else "debug"
             val javaHome = System.getProperties()["java.home"] ?: org.gradle.internal.jvm.Jvm.current().javaHome
             val sdkDir = android.sdkDirectory.absolutePath
-            var keyAlias = ""
-            var keyPassword = ""
-            var storeFile = ""
-            var storePassword = ""
+            val keyAlias: String
+            val keyPassword: String
+            val storeFile: String
+            val storePassword: String
             if (project.properties["android.injected.signing.key.alias"] != null) {
                 keyAlias = project.properties["android.injected.signing.key.alias"] as String
                 keyPassword = project.properties["android.injected.signing.key.password"] as String
@@ -184,16 +186,16 @@ tasks {
             }
             exec {
                 workingDir("../../../scripts/android")
-                setEnvironment(mapOf("JAVA_HOME" to "$javaHome"))
+                environment = mapOf("JAVA_HOME" to "$javaHome")
                 commandLine = listOf(
                     "./compress-and-sign-apk.sh",
                     "${rootProject.extra["compression.level"]}",
                     "$outputDir",
-                    "$sdkDir",
-                    "$storeFile",
-                    "$storePassword",
-                    "$keyAlias",
-                    "$keyPassword"
+                    sdkDir,
+                    storeFile,
+                    storePassword,
+                    keyAlias,
+                    keyPassword
                 )
             }
 
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
index b0600e6d59..f56bf4fe00 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
@@ -6,6 +6,7 @@ import android.content.*
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.*
+import android.os.SystemClock
 import android.provider.Settings
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt
index 7673658cfb..f83933b2e0 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt
@@ -4,6 +4,7 @@ import android.app.*
 import android.app.TaskStackBuilder
 import android.content.*
 import android.content.pm.PackageManager
+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.hardware.display.DisplayManager
 import android.media.AudioAttributes
@@ -218,7 +219,7 @@ object NtfManager {
       .setGroup(MessageGroup)
       .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
       .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(null)
+      .setLargeIcon(null as Bitmap?)
       .setColor(0x88FFFF)
       .setAutoCancel(true)
       .setVibrate(null)
diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
index 6b1b01db99..b78f3ac518 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
@@ -1,7 +1,9 @@
 package chat.simplex.app.views.call
 
+import android.Manifest
 import android.app.*
 import android.content.*
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.os.*
@@ -28,6 +30,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import chat.simplex.app.*
 import chat.simplex.app.R
@@ -36,10 +39,12 @@ import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.AcceptCallAction
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
+import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -109,9 +114,20 @@ class CallActivity: ComponentActivity(), ServiceConnection {
     m.callCommand.add(WCallCommand.Layout(layoutType))
   }
 
+  private fun hasGrantedPermissions(): Boolean {
+    val grantedAudio = ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
+    val grantedCamera = !callSupportsVideo() || ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
+    return grantedAudio && grantedCamera
+  }
+
   override fun onBackPressed() {
     if (isOnLockScreenNow()) {
       super.onBackPressed()
+    } else if (!hasGrantedPermissions() && !callSupportsVideo()) {
+      val call = m.activeCall.value
+      if (call != null) {
+        withBGApi { chatModel.callManager.endCall(call) }
+      }
     } else {
       m.activeCallViewIsCollapsed.value = true
     }
@@ -223,8 +239,21 @@ fun CallActivityView() {
     }
     Box(Modifier.background(Color.Black)) {
       if (call != null) {
+        val permissionsState = rememberMultiplePermissionsState(
+          permissions = if (callSupportsVideo()) {
+            listOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)
+          } else {
+            listOf(Manifest.permission.RECORD_AUDIO)
+          }
+        )
+        if (permissionsState.allPermissionsGranted) {
+          ActiveCallView()
+        } else {
+          CallPermissionsView(remember { m.activeCallViewIsCollapsed }.value, callSupportsVideo()) {
+            withBGApi { chatModel.callManager.endCall(call) }
+          }
+        }
         val view = LocalView.current
-        ActiveCallView()
         if (callSupportsVideo()) {
           val scope = rememberCoroutineScope()
           LaunchedEffect(Unit) {
@@ -252,6 +281,9 @@ fun CallActivityView() {
         }
       }
     }
+    if (!m.activeCallViewIsCollapsed.value) {
+      AlertManager.shared.showInView()
+    }
   }
   LaunchedEffect(call == null) {
     if (call != null) {
diff --git a/apps/multiplatform/build.gradle.kts b/apps/multiplatform/build.gradle.kts
index f404207529..a0cd35b3ca 100644
--- a/apps/multiplatform/build.gradle.kts
+++ b/apps/multiplatform/build.gradle.kts
@@ -47,6 +47,9 @@ buildscript {
         classpath(kotlin("gradle-plugin", version = rootProject.extra["kotlin.version"] as String))
         classpath("dev.icerock.moko:resources-generator:0.23.0")
 
+        // Workaround gradle sync issue: https://github.com/gmazzo/gradle-buildconfig-plugin/issues/137#issuecomment-1935739759
+        classpath("com.squareup:kotlinpoet:1.16.0")
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -80,6 +83,30 @@ plugins {
     id("org.jetbrains.kotlin.plugin.serialization") apply false
 }
 
+// https://raymondctc.medium.com/configuring-your-sourcecompatibility-targetcompatibility-and-kotlinoptions-jvmtarget-all-at-once-66bf2198145f
+val jvmVersion: Provider<String> = providers.gradleProperty("kotlin.jvm.target")
+
+configure(subprojects) {
+    // Apply compileOptions to subprojects
+    plugins.withType<com.android.build.gradle.BasePlugin>().configureEach {
+        extensions.findByType<com.android.build.gradle.BaseExtension>()?.apply {
+            jvmVersion.map { JavaVersion.toVersion(it) }.orNull?.let {
+                compileOptions {
+                    sourceCompatibility = it
+                    targetCompatibility = it
+                }
+            }
+        }
+    }
+
+    // Apply kotlinOptions.jvmTarget to subprojects
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions {
+            if (jvmVersion.isPresent) jvmTarget = jvmVersion.get()
+        }
+    }
+}
+
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
index 3b6975638a..42e4ac2591 100644
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -4,17 +4,16 @@ plugins {
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.serialization")
   id("dev.icerock.mobile.multiplatform-resources")
-  id("com.github.gmazzo.buildconfig") version "4.0.4"
+  id("com.github.gmazzo.buildconfig") version "5.3.5"
 }
 
 group = "chat.simplex"
 version = extra["android.version_name"] as String
 
 kotlin {
-  android()
-  jvm("desktop") {
-    jvmToolchain(11)
-  }
+  androidTarget()
+  jvm("desktop")
+  applyDefaultHierarchyTemplate()
   sourceSets {
     all {
       languageSettings {
@@ -35,20 +34,20 @@ kotlin {
         api(compose.runtime)
         api(compose.foundation)
         api(compose.material)
-        api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
-        api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
-        api("com.russhwolf:multiplatform-settings:1.0.0")
-        api("com.charleskorn.kaml:kaml:0.43.0")
-        api("dev.icerock.moko:resources-compose:0.23.0")
+        api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+        api("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
+        api("com.russhwolf:multiplatform-settings:1.1.1")
+        api("com.charleskorn.kaml:kaml:0.58.0")
         api("org.jetbrains.compose.ui:ui-text:${rootProject.extra["compose.version"] as String}")
         implementation("org.jetbrains.compose.components:components-animatedimage:${rootProject.extra["compose.version"] as String}")
         //Barcode
-        api("org.boofcv:boofcv-core:0.40.1")
+        api("org.boofcv:boofcv-core:1.1.3")
         implementation("com.godaddy.android.colorpicker:compose-color-picker-jvm:0.7.0")
         // Link Previews
-        implementation("org.jsoup:jsoup:1.13.1")
+        implementation("org.jsoup:jsoup:1.17.2")
         // Resources
-        implementation("dev.icerock.moko:resources:0.23.0")
+        api("dev.icerock.moko:resources:0.23.0")
+        api("dev.icerock.moko:resources-compose:0.23.0")
       }
     }
     val commonTest by getting {
@@ -57,47 +56,50 @@ kotlin {
       }
     }
     val androidMain by getting {
+      kotlin.srcDir("build/generated/moko/androidMain/src")
       dependencies {
-        implementation("androidx.activity:activity-compose:1.5.0")
-        val work_version = "2.7.1"
-        implementation("androidx.work:work-runtime-ktx:$work_version")
-        implementation("com.google.accompanist:accompanist-insets:0.23.0")
-        implementation("dev.icerock.moko:resources:0.23.0")
+        implementation("androidx.activity:activity-compose:1.8.2")
+        val workVersion = "2.9.0"
+        implementation("androidx.work:work-runtime-ktx:$workVersion")
+        implementation("com.google.accompanist:accompanist-insets:0.30.1")
 
         // Video support
-        implementation("com.google.android.exoplayer:exoplayer:2.17.1")
+        implementation("com.google.android.exoplayer:exoplayer:2.19.1")
 
         // Biometric authentication
-        implementation("androidx.biometric:biometric:1.2.0-alpha04")
+        implementation("androidx.biometric:biometric:1.2.0-alpha05")
 
         //Barcode
-        implementation("org.boofcv:boofcv-android:0.40.1")
+        implementation("org.boofcv:boofcv-android:1.1.3")
 
         //Camera Permission
-        implementation("com.google.accompanist:accompanist-permissions:0.23.0")
+        implementation("com.google.accompanist:accompanist-permissions:0.34.0")
 
-        implementation("androidx.webkit:webkit:1.4.0")
+        implementation("androidx.webkit:webkit:1.10.0")
 
         // GIFs support
-        implementation("io.coil-kt:coil-compose:2.1.0")
-        implementation("io.coil-kt:coil-gif:2.1.0")
+        implementation("io.coil-kt:coil-compose:2.6.0")
+        implementation("io.coil-kt:coil-gif:2.6.0")
 
-        implementation("com.jakewharton:process-phoenix:2.1.2")
+        implementation("com.jakewharton:process-phoenix:2.2.0")
 
-        val camerax_version = "1.1.0-beta01"
-        implementation("androidx.camera:camera-core:${camerax_version}")
-        implementation("androidx.camera:camera-camera2:${camerax_version}")
-        implementation("androidx.camera:camera-lifecycle:${camerax_version}")
-        implementation("androidx.camera:camera-view:${camerax_version}")
+        val cameraXVersion = "1.3.2"
+        implementation("androidx.camera:camera-core:${cameraXVersion}")
+        implementation("androidx.camera:camera-camera2:${cameraXVersion}")
+        implementation("androidx.camera:camera-lifecycle:${cameraXVersion}")
+        implementation("androidx.camera:camera-view:${cameraXVersion}")
+
+        // Calls lifecycle listener
+        implementation("androidx.lifecycle:lifecycle-process:2.4.1")
       }
     }
     val desktopMain by getting {
       dependencies {
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.1")
-        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.6")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0")
+        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8")
         implementation("com.sshtools:two-slices:0.9.0-SNAPSHOT")
-        implementation("org.slf4j:slf4j-simple:2.0.7")
-        implementation("uk.co.caprica:vlcj:4.7.3")
+        implementation("org.slf4j:slf4j-simple:2.0.12")
+        implementation("uk.co.caprica:vlcj:4.8.2")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
       }
@@ -107,23 +109,21 @@ kotlin {
 }
 
 android {
-  compileSdkVersion(34)
+  namespace = "chat.simplex.common"
+  compileSdk = 34
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   defaultConfig {
-    minSdkVersion(28)
-    targetSdkVersion(33)
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    minSdk = 28
   }
+  testOptions.targetSdk = 33
+  lint.targetSdk = 33
   val isAndroid = gradle.startParameter.taskNames.find {
-    val lower = it.toLowerCase()
+    val lower = it.lowercase()
     lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install")
   } != null
   if (isAndroid) {
     // This is not needed on Android but can't be moved to desktopMain because MR lib don't support this.
-    // No other ways to exclude a file work but it's large and should be excluded
+    // No other ways to exclude a file work, but it's large and should be excluded
     kotlin.sourceSets["commonMain"].resources.exclude("/MR/fonts/NotoColorEmoji-Regular.ttf")
   }
 }
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Permissions.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Permissions.kt
new file mode 100644
index 0000000000..bfb45d7413
--- /dev/null
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Permissions.kt
@@ -0,0 +1,30 @@
+package chat.simplex.common.helpers
+
+import android.content.*
+import android.net.Uri
+import android.provider.Settings
+import chat.simplex.common.platform.*
+import chat.simplex.common.views.helpers.AlertManager
+import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.res.MR
+
+fun Context.openAppSettingsInSystem() {
+  Intent().apply {
+    action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+    data = Uri.parse("package:${androidAppContext.packageName}")
+    try {
+      startActivity(this)
+    } catch (e: ActivityNotFoundException) {
+      Log.e(TAG, e.stackTraceToString())
+    }
+  }
+}
+
+fun Context.showAllowPermissionInSettingsAlert(action: () -> Unit = ::openAppSettingsInSystem) {
+  AlertManager.shared.showAlertMsg(
+    title =  generalGetString(MR.strings.permissions_grant_in_settings),
+    text = generalGetString(MR.strings.permissions_find_in_settings_and_grant),
+    confirmText = generalGetString(MR.strings.permissions_open_settings),
+    onConfirm = action,
+  )
+}
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
index 8a958327d8..b0c4beded0 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
@@ -1,5 +1,7 @@
 package chat.simplex.common.views.call
 
+import SectionSpacer
+import SectionView
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -24,17 +26,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.*
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
+import chat.simplex.common.helpers.showAllowPermissionInSettingsAlert
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.model.ChatModel
@@ -42,13 +45,12 @@ import chat.simplex.common.model.Contact
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
-import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import com.google.accompanist.permissions.*
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.datetime.Clock
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 
 // Should be destroy()'ed and set as null when call is ended. Otherwise, it will be a leak
@@ -209,7 +211,6 @@ actual fun ActiveCallView() {
       ActiveCallOverlay(call, chatModel, audioViaBluetooth)
     }
   }
-
   val context = LocalContext.current
   DisposableEffect(Unit) {
     val activity = context as? Activity ?: return@DisposableEffect onDispose {}
@@ -510,34 +511,138 @@ private fun DisabledBackgroundCallsButton() {
 //  }
 //}
 
+@Composable
+fun CallPermissionsView(pipActive: Boolean, hasVideo: Boolean, cancel: () -> Unit) {
+  val audioPermission = rememberPermissionState(Manifest.permission.RECORD_AUDIO)
+  val cameraPermission = rememberPermissionState(Manifest.permission.CAMERA)
+  val permissionsState = rememberMultiplePermissionsState(
+    permissions = if (hasVideo) {
+      listOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)
+    } else {
+      listOf(Manifest.permission.RECORD_AUDIO)
+    }
+  )
+  val context = LocalContext.current
+  val buttonEnabled = remember { mutableStateOf(true) }
+  LaunchedEffect(Unit) {
+    if (!pipActive) {
+      permissionsState.launchMultiplePermissionRequestWithFallback(buttonEnabled, context::showAllowPermissionInSettingsAlert)
+    }
+  }
+
+  if (pipActive) {
+    Column(Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.SpaceEvenly) {
+      if (audioPermission.status is PermissionStatus.Denied) {
+        Icon(
+          painterResource(MR.images.ic_call_500),
+          stringResource(MR.strings.permissions_record_audio),
+          Modifier.size(24.dp),
+          tint = Color(0xFFFFFFD8)
+        )
+      }
+      if (hasVideo && cameraPermission.status is PermissionStatus.Denied) {
+        Icon(
+          painterResource(MR.images.ic_videocam),
+          stringResource(MR.strings.permissions_camera),
+          Modifier.size(24.dp),
+          tint = Color(0xFFFFFFD8)
+        )
+      }
+    }
+  } else {
+    ColumnWithScrollBar(Modifier.fillMaxSize()) {
+      Spacer(Modifier.height(AppBarHeight))
+
+      AppBarTitle(stringResource(MR.strings.permissions_required))
+      Spacer(Modifier.weight(1f))
+
+      val onClick = {
+        if (permissionsState.shouldShowRationale) {
+          context.showAllowPermissionInSettingsAlert()
+        } else {
+          permissionsState.launchMultiplePermissionRequestWithFallback(buttonEnabled, context::showAllowPermissionInSettingsAlert)
+        }
+      }
+      Text(stringResource(MR.strings.permissions_grant), Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING), textAlign = TextAlign.Center, color = Color(0xFFFFFFD8))
+      SectionSpacer()
+      SectionView {
+        Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+          val text = if (hasVideo && audioPermission.status is PermissionStatus.Denied && cameraPermission.status is PermissionStatus.Denied) {
+            stringResource(MR.strings.permissions_camera_and_record_audio)
+          } else if (audioPermission.status is PermissionStatus.Denied) {
+            stringResource(MR.strings.permissions_record_audio)
+          } else if (hasVideo && cameraPermission.status is PermissionStatus.Denied) {
+            stringResource(MR.strings.permissions_camera)
+          } else ""
+          GrantPermissionButton(text, buttonEnabled.value, onClick)
+        }
+      }
+
+      Spacer(Modifier.weight(1f))
+      Box(Modifier.fillMaxWidth().padding(bottom = if (hasVideo) 0.dp else DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.Center) {
+        SimpleButtonFrame(cancel, Modifier.height(64.dp)) {
+          Text(stringResource(MR.strings.call_service_notification_end_call), fontSize = 20.sp, color = Color(0xFFFFFFD8))
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun GrantPermissionButton(text: String, enabled: Boolean, onClick: () -> Unit) {
+  Row(
+    Modifier
+      .clickable(enabled = enabled, onClick = onClick)
+      .heightIn(min = 30.dp)
+      .background(WarningOrange.copy(0.3f), RoundedCornerShape(50)),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Text(text, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF), fontSize = 20.sp, color = WarningOrange)
+  }
+}
+
+/**
+ * The idea of this function is to ask system to show permission dialog and to see if it's really doing it.
+ * Otherwise, show alert with a button that opens settings for manual permission granting
+ * */
+private fun MultiplePermissionsState.launchMultiplePermissionRequestWithFallback(buttonEnabled: MutableState<Boolean>, fallback: () -> Unit) {
+  buttonEnabled.value = false
+  val lifecycleOwner = ProcessLifecycleOwner.get().lifecycle
+  var useFallback = true
+  val observer = LifecycleEventObserver { _, event ->
+    if (event == Lifecycle.Event.ON_PAUSE) {
+      useFallback = false
+      buttonEnabled.value = true
+    }
+  }
+  lifecycleOwner.addObserver(observer)
+  withBGApi {
+    delay(2000)
+    if (useFallback && chatModel.activeCall.value != null) {
+      fallback()
+    }
+    buttonEnabled.value = true
+  }.invokeOnCompletion {
+    // Main thread only
+    withApi {
+      lifecycleOwner.removeObserver(observer)
+    }
+  }
+  launchMultiplePermissionRequest()
+}
+
 @Composable
 fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIMessage) -> Unit) {
   val webView = remember { mutableStateOf<WebView?>(null) }
-  val permissionsState = rememberMultiplePermissionsState(
-    permissions = listOf(
-      Manifest.permission.CAMERA,
-      Manifest.permission.RECORD_AUDIO,
-      Manifest.permission.MODIFY_AUDIO_SETTINGS,
-      Manifest.permission.INTERNET
-    )
-  )
   fun processCommand(wv: WebView, cmd: WCallCommand) {
     val apiCall = WVAPICall(command = cmd)
     wv.evaluateJavascript("processCommand(${json.encodeToString(apiCall)})", null)
   }
-  val lifecycleOwner = LocalLifecycleOwner.current
-  DisposableEffect(lifecycleOwner) {
-    val observer = LifecycleEventObserver { _, event ->
-      if (event == Lifecycle.Event.ON_RESUME || event == Lifecycle.Event.ON_START) {
-        permissionsState.launchMultiplePermissionRequest()
-      }
-    }
-    lifecycleOwner.lifecycle.addObserver(observer)
+  DisposableEffect(Unit) {
     onDispose {
-      lifecycleOwner.lifecycle.removeObserver(observer)
-//      val wv = webView.value
-//      if (wv != null) processCommand(wv, WCallCommand.End)
-//      webView.value?.destroy()
+      //      val wv = webView.value
+      //      if (wv != null) processCommand(wv, WCallCommand.End)
+      //      webView.value?.destroy()
       webView.value = null
     }
   }
@@ -560,44 +665,42 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
     .addPathHandler("/assets/www/", WebViewAssetLoader.AssetsPathHandler(LocalContext.current))
     .build()
 
-  if (permissionsState.allPermissionsGranted) {
-    Box(Modifier.fillMaxSize()) {
-      AndroidView(
-        factory = { AndroidViewContext ->
-          (staticWebView ?: WebView(androidAppContext)).apply {
-            layoutParams = ViewGroup.LayoutParams(
-              ViewGroup.LayoutParams.MATCH_PARENT,
-              ViewGroup.LayoutParams.MATCH_PARENT,
-            )
-            this.webChromeClient = object: WebChromeClient() {
-              override fun onPermissionRequest(request: PermissionRequest) {
-                if (request.origin.toString().startsWith("file:/")) {
-                  request.grant(request.resources)
-                } else {
-                  Log.d(TAG, "Permission request from webview denied.")
-                  request.deny()
-                }
+  Box(Modifier.fillMaxSize()) {
+    AndroidView(
+      factory = { AndroidViewContext ->
+        (staticWebView ?: WebView(androidAppContext)).apply {
+          layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+          )
+          this.webChromeClient = object: WebChromeClient() {
+            override fun onPermissionRequest(request: PermissionRequest) {
+              if (request.origin.toString().startsWith("file:/")) {
+                request.grant(request.resources)
+              } else {
+                Log.d(TAG, "Permission request from webview denied.")
+                request.deny()
               }
             }
-            this.webViewClient = LocalContentWebViewClient(webView, assetLoader)
-            this.clearHistory()
-            this.clearCache(true)
-            this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
-            val webViewSettings = this.settings
-            webViewSettings.allowFileAccess = true
-            webViewSettings.allowContentAccess = true
-            webViewSettings.javaScriptEnabled = true
-            webViewSettings.mediaPlaybackRequiresUserGesture = false
-            webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-            if (staticWebView == null) {
-              this.loadUrl("file:android_asset/www/android/call.html")
-            } else {
-              webView.value = this
-            }
+          }
+          this.webViewClient = LocalContentWebViewClient(webView, assetLoader)
+          this.clearHistory()
+          this.clearCache(true)
+          this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
+          val webViewSettings = this.settings
+          webViewSettings.allowFileAccess = true
+          webViewSettings.allowContentAccess = true
+          webViewSettings.javaScriptEnabled = true
+          webViewSettings.mediaPlaybackRequiresUserGesture = false
+          webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
+          if (staticWebView == null) {
+            this.loadUrl("file:android_asset/www/android/call.html")
+          } else {
+            webView.value = this
           }
         }
-      ) { /* WebView */ }
-    }
+      }
+    ) { /* WebView */ }
   }
 }
 
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.android.kt
index 28c00ec018..c606e9acb0 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.android.kt
@@ -6,7 +6,6 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
-import chat.simplex.common.helpers.toUri
 import chat.simplex.common.model.CIFile
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.ModalManager
@@ -15,7 +14,6 @@ import coil.compose.rememberAsyncImagePainter
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.request.ImageRequest
-import java.net.URI
 
 @Composable
 actual fun SimpleAndAnimatedImageView(
@@ -43,6 +41,7 @@ actual fun SimpleAndAnimatedImageView(
 }
 
 private val imageLoader = ImageLoader.Builder(androidAppContext)
+  .networkObserverEnabled(false)
   .components {
     if (SDK_INT >= 28) {
       add(ImageDecoderDecoder.Factory())
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.android.kt
index 140b6d12a3..9e8eb8ee8f 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.android.kt
@@ -15,6 +15,7 @@ import chat.simplex.common.platform.FileChooserLauncher
 import chat.simplex.common.platform.saveImage
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.rememberPermissionState
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -30,7 +31,7 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
   ItemAction(stringResource(MR.strings.save_verb), painterResource(if (cItem.file?.fileSource?.cryptoArgs == null) MR.images.ic_download else MR.images.ic_lock_open_right), onClick = {
     when (cItem.content.msgContent) {
       is MsgContent.MCImage -> {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.status == PermissionStatus.Granted) {
           saveImage(cItem.file)
         } else {
           writePermissionState.launchPermissionRequest()
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ImageFullScreenView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ImageFullScreenView.android.kt
index d4efdc3e59..dad8872012 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ImageFullScreenView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chat/item/ImageFullScreenView.android.kt
@@ -3,7 +3,7 @@ package chat.simplex.common.views.chat.item
 import android.os.Build
 import android.view.View
 import androidx.compose.foundation.Image
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.BitmapPainter
@@ -11,8 +11,8 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.isVisible
-import chat.simplex.common.helpers.toUri
 import chat.simplex.common.platform.VideoPlayer
+import chat.simplex.common.platform.androidAppContext
 import chat.simplex.res.MR
 import coil.ImageLoader
 import coil.compose.rememberAsyncImagePainter
@@ -23,21 +23,11 @@ import coil.size.Size
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
 import dev.icerock.moko.resources.compose.stringResource
-import java.net.URI
 
 @Composable
 actual fun FullScreenImageView(modifier: Modifier, data: ByteArray, imageBitmap: ImageBitmap) {
-  // I'm making a new instance of imageLoader here because if I use one instance in multiple places
+  // I'm using a new private instance of imageLoader here because if I use one instance in multiple places
   // after end of composition here a GIF from the first instance will be paused automatically which isn't what I want
-  val imageLoader = ImageLoader.Builder(LocalContext.current)
-    .components {
-      if (Build.VERSION.SDK_INT >= 28) {
-        add(ImageDecoderDecoder.Factory())
-      } else {
-        add(GifDecoder.Factory())
-      }
-    }
-    .build()
   Image(
     rememberAsyncImagePainter(
       ImageRequest.Builder(LocalContext.current).data(data = data).size(Size.ORIGINAL).build(),
@@ -73,3 +63,14 @@ actual fun FullScreenVideoView(player: VideoPlayer, modifier: Modifier, close: (
     modifier
   )
 }
+
+private val imageLoader = ImageLoader.Builder(androidAppContext)
+  .networkObserverEnabled(false)
+  .components {
+    if (Build.VERSION.SDK_INT >= 28) {
+      add(ImageDecoderDecoder.Factory())
+    } else {
+      add(GifDecoder.Factory())
+    }
+  }
+  .build()
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/QRCodeScanner.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/QRCodeScanner.android.kt
index b8f5abc50e..df38295787 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/QRCodeScanner.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/QRCodeScanner.android.kt
@@ -11,6 +11,7 @@ import androidx.camera.view.PreviewView
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
@@ -27,6 +28,7 @@ import chat.simplex.common.platform.TAG
 import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.common.util.concurrent.ListenableFuture
 import dev.icerock.moko.resources.compose.painterResource
@@ -65,7 +67,7 @@ actual fun QRCodeScanner(
       .widthIn(max = 400.dp)
       .aspectRatio(1f)
     val showScanner = remember { showQRCodeScanner }
-    if (showScanner.value && cameraPermissionState.hasPermission) {
+    if (showScanner.value && cameraPermissionState.status == PermissionStatus.Granted) {
       AndroidView(
         factory = { AndroidViewContext ->
           PreviewView(AndroidViewContext).apply {
@@ -126,20 +128,22 @@ actual fun QRCodeScanner(
         disabledBackgroundColor = MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, 0.9f),
         disabledContentColor = MaterialTheme.colors.primary,
       )
+      var permissionRequested by rememberSaveable { mutableStateOf(false) }
       when {
-        !cameraPermissionState.hasPermission && !cameraPermissionState.permissionRequested && showScanner.value -> {
+        cameraPermissionState.status is PermissionStatus.Denied && !permissionRequested && showScanner.value -> {
           LaunchedEffect(Unit) {
+            permissionRequested = true
             cameraPermissionState.launchPermissionRequest()
           }
         }
-        !cameraPermissionState.hasPermission -> {
+        cameraPermissionState.status is PermissionStatus.Denied -> {
           Button({ cameraPermissionState.launchPermissionRequest() }, modifier = modifier, colors = buttonColors) {
             Icon(painterResource(MR.images.ic_camera_enhance), null)
             Spacer(Modifier.width(DEFAULT_PADDING_HALF))
             Text(stringResource(MR.strings.enable_camera_access))
           }
         }
-        cameraPermissionState.hasPermission -> {
+        cameraPermissionState.status == PermissionStatus.Granted -> {
           Button({ showQRCodeScanner.value = true }, modifier = modifier, colors = buttonColors) {
             Icon(painterResource(MR.images.ic_qr_code), null)
             Spacer(Modifier.width(DEFAULT_PADDING_HALF))
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt
index 605c40445a..a39e71947d 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SetNotificationsMode.android.kt
@@ -5,14 +5,15 @@ import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import chat.simplex.common.platform.ntfManager
+import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.rememberPermissionState
 
 @Composable
 actual fun SetNotificationsModeAdditions() {
   if (Build.VERSION.SDK_INT >= 33) {
     val notificationsPermissionState = rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
-    LaunchedEffect(notificationsPermissionState.hasPermission) {
-      if (notificationsPermissionState.hasPermission) {
+    LaunchedEffect(notificationsPermissionState.status == PermissionStatus.Granted) {
+      if (notificationsPermissionState.status == PermissionStatus.Granted) {
         ntfManager.androidCreateNtfChannelsMaybeShowAlert()
       } else {
         notificationsPermissionState.launchPermissionRequest()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
index 0d6420dad2..3811bca170 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -1753,6 +1753,8 @@ object ChatController {
           chatModel.removeChat(rhId, r.mergedContact.id)
         }
       }
+      // ContactsSubscribed, ContactsDisconnected and ContactSubSummary are only used in CLI,
+      // They have to be used here for remote desktop to process these status updates.
       is CR.ContactsSubscribed -> updateContactsStatus(r.contactRefs, NetworkStatus.Connected())
       is CR.ContactsDisconnected -> updateContactsStatus(r.contactRefs, NetworkStatus.Disconnected())
       is CR.ContactSubSummary -> {
@@ -5011,8 +5013,8 @@ sealed class AgentErrorType {
     is BROKER -> "BROKER ${brokerErr.string}"
     is AGENT -> "AGENT ${agentErr.string}"
     is INTERNAL -> "INTERNAL $internalErr"
-    is INACTIVE -> "INACTIVE"
     is CRITICAL -> "CRITICAL $offerRestart $criticalErr"
+    is INACTIVE -> "INACTIVE"
   }
   @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType): AgentErrorType()
   @Serializable @SerialName("CONN") class CONN(val connErr: ConnectionErrorType): AgentErrorType()
@@ -5023,8 +5025,8 @@ sealed class AgentErrorType {
   @Serializable @SerialName("BROKER") class BROKER(val brokerAddress: String, val brokerErr: BrokerErrorType): AgentErrorType()
   @Serializable @SerialName("AGENT") class AGENT(val agentErr: SMPAgentError): AgentErrorType()
   @Serializable @SerialName("INTERNAL") class INTERNAL(val internalErr: String): AgentErrorType()
-  @Serializable @SerialName("INACTIVE") object INACTIVE: AgentErrorType()
   @Serializable @SerialName("CRITICAL") data class CRITICAL(val offerRestart: Boolean, val criticalErr: String): AgentErrorType()
+  @Serializable @SerialName("INACTIVE") object INACTIVE: AgentErrorType()
 }
 
 @Serializable
@@ -5123,11 +5125,13 @@ sealed class SMPTransportError {
     is BadBlock -> "badBlock"
     is LargeMsg -> "largeMsg"
     is BadSession -> "badSession"
+    is NoServerAuth -> "noServerAuth"
     is Handshake -> "handshake ${handshakeErr.string}"
   }
   @Serializable @SerialName("badBlock") class BadBlock: SMPTransportError()
   @Serializable @SerialName("largeMsg") class LargeMsg: SMPTransportError()
   @Serializable @SerialName("badSession") class BadSession: SMPTransportError()
+  @Serializable @SerialName("noServerAuth") class NoServerAuth: SMPTransportError()
   @Serializable @SerialName("handshake") class Handshake(val handshakeErr: SMPHandshakeError): SMPTransportError()
 }
 
@@ -5137,10 +5141,12 @@ sealed class SMPHandshakeError {
     is PARSE -> "PARSE"
     is VERSION -> "VERSION"
     is IDENTITY -> "IDENTITY"
+    is BAD_AUTH -> "BAD_AUTH"
   }
   @Serializable @SerialName("PARSE") class PARSE: SMPHandshakeError()
   @Serializable @SerialName("VERSION") class VERSION: SMPHandshakeError()
   @Serializable @SerialName("IDENTITY") class IDENTITY: SMPHandshakeError()
+  @Serializable @SerialName("BAD_AUTH") class BAD_AUTH: SMPHandshakeError()
 }
 
 @Serializable
@@ -5175,6 +5181,8 @@ sealed class XFTPErrorType {
     is NO_FILE -> "NO_FILE"
     is HAS_FILE -> "HAS_FILE"
     is FILE_IO -> "FILE_IO"
+    is TIMEOUT -> "TIMEOUT"
+    is REDIRECT -> "REDIRECT"
     is INTERNAL -> "INTERNAL"
   }
   @Serializable @SerialName("BLOCK") object BLOCK: XFTPErrorType()
@@ -5188,6 +5196,8 @@ sealed class XFTPErrorType {
   @Serializable @SerialName("NO_FILE") object NO_FILE: XFTPErrorType()
   @Serializable @SerialName("HAS_FILE") object HAS_FILE: XFTPErrorType()
   @Serializable @SerialName("FILE_IO") object FILE_IO: XFTPErrorType()
+  @Serializable @SerialName("TIMEOUT") object TIMEOUT: XFTPErrorType()
+  @Serializable @SerialName("REDIRECT") class REDIRECT(val redirectError: String): XFTPErrorType()
   @Serializable @SerialName("INTERNAL") object INTERNAL: XFTPErrorType()
 }
 
@@ -5197,6 +5207,8 @@ sealed class RCErrorType {
     is INTERNAL -> "INTERNAL $internalErr"
     is IDENTITY -> "IDENTITY"
     is NO_LOCAL_ADDRESS -> "NO_LOCAL_ADDRESS"
+    is NEW_CONTROLLER -> "NEW_CONTROLLER"
+    is NOT_DISCOVERED -> "NOT_DISCOVERED"
     is TLS_START_FAILED -> "TLS_START_FAILED"
     is EXCEPTION -> "EXCEPTION $EXCEPTION"
     is CTRL_AUTH -> "CTRL_AUTH"
@@ -5211,6 +5223,8 @@ sealed class RCErrorType {
   @Serializable @SerialName("internal") data class INTERNAL(val internalErr: String): RCErrorType()
   @Serializable @SerialName("identity") object IDENTITY: RCErrorType()
   @Serializable @SerialName("noLocalAddress") object NO_LOCAL_ADDRESS: RCErrorType()
+  @Serializable @SerialName("newController") object NEW_CONTROLLER: RCErrorType()
+  @Serializable @SerialName("notDiscovered") object NOT_DISCOVERED: RCErrorType()
   @Serializable @SerialName("tlsStartFailed") object TLS_START_FAILED: RCErrorType()
   @Serializable @SerialName("exception") data class EXCEPTION(val exception: String): RCErrorType()
   @Serializable @SerialName("ctrlAuth") object CTRL_AUTH: RCErrorType()
@@ -5269,28 +5283,39 @@ sealed class RemoteCtrlError {
     is BadState -> "badState"
     is Busy -> "busy"
     is Timeout -> "timeout"
+    is NoKnownControllers -> "noKnownControllers"
+    is BadController -> "badController"
     is Disconnected -> "disconnected"
     is BadInvitation -> "badInvitation"
     is BadVersion -> "badVersion"
+    is HTTP2Error -> "http2Error"
+    is ProtocolError -> "protocolError"
   }
   val localizedString: String get() = when (this) {
     is Inactive -> generalGetString(MR.strings.remote_ctrl_error_inactive)
     is BadState -> generalGetString(MR.strings.remote_ctrl_error_bad_state)
     is Busy -> generalGetString(MR.strings.remote_ctrl_error_busy)
     is Timeout -> generalGetString(MR.strings.remote_ctrl_error_timeout)
+    is NoKnownControllers -> "no known controllers"
+    is BadController -> "bad controller"
     is Disconnected -> generalGetString(MR.strings.remote_ctrl_error_disconnected)
     is BadInvitation -> generalGetString(MR.strings.remote_ctrl_error_bad_invitation)
     is BadVersion -> generalGetString(MR.strings.remote_ctrl_error_bad_version)
+    is HTTP2Error -> "HTTP2 error"
+    is ProtocolError -> "protocol error"
   }
 
   @Serializable @SerialName("inactive") object Inactive: RemoteCtrlError()
   @Serializable @SerialName("badState") object BadState: RemoteCtrlError()
   @Serializable @SerialName("busy") object Busy: RemoteCtrlError()
   @Serializable @SerialName("timeout") object Timeout: RemoteCtrlError()
+  @Serializable @SerialName("noKnownControllers") object NoKnownControllers: RemoteCtrlError()
+  @Serializable @SerialName("badController") object BadController: RemoteCtrlError()
   @Serializable @SerialName("disconnected") class Disconnected(val remoteCtrlId: Long, val reason: String): RemoteCtrlError()
   @Serializable @SerialName("badInvitation") object BadInvitation: RemoteCtrlError()
   @Serializable @SerialName("badVersion") data class BadVersion(val appVersion: String): RemoteCtrlError()
-  //@Serializable @SerialName("protocolError") data class ProtocolError(val protocolError: RemoteProtocolError): RemoteCtrlError()
+  @Serializable @SerialName("hTTP2Error") data class HTTP2Error(val http2Error: String): RemoteCtrlError()
+  @Serializable @SerialName("protocolError") object ProtocolError: RemoteCtrlError()
 }
 
 enum class NotificationsMode() {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Files.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Files.kt
index f804f2079c..c788a6902e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Files.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Files.kt
@@ -109,6 +109,7 @@ private fun fileReady(file: CIFile, filePath: String) =
 @Composable
 expect fun rememberFileChooserLauncher(getContent: Boolean, rememberedValue: Any? = null, onResult: (URI?) -> Unit): FileChooserLauncher
 
+@Composable
 expect fun rememberFileChooserMultipleLauncher(onResult: (List<URI>) -> Unit): FileChooserMultipleLauncher
 
 expect class FileChooserLauncher() {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
index 5cf05f64c5..62acc13bfe 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
@@ -260,6 +260,7 @@ val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow
 @Composable
 fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLight
 
+@Composable
 expect fun isSystemInDarkTheme(): Boolean
 
 fun reactOnDarkThemeChanges(isDark: Boolean) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index c70511f847..702dd9fec5 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -1392,11 +1392,12 @@ private fun providerForGallery(
     return null
   }
 
-  var initialIndex = Int.MAX_VALUE / 2
+  // Pager has a bug with overflowing when total pages is around Int.MAX_VALUE. Using smaller value
+  var initialIndex = 10000 / 2
   var initialChatId = cItemId
   return object: ImageGalleryProvider {
     override val initialIndex: Int = initialIndex
-    override val totalMediaSize = mutableStateOf(Int.MAX_VALUE)
+    override val totalMediaSize = mutableStateOf(10000)
     override fun getMedia(index: Int): ProviderMedia? {
       val internalIndex = initialIndex - index
       val item = item(internalIndex, initialChatId)?.second ?: return null
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
index fa72ab2b3c..98f3921059 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
@@ -190,6 +190,7 @@ class AlertManager {
   fun showAlertMsg(
     title: String, text: String? = null,
     confirmText: String = generalGetString(MR.strings.ok),
+    onConfirm: (() -> Unit)? = null,
     hostDevice: Pair<Long?, String>? = null,
     shareText: Boolean? = null
   ) {
@@ -220,6 +221,7 @@ class AlertManager {
               }
               TextButton(
                 onClick = {
+                  onConfirm?.invoke()
                   hideAlert()
                 },
                 Modifier.focusRequester(focusRequester)
@@ -257,8 +259,9 @@ class AlertManager {
     title: StringResource,
     text: StringResource? = null,
     confirmText: StringResource = MR.strings.ok,
+    onConfirm: (() -> Unit)? = null,
     hostDevice: Pair<Long?, String>? = null,
-  ) = showAlertMsg(generalGetString(title), if (text != null) generalGetString(text) else null, generalGetString(confirmText), hostDevice)
+  ) = showAlertMsg(generalGetString(title), if (text != null) generalGetString(text) else null, generalGetString(confirmText), onConfirm, hostDevice)
 
   @Composable
   fun showInView() {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt
index bd1be525be..e13b86258d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt
@@ -38,9 +38,7 @@ import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.runBlocking
 
 @Composable
 fun ConnectMobileView() {
@@ -269,12 +267,20 @@ fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, c
   var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
   val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
   val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
+  var userChangedAddress by rememberSaveable { mutableStateOf(false) }
+  var userChangedPort by rememberSaveable { mutableStateOf(false) }
   val startRemoteHost = suspend {
+    if (customAddress.value != cachedR.address && cachedR != null) {
+      userChangedAddress = true
+    }
+    if (customPort.value != cachedR.port && cachedR != null) {
+      userChangedPort = true
+    }
     val r = chatModel.controller.startRemoteHost(
       rhId = null,
       multicast = controller.appPrefs.offerRemoteMulticast.get(),
-      address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_,
-      port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_
+      address = if (customAddress.value != null && userChangedAddress) customAddress.value else cachedR.rh?.bindAddress_,
+      port = if (customPort.value != null && userChangedPort) customPort.value else cachedR.rh?.bindPort_
     )
     if (r != null) {
       cachedR = r
@@ -343,12 +349,20 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
     var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
     val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
     val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
+    var userChangedAddress by rememberSaveable { mutableStateOf(false) }
+    var userChangedPort by rememberSaveable { mutableStateOf(false) }
     val startRemoteHost = suspend {
+      if (customAddress.value != cachedR.address && cachedR != null) {
+        userChangedAddress = true
+      }
+      if (customPort.value != cachedR.port && cachedR != null) {
+        userChangedPort = true
+      }
       val r = chatModel.controller.startRemoteHost(
         rhId = rh.remoteHostId,
         multicast = controller.appPrefs.offerRemoteMulticast.get(),
-        address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_ ?: rh.bindAddress_,
-        port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_ ?: rh.bindPort_
+        address = if (customAddress.value != null && userChangedAddress) customAddress.value else cachedR.rh?.bindAddress_ ?: rh.bindAddress_,
+        port = if (customPort.value != null && userChangedPort) customPort.value else cachedR.rh?.bindPort_ ?: rh.bindPort_
       )
       if (r != null) {
         cachedR = r
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
index 9fb161511d..c45f7e6732 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml
@@ -490,7 +490,7 @@
     <string name="custom_time_unit_hours">ساعات</string>
     <string name="edit_history">السجل</string>
     <string name="image_will_be_received_when_contact_completes_uploading">سيتم استلام الصورة عند اكتمال تحميل جهة اتصالك.</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[إذا لم تتمكن من الالتقاء شخصيًا، <b>اعرض رمز الاستجابة السريعة في مكالمة الفيديو</b>، أو شارك الرابط.]]></string>
+    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[إذا لم تتمكن من الالتقاء شخصيًا، <b>اعرض رمز QR في مكالمة الفيديو</b>، أو شارك الرابط.]]></string>
     <string name="install_simplex_chat_for_terminal">ثبّت SimpleX Chat لطرفية</string>
     <string name="network_disable_socks_info">إذا قمت بالتأكيد، فستتمكن خوادم المراسلة من رؤية عنوان IP الخاص بك ومزود الخدمة الخاص بك - أي الخوادم التي تتصل بها.</string>
     <string name="hide_dev_options">إخفاء:</string>
@@ -520,7 +520,7 @@
     <string name="image_will_be_received_when_contact_is_online">سيتم استلام الصورة عندما تكون جهة اتصالك متصلة بالإنترنت، يرجى الانتظار أو التحقق لاحقًا!</string>
     <string name="image_saved">حُفظت الصورة في المعرض</string>
     <string name="gallery_image_button">صورة</string>
-    <string name="if_you_cant_meet_in_person">إذا لم تتمكن من الالتقاء شخصيًا، اعرض رمز الاستجابة السريعة في مكالمة الفيديو، أو شارك الرابط.</string>
+    <string name="if_you_cant_meet_in_person">إذا لم تتمكن من الالتقاء شخصيًا، اعرض رمز QR في مكالمة الفيديو، أو شارك الرابط.</string>
     <string name="settings_section_title_incognito">وضع التخفي</string>
     <string name="incognito">التخفي</string>
     <string name="import_theme_error">خطأ في استيراد السمة</string>
@@ -957,7 +957,7 @@
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(امسح أو ألصق من الحافظة)</string>
     <string name="network_option_seconds_label">ثانية</string>
     <string name="sender_may_have_deleted_the_connection_request">قد يكون المرسل قد ألغى طلب الاتصال</string>
-    <string name="scan_QR_code">مسح رمز الاستجابة السريعة</string>
+    <string name="scan_QR_code">مسح رمز QR</string>
     <string name="send_us_an_email">أرسل لنا بريداً</string>
     <string name="scan_code_from_contacts_app">مسح رمز الأمان من تطبيق جهة الاتصال</string>
     <string name="share_invitation_link">مشاركة رابط ذو استخدام واحد</string>
@@ -1643,4 +1643,6 @@
     <string name="migrate_from_device_archiving_database">جارِ أرشفة قاعدة البيانات</string>
     <string name="migrate_from_device_all_data_will_be_uploaded">سيتم تعمية جميع جهات الاتصال والمحادثات والملفات الخاصة بك بشكل آمن وتحميلها في أجزاء إلى مُرحلات XFTP التي ضبطت.</string>
     <string name="migrate_to_device_apply_onion">طبّق</string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>يُرجى ملاحظة</b>: استخدام نفس قاعدة البيانات على جهازين سيؤدي إلى كسر فك تعمية الرسائل من اتصالاتك، كحماية أمنية.]]></string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>تحذير</b>: سيتم حذف الأرشيف.]]></string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index c2348568b1..5595f319ea 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -211,6 +211,7 @@
   <string name="notification_preview_new_message">new message</string>
   <string name="notification_new_contact_request">New contact request</string>
   <string name="notification_contact_connected">Connected</string>
+  <string name="error_showing_desktop_notification">Error showing notification, contact developers.</string>
 
   <!-- local authentication notice - SimpleXAPI.kt -->
   <string name="la_notice_title_simplex_lock">SimpleX Lock</string>
@@ -813,6 +814,14 @@
   <!-- CallView -->
   <string name="unable_to_open_browser_title">Error opening browser</string>
   <string name="unable_to_open_browser_desc">The default web browser is required for calls. Please configure the default browser in the system, and share more information with the developers.</string>
+  <string name="permissions_required">Grant permissions</string>
+  <string name="permissions_record_audio">Microphone</string>
+  <string name="permissions_camera">Camera</string>
+  <string name="permissions_camera_and_record_audio">Camera and microphone</string>
+  <string name="permissions_grant">Grant permission(s) to make calls</string>
+  <string name="permissions_grant_in_settings">Grant in settings</string>
+  <string name="permissions_find_in_settings_and_grant">Find this permission in Android settings and grant it manually.</string>
+  <string name="permissions_open_settings">Open settings</string>
 
   <!-- SimpleXInfo -->
   <string name="next_generation_of_private_messaging">The next generation of private messaging</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
index bba2efcbf5..e7524944c6 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml
@@ -1628,7 +1628,7 @@
     <string name="profile_update_event_updated_profile">актуализиран профил</string>
     <string name="note_folder_local_display_name">Лични бележки</string>
     <string name="message_too_large">Съобщението е твърде голямо</string>
-    <string name="welcome_message_is_too_long">Съобщението при посрещане е твърде голямо</string>
+    <string name="welcome_message_is_too_long">Съобщението при посрещане е твърде дълго</string>
     <string name="database_migration_in_progress">Извършва се миграция на базата данни.
 \nМоже да отнеме няколко минути.</string>
     <string name="call_service_notification_audio_call">Аудио разговор</string>
@@ -1636,4 +1636,80 @@
     <string name="unable_to_open_browser_desc">За разговори е необходим уеб браузър по подразбиране. Моля, конфигурирайте браузъра по подразбиране в системните настройки и споделете повече информация с разработчиците.</string>
     <string name="call_service_notification_video_call">Видео разговор</string>
     <string name="call_service_notification_end_call">Край на разговора</string>
+    <string name="e2ee_info_pq"><![CDATA[Съобщенията, файловете и разговорите са защитени чрез <b>квантово устойчиво e2e криптиране</b> с перфектна секретност при препращане, правдоподобно опровержение и възстановяване при взлом.]]></string>
+    <string name="auth_open_migration_to_another_device">Отвори екрана за мигриране</string>
+    <string name="migrate_from_another_device">Мигриране от друго устройство</string>
+    <string name="set_passphrase">Задаване на парола</string>
+    <string name="conn_event_enabled_pq">квантово устойчиво e2e криптиране</string>
+    <string name="conn_event_disabled_pq">стандартно криптиране от край до край</string>
+    <string name="migrate_to_device_chat_migrated">Чатът е мигриран!</string>
+    <string name="migrate_to_device_finalize_migration">Завършете миграцията на другото устройство.</string>
+    <string name="migrate_to_device_confirm_network_settings">Потвърди мрежовите настройки</string>
+    <string name="migrate_to_device_error_downloading_archive">Грешка при изтеглянето на архива</string>
+    <string name="migrate_from_device_database_init">Подготвя се качване</string>
+    <string name="migrate_from_device_error_exporting_archive">Грешка при експортиране на чат базата данни</string>
+    <string name="migrate_from_device_start_chat">Стартиране на чата</string>
+    <string name="v5_6_quantum_resistant_encryption">Квантово устойчиво криптиране</string>
+    <string name="v5_6_app_data_migration">Миграция на данните от приложението</string>
+    <string name="v5_6_app_data_migration_descr">Мигрирайте към друго устройство чрез QR код.</string>
+    <string name="v5_6_picture_in_picture_calls">Обаждания \"картина в картина\"</string>
+    <string name="v5_6_safer_groups">По-безопасни групи</string>
+    <string name="v5_6_safer_groups_descr">Администраторите могат да блокират член за всички.</string>
+    <string name="migrate_to_device_downloading_details">Подробности за линка се изтеглят</string>
+    <string name="migrate_to_device_downloading_archive">Архива се изтегля</string>
+    <string name="migrate_to_device_repeat_download">Повтори изтеглянето</string>
+    <string name="migrate_to_device_download_failed">Неуспешно изтегляне</string>
+    <string name="migrate_to_device_try_again">Можете да опитате още веднъж.</string>
+    <string name="migrate_to_device_importing_archive">Импортиране на архив</string>
+    <string name="migrate_to_device_import_failed">Неуспешно импортиране</string>
+    <string name="migrate_to_device_repeat_import">Повтори импортирането</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">Файлът е изтрит или линкът е невалиден</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Моля, потвърдете, че мрежовите настройки са правилни за това устройство.</string>
+    <string name="migrate_to_device_apply_onion">Приложи</string>
+    <string name="migrate_from_device_title">Мигрирай устройството</string>
+    <string name="migrate_from_device_to_another_device">Миграция към друго устройство</string>
+    <string name="migrate_from_device_error_saving_settings">Грешка при запазване на настройките</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">Експортираният файл не съществува</string>
+    <string name="migrate_from_device_error_uploading_archive">Грешка при качването на архива</string>
+    <string name="migrate_from_device_error_deleting_database">Грешка при изтриване на база данни</string>
+    <string name="migrate_from_device_stopping_chat">Спиране на чата</string>
+    <string name="migrate_from_device_chat_should_be_stopped">За да продължите, чатът трябва да бъде спрян.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Всички ваши контакти, разговори и файлове ще бъдат сигурно криптирани и качени на парчета в конфигурираните XFTP релета.</string>
+    <string name="migrate_from_device_uploading_archive">Архивът се качва</string>
+    <string name="migrate_from_device_try_again">Можете да опитате още веднъж.</string>
+    <string name="migrate_from_device_creating_archive_link">Създаване на архивен линк</string>
+    <string name="migrate_from_device_cancel_migration">Отмени миграцията</string>
+    <string name="migrate_from_device_finalize_migration">Завърши миграцията</string>
+    <string name="migrate_from_device_or_share_this_file_link">Или сигурно споделете този линк към файла</string>
+    <string name="migrate_from_device_delete_database_from_device">Изтриване на базата данни от това устройство</string>
+    <string name="migrate_from_device_migration_complete">Миграцията е завършена</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[<b>Не трябва</b> да използвате една и съща база данни на две устройства.]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Моля, обърнете внимание</b>: използването на една и съща база данни на две устройства ще наруши декриптирането на съобщенията от вашите връзки като защита на сигурността.]]></string>
+    <string name="migrate_from_device_verify_database_passphrase">Проверете паролата на базата данни</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">Потвърдете, че помните паролата на базата данни, преди да я мигрирате.</string>
+    <string name="migrate_from_device_verify_passphrase">Провери паролата</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Грешка при проверката на паролата:</string>
+    <string name="migrate_to_device_title">Мигрирай тук</string>
+    <string name="paste_archive_link">Постави архивен линк</string>
+    <string name="invalid_file_link">Невалиден линк</string>
+    <string name="migrate_to_device_migrating">Мигриране</string>
+    <string name="migrate_to_device_database_init">Изтеглянето се подготвя</string>
+    <string name="migrate_to_device_bytes_downloaded">%s изтеглени</string>
+    <string name="v5_6_picture_in_picture_calls_descr">Използвайте приложението по време на разговора.</string>
+    <string name="e2ee_info_no_pq_short">Този чат е защитен чрез криптиране от край до край.</string>
+    <string name="e2ee_info_pq_short">Този чат е защитен от квантово устойчиво криптиране от край до край.</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Съобщенията, файловете и разговорите са защитени чрез <b>криптиране от край до край</b> с перфектна секретност при препращане, правдоподобно опровержение и възстановяване при взлом.]]></string>
+    <string name="or_paste_archive_link">Или постави архивен линк</string>
+    <string name="migrate_to_device_enter_passphrase">Въведи парола</string>
+    <string name="migrate_from_device_confirm_upload">Потвърди качването</string>
+    <string name="migrate_from_device_archive_and_upload">Архивиране и качване</string>
+    <string name="migrate_from_device_archiving_database">Архивиране на база данни</string>
+    <string name="migrate_from_device_bytes_uploaded">%s качени</string>
+    <string name="migrate_from_device_upload_failed">Неуспешно качване</string>
+    <string name="migrate_from_device_repeat_upload">Повтори качването</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Изберете <i>Миграция от друго устройство</i> на новото устройство и сканирайте QR кода.]]></string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Внимание: стартирането на чата на множество устройства не се поддържа и ще доведе до неуспешно изпращане на съобщения</string>
+    <string name="migrate_from_device_check_connection_and_try_again">Проверете вашата интернет връзка и опитайте отново</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Внимание</b>: архивът ще бъде изтрит.]]></string>
+    <string name="v5_6_quantum_resistant_encryption_descr">Активиране в личните чатове (БЕТА)!</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
index 364fde803d..11372a4f6d 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml
@@ -379,7 +379,7 @@
     <string name="your_settings">Vaše nastavení</string>
     <string name="your_simplex_contact_address">Vaše SimpleX adresa</string>
     <string name="database_passphrase_and_export">Přístupová fráze k databázi a export</string>
-    <string name="your_chat_profiles">Vaše chatovací profily</string>
+    <string name="your_chat_profiles">Vaše chat profily</string>
     <string name="chat_with_the_founder">Zaslat otázky a nápady</string>
     <string name="smp_servers_test_server">Test serveru</string>
     <string name="enter_one_ICE_server_per_line">Servery ICE (jeden na řádek)</string>
@@ -719,7 +719,7 @@
     <string name="settings_section_title_support">PODPOŘIT SIMPLEX CHAT</string>
     <string name="settings_developer_tools">Nástroje pro vývojáře</string>
     <string name="settings_section_title_incognito">Inkognito mód</string>
-    <string name="your_chat_database">Vaše chatovací databáze</string>
+    <string name="your_chat_database">Vaše chat databáze</string>
     <string name="run_chat_section">SPUSTIT CHAT</string>
     <string name="chat_is_running">Chat je spuštěn</string>
     <string name="chat_is_stopped">Chat je zastaven</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
index 3102d56120..04ecbd734d 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
@@ -262,7 +262,7 @@
     <string name="gallery_video_button">Video</string>
     <!-- help - ChatHelpView.kt -->
     <string name="thank_you_for_installing_simplex">Danke, dass Sie SimpleX Chat installiert haben!</string>
-    <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Sie können sich <font color="#0088ff">mit SimpleX-Chat-Entwicklern verbinden, um Fragen zu stellen und Updates zu erhalten</font>.]]></string>
+    <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[Sie können sich <font color="#0088ff">mit den SimpleX-Chat-Entwicklern verbinden, um Fragen zu stellen und aktuelle Informationen zu erhalten</font>.]]></string>
     <string name="to_start_a_new_chat_help_header">Um einen neuen Chat zu starten</string>
     <string name="chat_help_tap_button">Schaltfläche antippen</string>
     <string name="above_then_preposition_continuation">Danach die gewünschte Aktion auswählen:</string>
@@ -1214,7 +1214,7 @@
     <string name="create_address_and_let_people_connect">Erstellen Sie eine Adresse, damit sich Personen mit Ihnen verbinden können.</string>
     <string name="create_simplex_address">SimpleX-Adresse erstellen</string>
     <string name="share_with_contacts">Mit Kontakten teilen</string>
-    <string name="your_contacts_will_remain_connected">Ihre Kontakte bleiben verbunden.</string>
+    <string name="your_contacts_will_remain_connected">Ihre Kontakte bleiben weiterhin verbunden.</string>
     <string name="auto_accept_contact">Automatisch akzeptieren</string>
     <string name="enter_welcome_message_optional">Geben Sie eine Begrüßungsmeldung ein … (optional)</string>
     <string name="invite_friends">Freunde einladen</string>
@@ -1725,7 +1725,7 @@
     <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Wählen Sie auf dem neuen Gerät <i>Von einem anderen Gerät migrieren</i> und scannen Sie den QR-Code.]]></string>
     <string name="migrate_from_device_delete_database_from_device">Datenbank auf diesem Gerät löschen</string>
     <string name="v5_6_app_data_migration">App-Daten-Migration</string>
-    <string name="v5_6_safer_groups_descr">Administratoren können für ein Mitglied alle Funktionen blockieren.</string>
+    <string name="v5_6_safer_groups_descr">Administratoren können ein Gruppenmitglied für Alle blockieren.</string>
     <string name="migrate_to_device_downloading_details">Link-Details werden heruntergeladen</string>
     <string name="migrate_to_device_downloading_archive">Archiv wird heruntergeladen</string>
     <string name="migrate_to_device_apply_onion">Anwenden</string>
@@ -1737,7 +1737,7 @@
     <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Bitte beachten Sie</b>: Aus Sicherheitsgründen wird die Nachrichtenentschlüsselung Ihrer Verbindungen abgebrochen, wenn Sie die gleiche Datenbank auf zwei Geräten nutzen.]]></string>
     <string name="migrate_from_device_cancel_migration">Migration abbrechen</string>
     <string name="migrate_to_device_confirm_network_settings">Bestätigen Sie die Netzwerkeinstellungen</string>
-    <string name="migrate_from_device_confirm_you_remember_passphrase">Für die Migration bestätigen Sie bitte, dass Sie sich an das Datenbank-Passwort erinnern.</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">Bitte bestätigen Sie für die Migration, dass Sie sich an Ihr Datenbank-Passwort erinnern.</string>
     <string name="migrate_from_device_confirm_upload">Hochladen bestätigen</string>
     <string name="migrate_to_device_download_failed">Herunterladen fehlgeschlagen</string>
     <string name="e2ee_info_no_pq"><![CDATA[Nachrichten, Dateien und Anrufe sind durch <b>Ende-zu-Ende-Verschlüsselung</b> mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.]]></string>
@@ -1759,7 +1759,7 @@
     <string name="migrate_from_device_start_chat">Chat starten</string>
     <string name="v5_6_quantum_resistant_encryption_descr">Kann in direkten Chats aktiviert werden (BETA)!</string>
     <string name="v5_6_quantum_resistant_encryption">Quantum-resistente Verschlüsselung</string>
-    <string name="v5_6_app_data_migration_descr">Über einen QR-Code auf ein anderes Gerät migrieren.</string>
+    <string name="v5_6_app_data_migration_descr">Daten können über einen QR-Code auf ein anderes Gerät migriert werden.</string>
     <string name="v5_6_picture_in_picture_calls">Bild-in-Bild-Anrufe</string>
     <string name="v5_6_safer_groups">Sicherere Gruppen</string>
     <string name="v5_6_picture_in_picture_calls_descr">Die App kann während eines Anrufs genutzt werden.</string>
@@ -1796,4 +1796,5 @@
     <string name="migrate_to_device_confirm_network_settings_footer">Bitte bestätigen Sie, dass die Netzwerkeinstellungen auf diesem Gerät richtig sind.</string>
     <string name="conn_event_disabled_pq">Standard-Ende-zu-Ende-Verschlüsselung</string>
     <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Sie dürfen die selbe Datenbank <b>nicht</b> auf zwei Geräten nutzen.]]></string>
+    <string name="error_showing_desktop_notification">Fehler beim Anzeigen der Benachrichtigung. Bitte kontaktieren Sie die Entwickler.</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
index 14fe05cd2e..df52456401 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml
@@ -1648,4 +1648,72 @@
     <string name="migrate_to_device_apply_onion">Aplicar</string>
     <string name="migrate_from_device_archive_and_upload">Archivar y subir</string>
     <string name="migrate_from_device_cancel_migration">Cancelar migración</string>
+    <string name="e2ee_info_no_pq_short">Este chat está protegido por cifrado de extremo a extremo.</string>
+    <string name="migrate_from_another_device">Migrar desde otro dispositivo</string>
+    <string name="conn_event_enabled_pq">cifrado e2e resistente a tecnologías cuánticas</string>
+    <string name="conn_event_disabled_pq">cifrado estándar de extremo a extremo</string>
+    <string name="migrate_to_device_bytes_downloaded">%s descargado</string>
+    <string name="migrate_from_device_or_share_this_file_link">O comparta de forma segura este enlace de archivo</string>
+    <string name="migrate_from_device_migration_complete">Migración completada</string>
+    <string name="migrate_from_device_start_chat">Empezar chat</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Advertencia: el inicio del chat en varios dispositivos no es compatible y provocará fallos en la entrega de mensajes.</string>
+    <string name="migrate_from_device_verify_passphrase">Verificar la frase de contraseña</string>
+    <string name="migrate_from_device_verify_database_passphrase">Verificar la contraseña de la base de datos</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">¡Habilitar en chats directos (BETA)!</string>
+    <string name="v5_6_picture_in_picture_calls_descr">Usar la aplicación durante la llamada.</string>
+    <string name="v5_6_safer_groups">Grupos más seguros</string>
+    <string name="migrate_to_device_downloading_details">Descargando detalles del enlace</string>
+    <string name="invalid_file_link">Enlace inválido</string>
+    <string name="migrate_to_device_migrating">Migrando</string>
+    <string name="paste_archive_link">Pegar enlace de archivo</string>
+    <string name="migrate_to_device_database_init">Preparando descarga</string>
+    <string name="migrate_to_device_repeat_download">Repetir descarga</string>
+    <string name="migrate_to_device_try_again">Puedes intentarlo de nuevo.</string>
+    <string name="migrate_to_device_enter_passphrase">Introducir frase de contraseña</string>
+    <string name="migrate_to_device_error_downloading_archive">Error al descargar el archivo</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">El archivo se ha eliminado o el enlace no es válido</string>
+    <string name="migrate_to_device_finalize_migration">Finalizar la migración en otro dispostivo.</string>
+    <string name="migrate_to_device_import_failed">Error de importación</string>
+    <string name="migrate_to_device_importing_archive">Importando archivo</string>
+    <string name="migrate_to_device_repeat_import">Repetir importación</string>
+    <string name="migrate_from_device_title">Migrar dispositivo</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Por favor confirme que la configuración de red es correcta para este dispositivo.</string>
+    <string name="migrate_from_device_error_deleting_database">Error al borrar la base de datos</string>
+    <string name="migrate_from_device_error_uploading_archive">Error al subir el archivo</string>
+    <string name="migrate_from_device_stopping_chat">Deteniendo chat</string>
+    <string name="migrate_from_device_repeat_upload">Repetir la carga</string>
+    <string name="migrate_from_device_bytes_uploaded">%s subidos</string>
+    <string name="migrate_from_device_upload_failed">Error de subida</string>
+    <string name="migrate_from_device_uploading_archive">Subiendo archivo</string>
+    <string name="migrate_from_device_try_again">Puedes intentarlo de nuevo.</string>
+    <string name="migrate_from_device_creating_archive_link">Creando enlace de archivo</string>
+    <string name="migrate_from_device_delete_database_from_device">Borrar la base de datos de este dispositivo</string>
+    <string name="migrate_from_device_finalize_migration">Finalizar la migración</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Atención</b>: el archivo se eliminará.]]></string>
+    <string name="migrate_from_device_check_connection_and_try_again">Compruebe su conexión a Internet y vuelva a intentarlo</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">Confirme que recuerda la contraseña de la base de datos para migrarla.</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Error al verificar la contraseña:</string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Ten en cuenta</b>: usar la misma base de datos en dos dispositivos romperá el descifrado de mensajes de tus conexiones, como protección de seguridad.]]></string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Elige <i>Migrar desde otro dispositivo</i> en el nuevo dispositivo y escanea el código QR.]]></string>
+    <string name="migrate_to_device_confirm_network_settings">Confirmar la configuración de red</string>
+    <string name="migrate_from_device_confirm_upload">Confirmar carga</string>
+    <string name="migrate_to_device_download_failed">Descarga fallida</string>
+    <string name="migrate_to_device_downloading_archive">Descargando archivo</string>
+    <string name="migrate_from_device_error_exporting_archive">Error al exportar la base de datos de chats</string>
+    <string name="migrate_from_device_error_saving_settings">Error al guardar los ajustes</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">El archivo exportado no existe</string>
+    <string name="migrate_from_device_chat_should_be_stopped">Para continuar, el chat debe detenerse.</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos por <b>cifrado de extremo a extremo</b> con perfecta confidencialidad, repudio y recuperación tras ataques.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Los mensajes, archivos y llamadas están protegidos por <b>cifrado de extremo a extremo resistente a computación cuántica</b> con perfecta confidencialidad, repudio y recuperación tras ataques.]]></string>
+    <string name="migrate_to_device_title">Migrar aquí</string>
+    <string name="migrate_from_device_to_another_device">Migrar hacia otro dispositivo</string>
+    <string name="v5_6_app_data_migration_descr">Migrar hacia otro dispositivo mediante código QR.</string>
+    <string name="auth_open_migration_to_another_device">Abrir pantalla de migración</string>
+    <string name="or_paste_archive_link">O pegar enlace del archivo</string>
+    <string name="v5_6_picture_in_picture_calls">Llamadas picture-in-picture</string>
+    <string name="migrate_from_device_database_init">Preparando subida</string>
+    <string name="v5_6_quantum_resistant_encryption">Cifrado resistente a tecnologías cuánticas</string>
+    <string name="set_passphrase">Establecer frase de contraseña</string>
+    <string name="e2ee_info_pq_short">Este chat está protegido por un cifrado de extremo a extremo resistente a tecnología cuántica.</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[<b>No debes</b> utilizar la misma base de datos en dos dispositivos.]]></string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
index f53d4d9802..0c244c8806 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d üzenet visszafejtése sikertelen</string>
+    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d üzenet visszafejtése sikertelen.</string>
     <string name="alert_text_decryption_error_too_many_skipped">%1$d üzenet kihagyva.</string>
     <string name="integrity_msg_skipped">%1$d kihagyott üzenet</string>
     <string name="group_info_section_title_num_members">%1$s TAG</string>
@@ -726,7 +726,7 @@
     <string name="v4_6_reduced_battery_usage_descr">Hamarosan további fejlesztések érkeznek!</string>
     <string name="message_reactions_prohibited_in_this_chat">Az üzenetreakciók ebben a csevegésben le vannak tiltva.</string>
     <string name="incorrect_code">Helytelen biztonsági kód!</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Ez akkor fordulhat elő, ha ön, vagy a kapcsolata régi adatbázis biztonsági mentést használt.</string>
+    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Ez akkor fordulhat elő, ha ön, vagy az ismerőse régi adatbázis biztonsági mentést használt.</string>
     <string name="v5_3_new_desktop_app">Új asztali alkalmazás!</string>
     <string name="v4_6_group_moderation_descr">Most már az adminok is:
 \n- törölhetik a tagok üzeneteit.
@@ -740,15 +740,15 @@
     <string name="new_member_role">Új tag szerepköre</string>
     <string name="la_mode_off">Ki</string>
     <string name="invalid_contact_link">Érvénytelen hivatkozás!</string>
-    <string name="network_use_onion_hosts_required_desc_in_alert">A csatlakozáshoz Onion host-okra lesz szükség.</string>
+    <string name="network_use_onion_hosts_required_desc_in_alert">A csatlakozáshoz Onion kiszolgálókra lesz szükség.</string>
     <string name="new_in_version">Változások a %s verzióban</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion host-ok használata, ha azok rendelkezésre állnak.</string>
+    <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion kiszolgálók használata, ha azok rendelkezésre állnak.</string>
     <string name="smp_servers_invalid_address">Érvénytelen kiszolgálócím!</string>
     <string name="thousand_abbreviation">k</string>
     <string name="chat_item_ttl_none">soha</string>
     <string name="new_desktop"><![CDATA[<i>(új)</i>]]></string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">Győződjön meg arról, hogy az SMP-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.</string>
-    <string name="network_use_onion_hosts_no_desc">Onion host-ok nem lesznek használva.</string>
+    <string name="network_use_onion_hosts_no_desc">Onion kiszolgálók nem lesznek használva.</string>
     <string name="custom_time_unit_minutes">perc</string>
     <string name="learn_more">Tudjon meg többet</string>
     <string name="notification_new_contact_request">Új kapcsolattartási kérelem</string>
@@ -765,7 +765,7 @@
     <string name="chat_preferences_on">be</string>
     <string name="v5_1_japanese_portuguese_interface">Japán és Portugál kezelőfelület</string>
     <string name="message_deletion_prohibited_in_chat">Ebben a csoportban az üzenetek visszafordíthatatlan törlése le van tiltva.</string>
-    <string name="network_use_onion_hosts_no_desc_in_alert">Onion host-ok nem lesznek használva.</string>
+    <string name="network_use_onion_hosts_no_desc_in_alert">Onion kiszolgálók nem lesznek használva.</string>
     <string name="remote_host_was_disconnected_toast"><![CDATA[A(z) <b>%s</b> eszközzel megszakadt a kapcsolat]]></string>
     <string name="custom_time_unit_months">hónap</string>
     <string name="privacy_message_draft">Üzenetvázlat</string>
@@ -777,7 +777,7 @@
     <string name="message_deletion_prohibited">Ebben a csevegésben az üzenetek visszafordíthatatlan törlése le van tiltva.</string>
     <string name="v4_3_voice_messages_desc">Max 40 másodperc, azonnal fogadható.</string>
     <string name="description_via_contact_address_link_incognito">inkognitó a ismerős azonosító hivatkozáson keresztül</string>
-    <string name="network_use_onion_hosts_required_desc">A kapcsolódáshoz Onion host-okra lesz szükség.
+    <string name="network_use_onion_hosts_required_desc">A kapcsolódáshoz Onion kiszolgálókra lesz szükség.
 \nFigyelem: .onion cím nélkül nem fog tudni kapcsolódni a kiszolgálókhoz.</string>
     <string name="v4_5_italian_interface">Olasz kezelőfelület</string>
     <string name="system_restricted_background_in_call_title">Nincsenek háttérhívások</string>
@@ -833,8 +833,8 @@
 \n3. A kapcsolat sérült.</string>
     <string name="group_member_role_observer">megfigyelő</string>
     <string name="description_via_group_link_incognito">inkognitó a csoportos hivatkozáson keresztül</string>
-    <string name="network_use_onion_hosts_prefer_desc">Onion host-ok használata, ha azok rendelkezésre állnak.</string>
-    <string name="invite_friends">Barátok meghívása</string>
+    <string name="network_use_onion_hosts_prefer_desc">Onion kiszolgálók használata, ha azok rendelkezésre állnak.</string>
+    <string name="invite_friends">Ismerősök meghívása</string>
     <string name="color_surface">Menük és figyelmeztetések</string>
     <string name="icon_descr_add_members">Tagok meghívása</string>
     <string name="group_preview_join_as">csatlakozás mint %s</string>
@@ -1158,7 +1158,7 @@
     <string name="whats_new">Változáslista</string>
     <string name="connect_plan_open_group">Csoport megnyitása</string>
     <string name="info_row_sent_at">Elküldve ekkor</string>
-    <string name="prohibit_sending_voice">Hangüzenetek küldésének letiltása.</string>
+    <string name="prohibit_sending_voice">Hangüzenetek küldése le van tiltva.</string>
     <string name="privacy_show_last_messages">Utolsó üzenetek megjelenítése</string>
     <string name="smp_servers_preset_address">Az előre beállított kiszolgáló címe</string>
     <string name="periodic_notifications_disabled">Rendszeres értesítések letiltva!</string>
@@ -1477,7 +1477,7 @@
     <string name="v5_0_app_passcode_descr">Rendszerhitelesítés helyetti beállítás.</string>
     <string name="switch_receiving_address_desc">A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.</string>
     <string name="stop_chat_to_export_import_or_delete_chat_database">A csevegés leállítása a csevegő adatbázis exportálásához, importálásához, vagy törléséhez. A csevegés leállítása alatt nem tud üzeneteket fogadni és küldeni.</string>
-    <string name="save_passphrase_in_keychain">Jelmondat mentése a kulcstárolóban</string>
+    <string name="save_passphrase_in_keychain">Jelmondat mentése a kulcstárolóba</string>
     <string name="v4_6_chinese_spanish_interface_descr">Köszönet a felhasználóknak - hozzájárulás a Weblaten!</string>
     <string name="save_passphrase_in_settings">Jelmondat mentése a beállításokban</string>
     <string name="send_receipts_disabled_alert_msg">Ennek a csoportnak több mint %1$d tagja van, a kézbesítési jelentések nem kerülnek elküldésre.</string>
@@ -1710,4 +1710,5 @@
     <string name="e2ee_info_pq_short">Ez a csevegés végpontok közötti kvantumrezisztens tikosítással védett.</string>
     <string name="e2ee_info_no_pq"><![CDATA[Az üzeneteket, fájlokat és hívásokat <b>végpontok közötti titkosítással</b> és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.]]></string>
     <string name="e2ee_info_pq"><![CDATA[Az üzeneteket, fájlokat és hívásokat <b>végpontok közötti kvantumrezisztens titkosítással</b> és sérülés utáni titkosságvédelemmel, visszautasítással és sérülés utáni helyreállítással védi.]]></string>
+    <string name="error_showing_desktop_notification">Hiba az értesítés megjelenítésekor, lépjen kapcsolatba a fejlesztőkkel.</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_simplex.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_simplex.svg
new file mode 100644
index 0000000000..d7019f3645
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_simplex.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="120"
+   height="120"
+   viewBox="121 0 40 40"
+   fill="none"
+   version="1.1"
+   id="svg3"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 126.52238,11.425398 5.80302,5.716401 5.88962,-5.889626 2.8582,2.858201 L 135.1836,20 l 5.7164,5.716402 -2.94482,2.8582 -5.7164,-5.629789 -5.88962,5.803014 -2.8582,-2.858201 5.88962,-5.803014 -5.803,-5.716402 z"
+     fill="#030749"
+     id="path1"
+     style="stroke-width:0.866122" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 137.86858,28.661214 2.94481,-2.944812 v 0 l 5.88963,-5.803014 -5.80302,-5.62979 v 0 l -2.8582,-2.8582 -5.7164,-5.7164023 2.94481,-2.9448129 5.7164,5.7164017 5.88963,-5.8030138 2.8582,2.8582008 -5.88962,5.8030145 5.7164,5.716401 5.88962,-5.803014 2.8582,2.858201 -5.88962,5.803014 5.803,5.716402 -2.9448,2.858201 -5.7164,-5.716402 -5.88963,5.803013 5.7164,5.716402 -2.8582,2.944813 -5.80301,-5.716402 -5.80302,5.803015 -2.8582,-2.858201 z"
+     fill="url(#paint0_linear_40_164)"
+     id="path2"
+     style="fill:url(#paint0_linear_40_164);stroke-width:0.866122" />
+  <defs
+     id="defs3">
+    <linearGradient
+       x1="135.948"
+       y1="-0.81632602"
+       x2="132.09599"
+       y2="36.985699"
+       gradientUnits="userSpaceOnUse"
+       id="paint0_linear_40_164"
+       gradientTransform="matrix(0.86612147,0,0,0.86612147,18.863485,2.6775707)">
+      <stop
+         stop-color="#01f1ff"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#0197ff"
+         id="stop3" />
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
index 41618606f7..69710a68a2 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
@@ -1500,7 +1500,7 @@
     <string name="v5_4_block_group_members">Blocca i membri dei gruppi</string>
     <string name="v5_4_incognito_groups_descr">Crea un gruppo usando un profilo casuale.</string>
     <string name="v5_4_link_mobile_desktop">Collega le app mobile e desktop! 🔗</string>
-    <string name="v5_4_link_mobile_desktop_descr">Tramite protocollo sicuro resistente al quantistico.</string>
+    <string name="v5_4_link_mobile_desktop_descr">Tramite protocollo sicuro resistente alla quantistica.</string>
     <string name="v5_4_block_group_members_descr">Per nascondere messaggi indesiderati.</string>
     <string name="v5_4_better_groups">Gruppi migliorati</string>
     <string name="v5_4_incognito_groups">Gruppi in incognito</string>
@@ -1640,7 +1640,7 @@
     <string name="unable_to_open_browser_title">Errore di apertura del browser</string>
     <string name="unable_to_open_browser_desc">Il browser predefinito è necessario per le chiamate. Configura il browser predefinito nel sistema, poi condividi più informazioni con gli sviluppatori.</string>
     <string name="e2ee_info_no_pq_short">Questa chat è protetta da crittografia end-to-end.</string>
-    <string name="e2ee_info_pq_short">Questa chat è protetta da crittografia end-to-end resistente al quantistico.</string>
+    <string name="e2ee_info_pq_short">Questa chat è protetta da crittografia end-to-end resistente alla quantistica.</string>
     <string name="migrate_from_device_start_chat">Avvia chat</string>
     <string name="migrate_to_device_title">Migra qui</string>
     <string name="migrate_to_device_downloading_details">Scaricamento dettagli del link</string>
@@ -1680,7 +1680,7 @@
     <string name="migrate_to_device_importing_archive">Importazione archivio</string>
     <string name="invalid_file_link">Link non valido</string>
     <string name="e2ee_info_no_pq"><![CDATA[I messaggi, i file e le chiamate sono protetti da <b>crittografia end-to-end</b> con perfect forward secrecy, ripudio e recupero da intrusione.]]></string>
-    <string name="e2ee_info_pq"><![CDATA[I messaggi, i file e le chiamate sono protetti da <b>crittografia e2e resistente al quantistico</b> con perfect forward secrecy, ripudio e recupero da intrusione.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[I messaggi, i file e le chiamate sono protetti da <b>crittografia e2e resistente alla quantistica</b> con perfect forward secrecy, ripudio e recupero da intrusione.]]></string>
     <string name="migrate_from_device_title">Migra dispositivo</string>
     <string name="migrate_from_another_device">Migra da un altro dispositivo</string>
     <string name="migrate_from_device_to_another_device">Migra ad un altro dispositivo</string>
@@ -1694,10 +1694,10 @@
     <string name="v5_6_picture_in_picture_calls">Chiamate picture-in-picture</string>
     <string name="migrate_to_device_confirm_network_settings_footer">Conferma che le impostazioni di rete sono corrette per questo dispositivo.</string>
     <string name="migrate_from_device_database_init">Preparazione del caricamento</string>
-    <string name="conn_event_enabled_pq">crittografia e2e resistente al quantistico</string>
+    <string name="conn_event_enabled_pq">crittografia e2e resistente alla quantistica</string>
     <string name="migrate_to_device_repeat_import">Ripeti importazione</string>
     <string name="migrate_to_device_database_init">Preparazione dello scaricamento</string>
-    <string name="v5_6_quantum_resistant_encryption">Crittografia resistente al quantistico</string>
+    <string name="v5_6_quantum_resistant_encryption">Crittografia resistente alla quantistica</string>
     <string name="migrate_to_device_repeat_download">Ripeti scaricamento</string>
     <string name="migrate_from_device_repeat_upload">Ripeti caricamento</string>
     <string name="v5_6_safer_groups">Gruppi più sicuri</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
index 1d5a7b690d..7899c374b2 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/iw/strings.xml
@@ -37,7 +37,7 @@
     <string name="allow_your_contacts_to_send_disappearing_messages">אפשר לאנשי קשר לשלוח הודעות נעלמות.</string>
     <string name="allow_voice_messages_only_if">אפשר הודעות קוליות רק אם איש הקשר מאפשר אותן.</string>
     <string name="allow_your_contacts_to_call">אפשר לאנשי קשר להתקשר אליכם.</string>
-    <string name="allow_to_delete_messages">אפשר מחיקה בלתי הפיכה של הודעות שנשלחו.</string>
+    <string name="allow_to_delete_messages">אפשר למחוק הודעות שנשלחו באופן בלתי הפיך. (24 שעות)</string>
     <string name="allow_to_send_disappearing">אפשר שליחת הודעות נעלמות.</string>
     <string name="allow_to_send_voice">אפשר שליחת הודעות קוליות.</string>
     <string name="group_member_role_admin">מנהל</string>
@@ -47,7 +47,7 @@
     <string name="v4_3_improved_server_configuration_desc">הוספת שרתים על ידי סריקת קוד QR.</string>
     <string name="smp_servers_add_to_another_device">הוסף למכשיר אחר</string>
     <string name="allow_calls_only_if">אפשר שיחות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="allow_irreversible_message_deletion_only_if">אפשר לאנשי קשר מחיקת הודעות בלתי הפיכה רק אם הם מאפשרים לך לעשות זאת.</string>
+    <string name="allow_irreversible_message_deletion_only_if">אפשר מחיקת הודעות בלתי הפיכה רק אם האיש קשר מאפשר את זה (24 שעות)</string>
     <string name="allow_direct_messages">אפשר שליחת הודעות ישירות לחברי הקבוצה.</string>
     <string name="allow_voice_messages_question">לאפשר הודעות קוליות\?</string>
     <string name="allow_your_contacts_to_send_voice_messages">אפשר לאנשי קשר לשלוח הודעות קוליות.</string>
@@ -95,7 +95,7 @@
     <string name="auth_unavailable">אימות לא זמין</string>
     <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>הטוב ביותר לסוללה</b>. התראות יוצגו רק כאשר האפליקציה מופעלת (ללא שירות רקע).]]></string>
     <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>טוב לסוללה</b>. שירות הרקע ייבדוק הודעות כל 10 דקות. שיחות או הודעות דחופות עלולות להתפספס.]]></string>
-    <string name="both_you_and_your_contacts_can_delete">גם אתם וגם איש הקשר יכולים למחוק באופן בלתי הפיך הודעות שנשלחו.</string>
+    <string name="both_you_and_your_contacts_can_delete">גם אתה וגם איש הקשר שלך יכולים למחוק הודעות שנשלחו באופן בלתי הפיך. (24 שעות)</string>
     <string name="both_you_and_your_contact_can_send_disappearing">גם אתם וגם איש הקשר יכולים לשלוח הודעות נעלמות.</string>
     <string name="cannot_receive_file">לא ניתן לקבל את הקובץ</string>
     <string name="icon_descr_cancel_image_preview">בטל תצוגה מקדימה של תמונות</string>
@@ -117,9 +117,9 @@
     <string name="callstatus_calling">מתקשר…</string>
     <string name="callstatus_ended">השיחה הסתיימה %1$s</string>
     <string name="icon_descr_cancel_file_preview">בטל תצוגה מקדימה של קבצים</string>
-    <string name="connect_via_contact_link">להתחבר באמצעות קישור ליצירת קשר\?</string>
+    <string name="connect_via_contact_link">להתחבר באמצעות קישור ליצירת קשר?</string>
     <string name="connect_via_link_verb">התחבר</string>
-    <string name="connect_via_group_link">להתחבר באמצעות קישור קבוצה\?</string>
+    <string name="connect_via_group_link">להצטרף לקבוצה?</string>
     <string name="server_connected">מחובר</string>
     <string name="server_connecting">מתחבר</string>
     <string name="display_name_connecting">מתחבר…</string>
@@ -197,7 +197,7 @@
     <string name="icon_descr_server_status_connected">מחובר</string>
     <string name="display_name_connection_established">חיבור נוצר</string>
     <string name="connection_local_display_name">חיבור %1$d</string>
-    <string name="connect_via_invitation_link">להתחבר באמצעות קישור הזמנה\?</string>
+    <string name="connect_via_invitation_link">להתחבר דרך קישור חד-פעמי?</string>
     <string name="contact_already_exists">איש הקשר כבר קיים</string>
     <string name="delete_contact_all_messages_deleted_cannot_undo_warning">איש הקשר וכל ההודעות יימחקו – לא ניתן לבטל זאת!</string>
     <string name="connect_via_link_or_qr">התחברות באמצעות קישור / קוד QR</string>
@@ -333,7 +333,7 @@
     <string name="la_enter_app_passcode">הזינו קוד גישה</string>
     <string name="auth_enable_simplex_lock">הפעלת נעילת SimpleX</string>
     <string name="edit_verb">ערוך</string>
-    <string name="display_name__field">שם תצוגה:</string>
+    <string name="display_name__field">שם פרופיל:</string>
     <string name="edit_image">ערוך תמונה</string>
     <string name="enter_correct_passphrase">הזינו סיסמה נכונה.</string>
     <string name="mtr_error_different">העברת נתונים שונה באפליקציה/מסד נתונים: %s / %s</string>
@@ -389,7 +389,7 @@
     <string name="v4_5_multiple_chat_profiles_descr">שמות שונים, אווטארים ובידוד תעבורה.</string>
     <string name="conn_level_desc_direct">ישיר</string>
     <string name="direct_messages_are_prohibited_in_chat">הודעות ישירות בין חברי קבוצה אסורות בקבוצה זו.</string>
-    <string name="display_name">שם תצוגה</string>
+    <string name="display_name">הזן את שמך:</string>
     <string name="display_name_cannot_contain_whitespace">שם תצוגה אינו יכול להכיל רווחים.</string>
     <string name="ttl_months">%d חודשים</string>
     <string name="ttl_mth">%d ח׳</string>
@@ -436,7 +436,7 @@
     <string name="file_with_path">קובץ: %s</string>
     <string name="icon_descr_group_inactive">קבוצה לא פעילה</string>
     <string name="group_invitation_expired">פג תוקפה של ההזמנה לקבוצה</string>
-    <string name="group_display_name_field">שם תצוגה של הקבוצה:</string>
+    <string name="group_display_name_field">הזן שם של הקבוצה:</string>
     <string name="group_full_name_field">שם מלא של הקבוצה:</string>
     <string name="v4_2_group_links">קישורי קבוצה</string>
     <string name="icon_descr_file">קובץ</string>
@@ -495,7 +495,7 @@
     <string name="delete_group_for_self_cannot_undo_warning">הקבוצה תימחק עבורך – לא ניתן לבטל זאת!</string>
     <string name="user_hide">הסתר</string>
     <string name="group_preferences">העדפות קבוצה</string>
-    <string name="group_members_can_delete">חברי הקבוצה יכולים למחוק באופן בלתי הפיך הודעות שנשלחו.</string>
+    <string name="group_members_can_delete">חברי קבוצה יכולים למחוק הודעות שנשלחו באופן בלתי הפיך. (24 שעות)</string>
     <string name="group_members_can_send_disappearing">חברי הקבוצה יכולים לשלוח הודעות נעלמות.</string>
     <string name="group_members_can_send_dms">חברי הקבוצה יכולים לשלוח הודעות ישירות.</string>
     <string name="group_members_can_send_voice">חברי הקבוצה יכולים לשלוח הודעות קוליות.</string>
@@ -627,7 +627,7 @@
     <string name="chat_preferences_on">פעיל</string>
     <string name="chat_preferences_no">לא</string>
     <string name="chat_preferences_off">כבוי</string>
-    <string name="only_you_can_delete_messages">רק אתם יכולים למחוק הודעות באופן בלתי הפיך (איש הקשר שלכם יכול לסמן אותן למחיקה).</string>
+    <string name="only_you_can_delete_messages">רק אתה יכול למחוק הודעות באופן בלתי הפיך (איש הקשר שלך יכול לסמן אותן למחיקה). (24 שעות)</string>
     <string name="only_you_can_send_voice">רק אתם יכולים לשלוח הודעות קוליות.</string>
     <string name="only_your_contact_can_send_voice">רק איש הקשר שלכם יכול לשלוח הודעות קוליות.</string>
     <string name="only_you_can_make_calls">רק אתם יכולים לבצע שיחות.</string>
@@ -640,7 +640,7 @@
     <string name="no_contacts_to_add">אין אנשי קשר להוסיף</string>
     <string name="only_you_can_send_disappearing">רק אתם יכולים לשלוח הודעות נעלמות.</string>
     <string name="only_your_contact_can_send_disappearing">רק איש הקשר שלכם יכול לשלוח הודעות נעלמות.</string>
-    <string name="only_your_contact_can_delete">רק איש הקשר שלכם יכול למחוק הודעות באופן בלתי הפיך (אתם יכולים לסמן אותן למחיקה).</string>
+    <string name="only_your_contact_can_delete">רק איש הקשר שלך יכול למחוק הודעות באופן בלתי הפיך (אתה יכול לסמן אותן למחיקה). (24 שעות)</string>
     <string name="v4_5_message_draft">טיוטת הודעה</string>
     <string name="v4_5_multiple_chat_profiles">פרופילי צ׳אט מרובים</string>
     <string name="v4_5_reduced_battery_usage_descr">שיפורים נוספים יגיעו בקרוב!</string>
@@ -761,7 +761,7 @@
     <string name="smp_servers_preset_address">כתובת שרת מוגדר מראש</string>
     <string name="password_to_show">סיסמה להצגה</string>
     <string name="onboarding_notifications_mode_title">התראות פרטיות</string>
-    <string name="paste_the_link_you_received">הדבק קישור שהתקבל</string>
+    <string name="paste_the_link_you_received">הדבק את הקישור שקיבלת</string>
     <string name="call_connection_peer_to_peer">עמית־לעמית</string>
     <string name="icon_descr_call_pending_sent">שיחה ממתינה</string>
     <string name="alert_text_fragment_please_report_to_developers">אנא דווחו על כך למפתחים.</string>
@@ -1156,7 +1156,7 @@
     <string name="you_accepted_connection">אישרת את החיבור</string>
     <string name="image_descr_simplex_logo">סמל SimpleX</string>
     <string name="xftp_servers">שרתי XFTP</string>
-    <string name="alert_text_decryption_error_too_many_skipped">%1$d הודעות דולגו.</string>
+    <string name="alert_text_decryption_error_too_many_skipped">דילג על %1$d הודעות.</string>
     <string name="wrong_passphrase">סיסמת מסד נתונים שגויה</string>
     <string name="you_are_invited_to_group">הוזמנת לקבוצה</string>
     <string name="you_joined_this_group">הצטרפת לקבוצה זו</string>
@@ -1219,7 +1219,7 @@
     <string name="your_ice_servers">שרתי ה־ICE שלך</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">אתם תהיו מחוברים כאשר בקשת החיבור תאושר, אנא חכו או בידקו מאוחר יותר!</string>
     <string name="profile_will_be_sent_to_contact_sending_link">הפרופיל שלך יישלח לאיש הקשר ממנו קיבלת קישור זה.</string>
-    <string name="you_will_join_group">אתם תצטרפו לקבוצה אליה קישור זה מפנה ותתחברו לחברי הקבוצה.</string>
+    <string name="you_will_join_group">תתחבר לכל חברי הקבוצה.</string>
     <string name="description_you_shared_one_time_link_incognito">שיתפת קישור חד־פעמי לזהות נסתרת</string>
     <string name="la_notice_turn_on">הפעלת נעילה</string>
     <string name="incognito_random_profile">הפרופיל האקראי שלך</string>
@@ -1374,7 +1374,7 @@
     <string name="error_creating_member_contact">שגיאה ביצירת איש קשר</string>
     <string name="socks_proxy_setting_limitations"><![CDATA[<b>שימו לב</b>: ממסרי הודעות וקבצים מחוברים דרך פרוקסי SOCKS. שיחות ושליחת תצוגות מקדימות של קישורים משתמשים בחיבור ישיר.]]></string>
     <string name="encrypt_local_files">הצפין קבצים מקומיים</string>
-    <string name="v5_3_new_desktop_app">אפליקציית שולחן עבודה חדשה!</string>
+    <string name="v5_3_new_desktop_app">אפליקציה חדשה למחשב השולחני!</string>
     <string name="v5_3_new_interface_languages">6 שפות ממשק חדשות</string>
     <string name="v5_3_encrypt_local_files_descr">האפליקציה מצפינה קבצים מקומיים חדשים (למעט סרטונים).</string>
     <string name="you_can_change_it_later">ביטוי סיסמה אקראי מאוחסן בהגדרות כטקסט רגיל.
@@ -1399,4 +1399,321 @@
     <string name="settings_is_storing_in_clear_text">ביטוי הסיסמה מאוחסן בהגדרות כטקסט רגיל.</string>
     <string name="member_contact_send_direct_message">שלח הודעה ישירה</string>
     <string name="rcv_group_event_member_created_contact">מחובר ישירות</string>
+    <string name="terminal_always_visible">הצג קונסולה בחלון חדש</string>
+    <string name="v5_5_private_notes">הערות פרטיות</string>
+    <string name="v5_5_private_notes_descr">עם הצפנת קבצים ומדיה.</string>
+    <string name="v5_5_new_interface_languages">ממשק משתמש בהונגרית ובטורקית</string>
+    <string name="v5_5_message_delivery_descr">עם צריכת סוללה מופחתת.</string>
+    <string name="remote_host_was_disconnected_title">החיבור עצר</string>
+    <string name="agent_critical_error_title">שגיאה קריטית</string>
+    <string name="agent_internal_error_title">שגיאה פנימית</string>
+    <string name="agent_critical_error_desc">אנא דווח על כך למפתחים:
+\n%s
+\n
+\nמומלץ לאתחל מחדש את האפליקציה.</string>
+    <string name="note_folder_local_display_name">הערות פרטיות</string>
+    <string name="call_service_notification_audio_call">שיחה קולית</string>
+    <string name="call_service_notification_video_call">שיחת וידאו</string>
+    <string name="auth_open_migration_to_another_device">פתח מסך העברה</string>
+    <string name="expand_verb">הרחב</string>
+    <string name="code_you_scanned_is_not_simplex_link_qr_code">הקוד שסרקת אינו קוד QR של קישור SimpleX.</string>
+    <string name="you_can_make_address_visible_via_settings">תוכל להפוך אותו לגלוי לאנשי הקשר שלך ב-SimpleX דרך ההגדרות.</string>
+    <string name="invalid_name">שם לא חוקי!</string>
+    <string name="set_passphrase">הגדר סיסמא</string>
+    <string name="group_member_status_unknown_short">לא ידוע</string>
+    <string name="past_member_vName">משתתף לשעבר %1$s</string>
+    <string name="conn_event_enabled_pq">הצפנה קצה-אל-קצה עמידה בפני מחשוב קוונטי</string>
+    <string name="group_members_2">%s ו-%s</string>
+    <string name="snd_group_event_member_blocked">חסמת את %s</string>
+    <string name="conn_event_disabled_pq">סטנדרט הצפנה קצה-אל-קצה</string>
+    <string name="block_for_all">חסימה לכולם</string>
+    <string name="block_for_all_question">לחסום משתתף להכל?</string>
+    <string name="error_sending_message_contact_invitation">שגיאה בשליחת הזמנה</string>
+    <string name="unblock_member_confirmation">בטל נעילה</string>
+    <string name="recent_history">צפיה בהיסטוריה</string>
+    <string name="v5_4_better_groups">קבוצות טובות יותר</string>
+    <string name="v5_4_incognito_groups_descr">צור קבוצה באמצעות פרופיל רנדומלי.</string>
+    <string name="v5_4_better_groups_descr">הצטרפות מהירה יותר והודעות אמינות יותר.</string>
+    <string name="v5_4_incognito_groups">קבוצות חשאיות</string>
+    <string name="v5_4_link_mobile_desktop">קשר בין האפליקציות במכשיר הנייד והמחשב השולחני! 🔗</string>
+    <string name="v5_5_simpler_connect_ui">הדבק קישור כדי להתחבר!</string>
+    <string name="v5_5_join_group_conversation_descr">היסטוריה אחרונה ובוט משופר.</string>
+    <string name="v5_4_link_mobile_desktop_descr">דרך פרוטוקול מאובטח עמיד בפני מחשוב קוונטי</string>
+    <string name="linked_mobiles">מכשירי נייד מקושרים</string>
+    <string name="migrate_to_device_chat_migrated">הצ׳אט הועבר!</string>
+    <string name="migrate_from_device_try_again">אתה יכול לנסות שוב.</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>אזהרה</b>: הארכיון יימחק.]]></string>
+    <string name="retry_verb">נסה שוב</string>
+    <string name="v5_6_quantum_resistant_encryption">הצפנה עמידה בפני מחשוב קוונטי</string>
+    <string name="v5_6_app_data_migration">העברת נתוני אפליקציה</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">אפשר בצ\'אטים ישירים (בטא)!</string>
+    <string name="v5_6_app_data_migration_descr">העבר למכשיר אחר באמצעות קוד QR.</string>
+    <string name="v5_6_picture_in_picture_calls">שיחות תמונה-בתמונה</string>
+    <string name="v5_6_safer_groups_descr">מנהל יכול לחסום את כל החברים בקבוצה</string>
+    <string name="link_a_mobile">קשר מכשיר נייד</string>
+    <string name="scan_from_mobile">סרוק מהנייד</string>
+    <string name="this_device_version"><![CDATA[<i>(גרסת המכשיר הזה %s)</i>]]></string>
+    <string name="unlink_desktop_question">האם לבטל את הקישור למחשב השולחני?</string>
+    <string name="verify_code_with_desktop">אמת קוד עם המחשב השולחני</string>
+    <string name="linked_desktops">מחשבים שולחניים מקושרים</string>
+    <string name="not_compatible">לא תואם!</string>
+    <string name="random_port">אקראי</string>
+    <string name="remote_host_error_inactive"><![CDATA[הנייד <b>%s</b> לא פעיל]]></string>
+    <string name="open_port_in_firewall_title">פתח פורט בחומת האש</string>
+    <string name="remote_ctrl_error_busy">המחשב השולחני עמוס</string>
+    <string name="remote_ctrl_error_disconnected">המחשב השולחני מנותק</string>
+    <string name="connect_plan_you_are_already_connecting_to_vName"><![CDATA[אתה כבר מתחבר אל <b>%1$s</b>.]]></string>
+    <string name="connect_plan_this_is_your_own_one_time_link">זה הקישור חד-פעמי שלך!</string>
+    <string name="connect_plan_this_is_your_link_for_group_vName"><![CDATA[זהו הקישור שלך לקבוצה <b>%1$s</b>!]]></string>
+    <string name="connect_plan_group_already_exists">קבוצה כבר קיימת!</string>
+    <string name="restart_chat_button">התחל צ׳אט מחדש</string>
+    <string name="or_paste_archive_link">או הדבק קישור ארכיון</string>
+    <string name="migrate_to_device_download_failed">הורדה נכשלה</string>
+    <string name="migrate_to_device_downloading_details">מוריד פרטי קישור</string>
+    <string name="invalid_file_link">קישור לא תקף</string>
+    <string name="migrate_to_device_migrating">מתבצעת העברה</string>
+    <string name="migrate_to_device_database_init">מכין את ההורדה</string>
+    <string name="migrate_to_device_bytes_downloaded">%s הורד</string>
+    <string name="migrate_to_device_repeat_download">הורדה מחדש</string>
+    <string name="migrate_to_device_try_again">אתה יכול לנסות שוב.</string>
+    <string name="migrate_to_device_error_downloading_archive">שגיאה בהורדה של ארכיון</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">הקובץ נמחק או שהקישור אינו תקף</string>
+    <string name="migrate_from_device_title">העבר מכשיר</string>
+    <string name="migrate_from_device_to_another_device">העבר אל מכשיר אחר</string>
+    <string name="migrate_from_device_error_deleting_database">שגיאה במחיקת מסד נתונים</string>
+    <string name="migrate_from_device_error_uploading_archive">שגיאה בהעלאה לארכיון</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">קובץ ייצוא אינו קיים</string>
+    <string name="migrate_from_device_chat_should_be_stopped">כדי להמשיך, יש לעצור את הצ\'אט.</string>
+    <string name="migrate_from_device_database_init">מכין את העלאה</string>
+    <string name="migrate_from_device_stopping_chat">עצירת צ׳אט</string>
+    <string name="migrate_from_device_archive_and_upload">העבר לארכיון והעלאה</string>
+    <string name="migrate_from_device_confirm_upload">אשר העלאה</string>
+    <string name="migrate_from_device_archiving_database">העברת בסיס נתונים לארכיון</string>
+    <string name="migrate_from_device_bytes_uploaded">%s העלה</string>
+    <string name="migrate_from_device_uploading_archive">העלאת ארכיון</string>
+    <string name="migrate_from_device_cancel_migration">בטל העברה</string>
+    <string name="migrate_from_device_finalize_migration">סיים את ההעברה</string>
+    <string name="migrate_from_device_repeat_upload">העלאה מחדש</string>
+    <string name="migrate_from_device_or_share_this_file_link">או שתף באופן מאובטח את קישור הקובץ הזה</string>
+    <string name="migrate_from_device_delete_database_from_device">מחק את המסד נתונים מהמכשיר.</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">אזהרה: התחלת צ׳אט על מספר מכשירים אינה נתמכת ויכולה לגרום בבעיות בהעברת הודעות</string>
+    <string name="migrate_from_device_start_chat">התחל צ׳אט</string>
+    <string name="migrate_from_device_migration_complete">העברה הושלמה</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[אתה <b>חייב לא</b> להשתמש באותה מסד נתונים על שני מכשירים.]]></string>
+    <string name="migrate_from_device_check_connection_and_try_again">תבדוק את החיבור לאינטרנט ונסה שוב</string>
+    <string name="migrate_from_device_error_verifying_passphrase">שגיאה באימות סיסמה:</string>
+    <string name="migrate_from_device_verify_database_passphrase">אימות סיסמא של מסד נתונים</string>
+    <string name="migrate_from_device_verify_passphrase">אימות סיסמא</string>
+    <string name="connect_plan_you_are_already_joining_the_group_via_this_link">אתה כבר מצטרף לקבוצה באמצעות הקישור הזה.</string>
+    <string name="remote_host_disconnected_from"><![CDATA[נותק מהנייד <b>%s</b> מהסיבה: %s]]></string>
+    <string name="remote_host_error_missing"><![CDATA[הנייד <b>%s</b> חסר]]></string>
+    <string name="connect_plan_already_connecting">כבר מחובר!</string>
+    <string name="blocked_by_admin_item_description">חסום על ידי מנהל</string>
+    <string name="failed_to_create_user_invalid_desc">שם התצוגה הזה אינו חוקי. אנא בחר שם אחר.</string>
+    <string name="error_deleting_note_folder">שגיאה במחיקת הערות פרטיות</string>
+    <string name="loading_chats">טעינת צ׳אטים…</string>
+    <string name="connect_with_contact_name_question">להתחבר עם %1$s?</string>
+    <string name="new_chat">צ׳אט חדש</string>
+    <string name="or_show_this_qr_code">או הצג את הקוד הזה</string>
+    <string name="or_scan_qr_code">או סרוק קוד QR</string>
+    <string name="keep_invitation_link">שמור</string>
+    <string name="snd_group_event_member_unblocked">ביטלת חסימה של %s</string>
+    <string name="group_member_role_author">מחבר</string>
+    <string name="saved_message_title">הודעה נשמרה</string>
+    <string name="unblock_for_all_question">האם לבטל חסימה של משתתף לכולם?</string>
+    <string name="unblock_for_all">בטל חסימה לכולם</string>
+    <string name="member_blocked_by_admin">חסום על ידי מנהל</string>
+    <string name="member_info_member_blocked">חסום</string>
+    <string name="error_blocking_member_for_all">שגיאה בחסימת משתתף לכולם</string>
+    <string name="v5_5_simpler_connect_ui_descr">שורת החיפוש מקבלת קישורי הזמנה.</string>
+    <string name="v5_5_join_group_conversation">הצטרף לשיחות קבוצתיות</string>
+    <string name="v5_5_message_delivery">שיפור במסירת הודעות</string>
+    <string name="remote_ctrl_error_inactive">מחשב שולחני לא פעיל</string>
+    <string name="connect_plan_connect_via_link">להתחבר דרך קישור?</string>
+    <string name="agent_internal_error_desc">אנא דווח על כך למפתחים:
+\n%s</string>
+    <string name="start_chat_question">האם להתחיל צ׳אט?</string>
+    <string name="unlink_desktop">בטל קישור</string>
+    <string name="call_service_notification_end_call">סיום שיחה</string>
+    <string name="tap_to_scan">לחץ לסריקה</string>
+    <string name="create_group_button_to_create_new_group"><![CDATA[<b>צור קבוצה</b>: כדי ליצור קבוצה חדשה.]]></string>
+    <string name="clear_note_folder_question">למחוק הערות פרטיות?</string>
+    <string name="add_contact_tab">הוסף איש קשר</string>
+    <string name="you_can_view_invitation_link_again">תוכל לראות את קישור ההזמנה שוב בפרטי החיבור.</string>
+    <string name="keep_unused_invitation_question">האם לשמור הזמנה שלא נעשה בה שימוש?</string>
+    <string name="the_text_you_pasted_is_not_a_link">הטקסט שהדבקת אינו קישור של SimpleX.</string>
+    <string name="show_slow_api_calls">הצג קריאות API איטיות</string>
+    <string name="developer_options_section">אפשרויות למפתח</string>
+    <string name="create_another_profile_button">צור פרופיל</string>
+    <string name="rcv_group_and_other_events">ו %d שאר האירועים</string>
+    <string name="profile_update_event_set_new_address">הגדר כתובת איש קשר חדש</string>
+    <string name="contact_tap_to_connect">לחץ לחיבור</string>
+    <string name="unable_to_open_browser_desc">דפדפן האינטרנט המוגדר כברירת מחדל נדרש לשיחות. אנא הגדר דפדפן ברירת מחדל במערכת, ושתף מידע נוסף עם המפתחים.</string>
+    <string name="e2ee_info_no_pq_short">השיחה הזו מוגנת באמצעות הצפנה קצה-אל-קצה.</string>
+    <string name="e2ee_info_pq_short">השיחה הזו מוגנת באמצעות הצפנה קצה-אל-קצה עמידה בפני מחשוב קוונטי.</string>
+    <string name="connect_plan_this_is_your_own_simplex_address">זהו כתובת ה-SimpleX שלך!</string>
+    <string name="remote_host_error_timeout"><![CDATA[הסתיים פסק הזמן הקצוב להתחברות למכשיר נייד <b>%s</b>]]></string>
+    <string name="clear_note_folder_warning">כל ההודעות יימחקו- לא ניתן לשוב לאחור</string>
+    <string name="block_member_desc">כל ההודעות החדשות מ %s יהיו מוחבאות</string>
+    <string name="remote_ctrl_error_bad_state">החיבור לשולחן העבודה נמצא במצב לקוי</string>
+    <string name="correct_name_to">לתקן את השם ל-%s?</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">כל אנשי הקשר שלך, שיחות וקבצים יהיו מוצפנים באופן מאובטח ויעלו בחתיכות לריליים של XFTP שהוגדרו.</string>
+    <string name="migrate_to_device_apply_onion">החל</string>
+    <string name="la_app_passcode">קוד עבור אפליקציה</string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>הוסף איש קשר</b>: כדי ליצור קישור הזמנה חדש, או להתחבר דרך קישור שקיבלת.]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>שים לב</b>: שימוש באותו מסד נתונים על שני מכשירים ישבור את הפענוח ההצפנה של ההודעות מהחיבורים שלך, נועד כהגנה בטחונית.]]></string>
+    <string name="chat_is_stopped_you_should_transfer_database">הצ\'אט נסגר. אם כבר השתמשת במסד נתונים זה במכשיר אחר, עליך להעבירו חזרה לפני שתתחיל בצ\'אט.</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[בחר <i>העבר ממכשיר אחר</i> במכשיר החדש וסרוק קוד QR.]]></string>
+    <string name="migrate_to_device_confirm_network_settings">אשר הגדרות רשת</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">אשר שאתה זוכר את סיסמת מסד הנתונים כדי להעביר אותו.</string>
+    <string name="connected_desktop">התחבר למחשב השולחני</string>
+    <string name="migrate_from_device_creating_archive_link">יוצר קישור ארכיון</string>
+    <string name="creating_link">יוצר קישור…</string>
+    <string name="delete_and_notify_contact">מחק והודע לאיש קשר</string>
+    <string name="delete_messages__question">האם למחוק %d הודעות?</string>
+    <string name="remote_ctrl_error_bad_version">למחשב השולחני יש גרסה שאינה נתמכת. אנא, ודא שאתה משתמש באותה גרסה על שני המכשירים</string>
+    <string name="remote_ctrl_error_bad_invitation">למחשב השולחני יש קוד הזמנה שגוי</string>
+    <string name="migrate_to_device_downloading_archive">מוריד ארכיון</string>
+    <string name="enable_camera_access">אפשר גישה למצלמה</string>
+    <string name="encryption_renegotiation_error">שגיאת משא ומתן מחדש של הצפנה</string>
+    <string name="alert_text_encryption_renegotiation_failed">המשא ומתן מחדש של ההצפנה נכשל.</string>
+    <string name="migrate_to_device_enter_passphrase">הזן סיסמא</string>
+    <string name="error_alert_title">שגיאה</string>
+    <string name="error_creating_message">שגיאה ביצירת הודעה</string>
+    <string name="migrate_from_device_error_exporting_archive">שגיאה בייצוא מסד נתוני צ\'אט</string>
+    <string name="unable_to_open_browser_title">שגיאה בפתיחת דפדפן</string>
+    <string name="migrate_from_device_error_saving_settings">שגיאה בשמירת אפשרויות</string>
+    <string name="migrate_to_device_finalize_migration">סיים את ההעברה על מכשיר נוסף.</string>
+    <string name="invalid_qr_code">קוד QR לא חוקי</string>
+    <string name="recent_history_is_not_sent_to_new_members">ההיסטוריה לא נשלחת לחברים חדשים.</string>
+    <string name="migrate_to_device_import_failed">יבוא נכשל</string>
+    <string name="migrate_to_device_importing_archive">מייבא ארכיון</string>
+    <string name="connect_plan_join_your_group">האם להצטרף אל הקבוצה?</string>
+    <string name="new_desktop"><![CDATA[<i>(חדש)</i>]]></string>
+    <string name="profile_update_event_member_name_changed">משתתף %1$s השתנה ל-%2$s</string>
+    <string name="e2ee_info_no_pq"><![CDATA[הודעות, קבצים ושיחות מוגנים על ידי <b>הצפנה מקצה לקצה</b> עם סודיות קדימה מושלמת, הכחשה ושחזור לאחר פריצה.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[הודעות, קבצים ושיחות מוגנים על ידי <b>הצפנה מקצה לקצה עמידה בפני מחשוב קוונטי</b> עם סודיות קדימה מושלמת, הכחשה ושחזור לאחר פריצה.]]></string>
+    <string name="migrate_from_another_device">העבר ממכשיר אחר</string>
+    <string name="migrate_to_device_title">העבר לכאן</string>
+    <string name="remote_host_error_busy"><![CDATA[הנייד <b>%s</b> תפוס]]></string>
+    <string name="multicast_discoverable_via_local_network">ניתן לגילוי דרך רשת מקומית</string>
+    <string name="camera_not_available">מצלמה לא זמינה</string>
+    <string name="no_connected_mobile">אין מכשיר נייד מחובר</string>
+    <string name="paste_archive_link">הדבק לינק ארכיון</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">אנא אשר שהגדרות הרשת נכונות למכשיר זה.</string>
+    <string name="refresh_qr_code">רענון</string>
+    <string name="migrate_to_device_repeat_import">יבוא מחדש</string>
+    <string name="v5_6_safer_groups">קבוצות בטוחות יותר</string>
+    <string name="verify_connection">אימות חיבור</string>
+    <string name="open_port_in_firewall_desc">כדי לאפשר לאפליקציה במכשיר הנייד להתחבר למחשב השולחני, פתח את הפורט הזה בחומת האש שלך, אם היא מופעלת</string>
+    <string name="connect_plan_you_have_already_requested_connection_via_this_address">כבר ביקשת להתחבר באמצעות כתובת זו!</string>
+    <string name="rcv_group_event_member_unblocked">ביטלת חסימה של %s</string>
+    <string name="unblock_member_button">בטל חסימה של משתתף</string>
+    <string name="unblock_member_question">האם לבטל חסימה עבור משתתף?</string>
+    <string name="migrate_from_device_upload_failed">העלאה נכשלה</string>
+    <string name="v5_6_picture_in_picture_calls_descr">השתמש באפליקציה במהלך השיחה.</string>
+    <string name="show_internal_errors">הצג שגיאות פנימיות</string>
+    <string name="enable_sending_recent_history">שלח עד 100 הודעות אחרונות לחברים חדשים.</string>
+    <string name="disable_sending_recent_history">אל תשלח היסטוריה לחברים חדשים.</string>
+    <string name="recent_history_is_sent_to_new_members">עד 100 ההודעות האחרונות נשלחות לחברים חדשים.</string>
+    <string name="session_code">קוד סשן</string>
+    <string name="remote_host_error_disconnected"><![CDATA[מכשיר נייד <b>%s</b> התנתק]]></string>
+    <string name="remote_host_error_bad_state"><![CDATA[החיבור לנייד <b>%s</b> נמצא במצב לקוי]]></string>
+    <string name="remote_host_error_bad_version"><![CDATA[הנייד <b>%s</b> משתמש בגרסה שאינה נתמכת. אנא, ודא שאתה משתמש באותה גרסה על שני המכשירים]]></string>
+    <string name="failed_to_create_user_invalid_title">שם תצוגה לא חוקי!</string>
+    <string name="search_or_paste_simplex_link">חפש או הדבק קישור של SimpleX</string>
+    <string name="verify_code_on_mobile">אמת קוד במכשיר הנייד</string>
+    <string name="remote_ctrl_was_disconnected_title">החיבור עצר</string>
+    <string name="non_content_uri_alert_title">נתיב קובץ לא חוקי</string>
+    <string name="non_content_uri_alert_text">שיתפת נתיב קובץ לא חוקי. דווח על הבעיה למפתחי האפליקציה.</string>
+    <string name="moderated_items_description">%1$d הודעות שנערכו על ידי %2$s</string>
+    <string name="marked_deleted_items_description">%d הודעות סומנו כנמחקות</string>
+    <string name="connect_plan_repeat_connection_request">האם לחזור על בקשת החיבור?</string>
+    <string name="blocked_item_description">חסום</string>
+    <string name="blocked_items_description">%d הודעות נחסמו</string>
+    <string name="loading_remote_file_desc">אנא המתן בזמן שהקובץ נטען מהמכשיר הנייד המקושר</string>
+    <string name="button_remove_member_question">האם להסיר משתתף?</string>
+    <string name="disconnect_remote_host">מנותק</string>
+    <string name="disconnect_desktop_question">האם לנתק את המחשב השולחני?</string>
+    <string name="disconnect_remote_hosts">נתק מכשירי נייד</string>
+    <string name="only_one_device_can_work_at_the_same_time">רק מכשיר אחד יכול לעבוד בו זמנית.</string>
+    <string name="waiting_for_desktop">ממתין למחשב השולחני…</string>
+    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[פתח <i>שימוש ממחשב שולחני</i> באפליקציה בנייד וסרוק קוד QR.]]></string>
+    <string name="database_migration_in_progress">העברת מסד הנתונים בתהליך.
+\nזה עשוי לקחת כמה דקות.</string>
+    <string name="blocked_by_admin_items_description">%d הודעות נחסמו על ידי מנהל</string>
+    <string name="app_was_crashed">מסך קרס</string>
+    <string name="video_decoding_exception_desc">לא ניתן לפענח את הווידאו. אנא נסה וידאו אחר או צור קשר עם המפתחים.</string>
+    <string name="share_this_1_time_link">שתף את הקישור הזמנה החד-פעמי הזה</string>
+    <string name="tap_to_paste_link">לחץ להדבקת קישור</string>
+    <string name="loading_remote_file_title">טעינה של הקובץ</string>
+    <string name="settings_section_title_use_from_desktop">שימוש ממחשב שולחני</string>
+    <string name="rcv_group_event_member_blocked">חסומים %s</string>
+    <string name="rcv_direct_event_contact_deleted">מחק איש קשר</string>
+    <string name="rcv_group_events_count">%d אירועי קבוצה</string>
+    <string name="group_members_n">%s, %s ו-%d חברים</string>
+    <string name="profile_update_event_contact_name_changed">איש הקשר %1$s השתנה ל-%2$s</string>
+    <string name="profile_update_event_removed_address">כתובת איש קשר הוסרה</string>
+    <string name="profile_update_event_removed_picture">תמונת פרופיל הוסרה</string>
+    <string name="profile_update_event_set_new_picture">הגדר תמונת פרופיל חדשה</string>
+    <string name="profile_update_event_updated_profile">עדכן פרופיל</string>
+    <string name="group_member_status_unknown">מצב לא ידוע</string>
+    <string name="info_row_created_at">נוצר ב</string>
+    <string name="share_text_created_at">נוצר בתאריך: %s</string>
+    <string name="message_too_large">הודעה ארוכה מדי</string>
+    <string name="welcome_message_is_too_long">הודעת ברוכים הבאים ארוכה מדי</string>
+    <string name="connected_mobile">התחבר לנייד</string>
+    <string name="connected_to_desktop">התחבר למחשב השולחני</string>
+    <string name="connected_to_mobile">התחבר לנייד</string>
+    <string name="connecting_to_desktop">התחבר למחשב השולחני</string>
+    <string name="connect_to_desktop">חיבור למחשב השולחני</string>
+    <string name="desktop_app_version_is_incompatible">גרסת אפליקציית שולחן העבודה %s אינה תואמת לאפליקציה זו.</string>
+    <string name="devices">מכשירים</string>
+    <string name="error">שגיאה</string>
+    <string name="desktop_incompatible_version">גירסא לא מתאימה</string>
+    <string name="found_desktop">מצא מחשב שולחני</string>
+    <string name="new_mobile_device">מכשיר נייד חדש</string>
+    <string name="this_device_name">השם של המכשיר הזה</string>
+    <string name="multicast_connect_automatically">התחבר אוטומטית</string>
+    <string name="error_showing_message">שגיאה בהצגת הודעה</string>
+    <string name="error_showing_content">שגיאה בהצגת תוכן</string>
+    <string name="rcv_group_event_1_member_connected">%s מחובר</string>
+    <string name="block_member_confirmation">חסום</string>
+    <string name="block_member_button">חסום משתתף</string>
+    <string name="block_member_question">לחסום משתתף?</string>
+    <string name="unblock_member_desc">הודעות מ-%s יוצגו!</string>
+    <string name="create_group_button">צור קבוצה</string>
+    <string name="this_device">המכשיר הזה</string>
+    <string name="v5_4_more_things_descr">- אפשרות להודיע לאנשי קשר שנמחקו.
+\n- שמות פרופיל עם רווחים.
+\n- ועוד!</string>
+    <string name="v5_4_block_group_members_descr">כדי להסתיר הודעות לא רצויות.</string>
+    <string name="v5_4_block_group_members">תחסום חברים בקבוצה</string>
+    <string name="desktop_device">מחשב שולחני</string>
+    <string name="desktop_address">כתובת של המחשב השולחני</string>
+    <string name="paste_desktop_address">הדבק כתובת של המחשב שולחני</string>
+    <string name="scan_qr_code_from_desktop">סרוק קוד QR מהמחשב השולחני</string>
+    <string name="connect_plan_connect_to_yourself">להתחבר אל עצמך?</string>
+    <string name="verify_connections">אימות חיבורים</string>
+    <string name="discover_on_network">גלה דרך רשת מקומית</string>
+    <string name="linked_desktop_options">האפשרויות של המחשב השולחני מקושרות</string>
+    <string name="desktop_devices">מחשבים שולחניים</string>
+    <string name="connect_plan_you_are_already_connecting_via_this_one_time_link">אתה כבר מתחבר באמצעות קישור חד-פעמי זה!</string>
+    <string name="connect_plan_open_group">פתח קבוצה</string>
+    <string name="connect_plan_you_are_already_in_group_vName"><![CDATA[אתה כבר בקבוצה <b>%1$s</b>.]]></string>
+    <string name="connect_plan_repeat_join_request">האם לחזור על בקשת הצטרפות?</string>
+    <string name="bad_desktop_address">הכתובת של המחשב השולחני שגויה</string>
+    <string name="remote_host_was_disconnected_toast"><![CDATA[מכשיר נייד <b>%s</b> התנתק]]></string>
+    <string name="this_device_name_shared_with_mobile">שם המכשיר ישותף עם מכשיר הנייד המחובר.</string>
+    <string name="enter_this_device_name">הזן את שם המכשיר הזה…</string>
+    <string name="possible_slow_function_desc">ביצוע הפונקציה לוקח זמן רב מדי: %1$d שניות: %2$s</string>
+    <string name="possible_slow_function_title">פונקציה איטית</string>
+    <string name="desktop_connection_terminated">החיבור הופסק</string>
+    <string name="remote_ctrl_disconnected_with_reason">נותק מהסיבה: %s</string>
+    <string name="waiting_for_mobile_to_connect">ממתין לחיבור עם מכשיר נייד:</string>
+    <string name="create_chat_profile">צור פרופיל צאט</string>
+    <string name="connect_plan_already_joining_the_group">כבר הצטרפת לקבוצה!</string>
+    <string name="connect_plan_you_are_already_joining_the_group_vName"><![CDATA[אתה כבר מצטרף לקבוצה <b>%1$s</b>.]]></string>
+    <string name="remove_member_button">הסר משתתף</string>
+    <string name="remote_ctrl_error_timeout">הסתיים פסק הזמן הקצוב להתחברות למחשב השולחני</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
index 7ab087612b..7bc282de3a 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml
@@ -191,7 +191,7 @@
     <string name="v4_3_improved_server_configuration">サーバ設定の向上</string>
     <string name="v4_3_improved_privacy_and_security">プライバシーとセキュリティ強化</string>
     <string name="settings_section_title_incognito">シークレットモード</string>
-    <string name="new_in_version">%s バージョンアップで新しい</string>
+    <string name="new_in_version">%s の新機能</string>
     <string name="new_passphrase">新しい暗証フレーズ</string>
     <string name="chat_item_ttl_none">一度も</string>
     <string name="notification_preview_new_message">新しいメッセージ</string>
@@ -838,7 +838,7 @@
     <string name="you_are_invited_to_group">グループ招待が届きました</string>
     <string name="network_option_seconds_label">秒</string>
     <string name="network_option_tcp_connection_timeout">TCP接続タイムアウト</string>
-    <string name="save_group_profile">保存グループのプロフィール</string>
+    <string name="save_group_profile">グループプロフィールの保存</string>
     <string name="v4_3_irreversible_message_deletion_desc">連絡先がメッセージの完全削除を許可できます。</string>
     <string name="failed_to_create_user_duplicate_desc">同じ表示名前のチャットプロフィールが既にあります。別のを選んでください。</string>
     <string name="smp_server_test_secure_queue">セキュアな未送信メッセージ</string>
@@ -1593,4 +1593,127 @@
     <string name="possible_slow_function_title">遅延が発生した機能</string>
     <string name="show_slow_api_calls">遅いAPIコールを表示</string>
     <string name="group_member_status_unknown">ステータス不明</string>
+    <string name="v5_5_private_notes">プライベートノート</string>
+    <string name="v5_5_message_delivery">メッセージ配信の改善</string>
+    <string name="e2ee_info_no_pq"><![CDATA[メッセージ、ファイル、通話は、前方秘匿性、否認防止および及び侵入復元性を備えた <b>エンドツーエンドの暗号化</b>によって保護されます。]]></string>
+    <string name="e2ee_info_pq"><![CDATA[メッセージ、ファイル、通話は、前方秘匿性、否認防止および及び侵入復元性を備えた <b>耐量子E2E暗号化</b>によって保護されます。]]></string>
+    <string name="e2ee_info_no_pq_short">このチャットはエンドツーエンド暗号化により保護されています。</string>
+    <string name="e2ee_info_pq_short">このチャットは耐量子エンドツーエンド暗号化により保護されています。</string>
+    <string name="note_folder_local_display_name">プライベートノート</string>
+    <string name="call_service_notification_end_call">通話終了</string>
+    <string name="unable_to_open_browser_title">ブラウザ起動エラー</string>
+    <string name="migrate_from_another_device">別の端末から移行</string>
+    <string name="set_passphrase">暗証フレーズを設定</string>
+    <string name="snd_group_event_member_blocked">%s をブロック済</string>
+    <string name="member_blocked_by_admin">管理者によりブロック済</string>
+    <string name="v5_5_private_notes_descr">暗号化されたファイルとメディア</string>
+    <string name="v5_5_simpler_connect_ui">リンクの貼り付けで接続する！</string>
+    <string name="v5_5_simpler_connect_ui_descr">検索バーに招待リンクを貼り付けて接続。</string>
+    <string name="v5_6_quantum_resistant_encryption">耐量子暗号化チャット</string>
+    <string name="v5_6_picture_in_picture_calls">ピクチャー イン ピクチャー 通話</string>
+    <string name="v5_6_app_data_migration_descr">QRコードを利用して別のデバイスに移行できます。</string>
+    <string name="v5_6_safer_groups">より安全なグループ</string>
+    <string name="migrate_to_device_title">ここから移行</string>
+    <string name="migrate_to_device_migrating">移行中</string>
+    <string name="migrate_to_device_database_init">ダウンロードの準備中</string>
+    <string name="invalid_file_link">無効なリンク</string>
+    <string name="migrate_to_device_download_failed">ダウンロード失敗</string>
+    <string name="migrate_to_device_repeat_download">再ダウンロード</string>
+    <string name="migrate_to_device_try_again">もう一度お試し下さい。</string>
+    <string name="migrate_to_device_bytes_downloaded">%s ダウンロード済</string>
+    <string name="migrate_to_device_importing_archive">アーカイブをインポート中</string>
+    <string name="migrate_to_device_import_failed">インポート失敗</string>
+    <string name="migrate_to_device_chat_migrated">チャット移行済み！</string>
+    <string name="migrate_to_device_finalize_migration">別のデバイスで移行を確定してください。</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">ファイルが削除されているか、リンクが無効です</string>
+    <string name="migrate_to_device_error_downloading_archive">アーカイブダウンロードエラー</string>
+    <string name="migrate_to_device_apply_onion">適用</string>
+    <string name="migrate_from_device_title">端末の移行</string>
+    <string name="migrate_from_device_to_another_device">別の端末に移行</string>
+    <string name="migrate_from_device_error_saving_settings">設定保存エラー</string>
+    <string name="migrate_from_device_error_exporting_archive">チャットデータベースエクスポートエラー</string>
+    <string name="migrate_from_device_database_init">アップロード準備中</string>
+    <string name="migrate_from_device_error_deleting_database">データベース削除エラー</string>
+    <string name="migrate_from_device_error_uploading_archive">アーカイブアップロードエラー</string>
+    <string name="migrate_from_device_chat_should_be_stopped">続けるには、チャットを停止する必要があります。</string>
+    <string name="migrate_from_device_archive_and_upload">アーカイブとアップロード</string>
+    <string name="migrate_from_device_confirm_upload">アップロードの確認</string>
+    <string name="migrate_from_device_bytes_uploaded">%s アップロード中</string>
+    <string name="migrate_from_device_upload_failed">アップロード失敗</string>
+    <string name="migrate_from_device_archiving_database">データベースをアーカイブ中</string>
+    <string name="migrate_from_device_uploading_archive">アーカイブのアップロード中</string>
+    <string name="migrate_from_device_cancel_migration">移行の中止</string>
+    <string name="migrate_from_device_finalize_migration">移行の確定</string>
+    <string name="migrate_from_device_creating_archive_link">アーカイブリンクの作成中</string>
+    <string name="migrate_from_device_delete_database_from_device">この端末からデータベースを削除</string>
+    <string name="migrate_from_device_or_share_this_file_link">ファイルリンクで安全に共有する</string>
+    <string name="migrate_from_device_migration_complete">移行完了</string>
+    <string name="migrate_from_device_start_chat">チャット開始</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[2つの端末上で同じデータベースを使用することは<b>できません</b>。]]></string>
+    <string name="migrate_from_device_verify_passphrase">パスフレーズの検証</string>
+    <string name="migrate_from_device_verify_database_passphrase">データベースパスフレーズの検証</string>
+    <string name="migrate_from_device_check_connection_and_try_again">インターネット接続を確認して再試行してください</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">移行するデータベースのパスフレーズを覚えていることを確認して下さい。</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>警告</b>: アーカイブデータは削除されます。]]></string>
+    <string name="migrate_from_device_error_verifying_passphrase">パスフレーズ検証エラー:</string>
+    <string name="error_deleting_note_folder">プライベートノート削除エラー</string>
+    <string name="share_text_created_at">送信日: %s</string>
+    <string name="block_for_all">全てをブロック</string>
+    <string name="block_for_all_question">このメンバーをブロックしますか？</string>
+    <string name="member_info_member_blocked">ブロック中</string>
+    <string name="v5_5_join_group_conversation">グループ会話への参加</string>
+    <string name="call_service_notification_audio_call">音声通話</string>
+    <string name="call_service_notification_video_call">ビデオ通話</string>
+    <string name="blocked_by_admin_item_description">管理者によりブロック済</string>
+    <string name="v5_6_app_data_migration">アプリデータの移行</string>
+    <string name="v5_6_safer_groups_descr">グループ管理者は、他のすべてのメンバーに対してメンバーをブロックできます。</string>
+    <string name="v5_6_picture_in_picture_calls_descr">通話中にアプリが利用できます。</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">ダイレクトチャットで有効にする（ベータ版）！</string>
+    <string name="welcome_message_is_too_long">ウェルカムメッセージが長すぎます</string>
+    <string name="clear_note_folder_warning">全てのメッセージが削除されます - これは元に戻せません！</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[新しい端末で<i>別の端末に移行</i>を選択し、QRコードをスキャンします。]]></string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">すべての連絡先、会話、ファイルは安全に暗号化され、設定されたXFTPリレーに分割でアップロードされます。</string>
+    <string name="unblock_for_all">ブロックの解除</string>
+    <string name="unblock_for_all_question">ブロックを解除しますか？</string>
+    <string name="blocked_by_admin_items_description">%d のメッセージが管理者によりブロック済</string>
+    <string name="snd_group_event_member_unblocked">%s のブロックを解除</string>
+    <string name="migrate_to_device_enter_passphrase">パスフレーズの入力</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">エクスポートされたファイルが存在しません</string>
+    <string name="info_row_created_at">送信日</string>
+    <string name="message_too_large">メッセージが長すぎます</string>
+    <string name="database_migration_in_progress">データベース移行の進行中。
+\nこれには数分掛かる場合があります。</string>
+    <string name="clear_note_folder_question">プライベートノートを消しますか？</string>
+    <string name="v5_5_new_interface_languages">ハンガリー語、トルコ語</string>
+    <string name="v5_5_message_delivery_descr">バッテリー使用量低減</string>
+    <string name="v5_5_join_group_conversation_descr">最近のメッセージ履歴送信機能追加とディレクトリボットの改善が行われました。</string>
+    <string name="migrate_to_device_downloading_details">リンクの詳細をダウンロード中</string>
+    <string name="migrate_to_device_downloading_archive">アーカイブをダウンロード中</string>
+    <string name="error_creating_message">メッセージ作成エラー</string>
+    <string name="rcv_group_event_member_unblocked">%s のブロックを解除</string>
+    <string name="profile_update_event_removed_address">アドレスが削除されました</string>
+    <string name="or_paste_archive_link">アーカイブリンクを貼り付け</string>
+    <string name="paste_archive_link">アーカイブリンクの貼り付け</string>
+    <string name="migrate_to_device_repeat_import">再インポート</string>
+    <string name="migrate_from_device_try_again">もう一度お試し下さい。</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">警告：複数端末でのチャット利用はサポートされていません。</string>
+    <string name="profile_update_event_set_new_address">新しいアドレスが設定されました</string>
+    <string name="error_blocking_member_for_all">メンバーブロックエラー</string>
+    <string name="rcv_group_event_member_blocked">%s をブロック済</string>
+    <string name="conn_event_disabled_pq">標準的のエンドツーエンド暗号化</string>
+    <string name="conn_event_enabled_pq">耐量子エンドツーエンド暗号化</string>
+    <string name="migrate_from_device_repeat_upload">再アップロード</string>
+    <string name="profile_update_event_contact_name_changed">連絡先 %1$s が %2$s に変更されました</string>
+    <string name="profile_update_event_set_new_picture">新しいプロフィール画像が設定されました</string>
+    <string name="profile_update_event_removed_picture">プロフィール画像が削除されました</string>
+    <string name="auth_open_migration_to_another_device">移行画面を開く</string>
+    <string name="unable_to_open_browser_desc">通話には既定のウェブブラウザが必要です。既定のブラウザを設定し、開発者へ情報を共有してください。</string>
+    <string name="profile_update_event_updated_profile">プロフィール更新済</string>
+    <string name="profile_update_event_member_name_changed">メンバーの %1$sが %2$sに名前変更済</string>
+    <string name="migrate_to_device_confirm_network_settings">ネットワーク設定を確認してください</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">この端末のネットワーク設定が正しいことを確認してください。</string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>注意</b>: 2つの端末で同じデータベースを使用すると、セキュリティ保護として、あなたが接続しているメッセージの復号化が解除されます。]]></string>
+    <string name="saved_message_title">メッセージ保存済</string>
+    <string name="migrate_from_device_stopping_chat">チャット停止中</string>
+    <string name="error_showing_desktop_notification">エラーが表示された場合は、開発者に連絡してください。</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
index b9f94d9db4..ecfaf72a18 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
@@ -595,7 +595,7 @@
     <string name="feature_offered_item">voorgesteld %s</string>
     <string name="store_passphrase_securely_without_recover">Sla het wachtwoord veilig op. Als u deze kwijtraakt, heeft u GEEN toegang tot de gesprekken.</string>
     <string name="store_passphrase_securely">Bewaar het wachtwoord veilig, u kunt deze NIET wijzigen als u deze kwijtraakt.</string>
-    <string name="open_chat">Gesprekken openen</string>
+    <string name="open_chat">Chat openen</string>
     <string name="restore_database_alert_desc">Voer het vorige wachtwoord in na het herstellen van de database back-up. Deze actie kan niet ongedaan gemaakt worden.</string>
     <string name="icon_descr_call_pending_sent">Oproep in behandeling</string>
     <string name="simplex_link_mode_browser_warning">Het openen van de link in de browser kan de privacy en beveiliging van de verbinding verminderen. Niet vertrouwde SimpleX links worden rood weergegeven.</string>
@@ -1713,4 +1713,5 @@
     <string name="migrate_to_device_bytes_downloaded">%s gedownload</string>
     <string name="set_passphrase">Wachtwoord instellen</string>
     <string name="e2ee_info_pq_short">Deze chat wordt beschermd door quantum bestendige end-to-end codering.</string>
+    <string name="error_showing_desktop_notification">Fout bij weergeven van melding. Neem contact op met ontwikkelaars.</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
index 438d6832c9..7889ef396e 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/pt/strings.xml
@@ -376,7 +376,7 @@
     <string name="invalid_connection_link">Ligação de conexão inválida</string>
     <string name="save_verb">Salvar</string>
     <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Se você recebeu convite de ligação do SimpleX Chat, você pode abri-lo no seu navegador:</string>
-    <string name="group_invitation_tap_to_join_incognito">Toque para entrar em modo anónimo</string>
+    <string name="group_invitation_tap_to_join_incognito">Toque para entrar no modo anônimo</string>
     <string name="save_passphrase_in_keychain">Salvar senha na Keystore</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel"><![CDATA[Se não se poderem encontrar pessoalmente, <b>mostre o código QR na chamada de vídeo </b> ou partilhe a ligação.]]></string>
     <string name="save_auto_accept_settings">Salvar definições de aceitação automática</string>
@@ -733,4 +733,51 @@
     <string name="feature_enabled_for_you">activado para si</string>
     <string name="search_verb">Pesquisar</string>
     <string name="la_mode_off">Desativado</string>
+    <string name="error_smp_test_failed_at_step">O teste falhou na etapa %s.</string>
+    <string name="smp_servers">Servidor SMP</string>
+    <string name="smp_servers_test_server">Servidor de teste</string>
+    <string name="chat_item_ttl_seconds">%s segundo(s)</string>
+    <string name="stop_chat_question">Parar conversa?</string>
+    <string name="theme_system">Sistema</string>
+    <string name="v4_6_audio_video_calls_descr">Suporte a bluetooth e outras melhorias.</string>
+    <string name="migrate_from_device_stopping_chat">Parando a conversa</string>
+    <string name="migrate_from_device_bytes_uploaded">%s enviado</string>
+    <string name="migrate_from_device_start_chat">Iniciar conversa</string>
+    <string name="tap_to_paste_link">Toque para colar o link</string>
+    <string name="stop_sharing_address">Parar de compartilhar o endereço?</string>
+    <string name="callstate_starting">iniciando…</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Pare a conversa para exportar, importar ou excluir o banco de dados de conversa. Você não poderá receber e enviar mensagens enquanto a conversa for interrompida.</string>
+    <string name="rcv_group_event_n_members_connected">%s, %s e %d outros membros conectados</string>
+    <string name="start_chat_question">Iniciar conversa?</string>
+    <string name="notifications_mode_periodic">Começa periodicamente</string>
+    <string name="tap_to_start_new_chat">Toque para iniciar uma nova conversa</string>
+    <string name="la_lock_mode_system">Sistema de autenticação</string>
+    <string name="stop_rcv_file__title">Parar de receber o arquivo?</string>
+    <string name="smp_servers_test_servers">Servidores de teste</string>
+    <string name="smp_servers_test_some_failed">Alguns servidores falharam no teste:</string>
+    <string name="stop_sharing">Parar compartilhamento</string>
+    <string name="alert_title_skipped_messages">Mensagens ignoradas</string>
+    <string name="receipts_section_groups">Grupos pequeno (máx. 20)</string>
+    <string name="non_fatal_errors_occured_during_import">Alguns erros não fatais ocorreram durante a importação - você pode ver o console de conversa para obter mais detalhes.</string>
+    <string name="conn_event_disabled_pq">encriptação end-to-end padrão</string>
+    <string name="chat_help_tap_button">Toque no botão</string>
+    <string name="tap_to_activate_profile">Toque para ativar o perfil.</string>
+    <string name="stop_snd_file__title">Parar de enviar o arquivo?</string>
+    <string name="v4_4_french_interface_descr">Obrigado aos usuários – contribuam via Weblate!</string>
+    <string name="stop_file__confirm">Pare</string>
+    <string name="stop_chat_confirmation">Pare</string>
+    <string name="icon_descr_call_rejected">Chamada rejeitada</string>
+    <string name="stop_file__action">Parar arquivo</string>
+    <string name="contact_tap_to_connect">Toque para Conectar</string>
+    <string name="group_members_n">%s, %s e %d membros</string>
+    <string name="add_contact_or_create_group">Iniciar nova conversa</string>
+    <string name="la_mode_system">Sistema</string>
+    <string name="stop_chat_to_enable_database_actions">Parar conversa para habilitar ações do banco de dados</string>
+    <string name="group_invitation_tap_to_join">Toque para participar</string>
+    <string name="rcv_group_event_3_members_connected">%s, %s e %s conectado</string>
+    <string name="network_option_tcp_connection_timeout">Tempo esgotado da conexão TCP</string>
+    <string name="language_system">Sistema</string>
+    <string name="auth_stop_chat">Parar conversa</string>
+    <string name="v4_5_italian_interface_descr">Obrigado aos usuários – contribuam via Weblate!</string>
+    <string name="possible_slow_function_title">Função lenta</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
index 9d7bfe4ca0..f855bb040b 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
@@ -343,7 +343,7 @@
     <string name="your_settings">Настройки</string>
     <string name="your_simplex_contact_address">Ваш SimpleX адрес</string>
     <string name="database_passphrase_and_export">База данных</string>
-    <string name="about_simplex_chat">Информация о SimpleX Chat</string>
+    <string name="about_simplex_chat">Подробнее о SimpleX Chat</string>
     <string name="how_to_use_simplex_chat">Как использовать</string>
     <string name="markdown_help">Форматирование сообщений</string>
     <string name="markdown_in_messages">Форматирование сообщений</string>
@@ -768,7 +768,7 @@
     <string name="invite_prohibited_description">Вы пытаетесь пригласить инкогнито контакт в группу, где Вы используете свой основной профиль</string>
     <!-- GroupChatInfoView.kt -->
     <string name="button_add_members">Пригласить членов группы</string>
-    <string name="group_info_section_title_num_members">ЧЛЕНОВ ГРУППЫ: %1$s</string>
+    <string name="group_info_section_title_num_members">УЧАСТНИКОВ ГРУППЫ: %1$s</string>
     <string name="group_info_member_you">Вы: %1$s</string>
     <string name="button_delete_group">Удалить группу</string>
     <string name="delete_group_question">Удалить группу?</string>
@@ -1337,7 +1337,7 @@
     <string name="snd_conn_event_ratchet_sync_ok">шифрование работает для %s</string>
     <string name="snd_conn_event_ratchet_sync_required">требуется новое соглашение о шифровании для %s</string>
     <string name="abort_switch_receiving_address_desc">Изменение адреса будет прекращено. Будет использоваться старый адрес.</string>
-    <string name="abort_switch_receiving_address">Прекратить изменение адреса</string>
+    <string name="abort_switch_receiving_address">Остановить изменение адреса</string>
     <string name="receipts_section_contacts">Контакты</string>
     <string name="receipts_contacts_disable_keep_overrides">Выключить (кроме исключений)</string>
     <string name="conn_event_ratchet_sync_started">шифрование согласовывается…</string>
@@ -1359,7 +1359,7 @@
     <string name="you_can_enable_delivery_receipts_later_alert">Вы можете включить их позже в настройках Конфиденциальности.</string>
     <string name="error_aborting_address_change">Ошибка при прекращении изменения адреса</string>
     <string name="abort_switch_receiving_address_confirm">Прекратить</string>
-    <string name="abort_switch_receiving_address_question">Прекратить изменение адреса\?</string>
+    <string name="abort_switch_receiving_address_question">Остановить изменение адреса?</string>
     <string name="unfavorite_chat">Не избранный</string>
     <string name="shutdown_alert_desc">Нотификации перестанут работать, пока вы не перезапустите приложение</string>
     <string name="network_option_protocol_timeout_per_kb">Таймаут протокола на KB</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
index 8aebe017ec..948f91b89a 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/uk/strings.xml
@@ -595,7 +595,7 @@
     <string name="video_descr">Відео</string>
     <string name="contact_sent_large_file">Ваш контакт відправив файл, розмір якого більший, ніж поточно підтримуваний максимальний розмір (%1$s).</string>
     <string name="maximum_supported_file_size">Поточно максимально підтримуваний розмір файлу - %1$s.</string>
-    <string name="switch_receiving_address_desc">Адреса для отримання буде змінена на інший сервер. Зміна адреси завершиться після включення відправника.</string>
+    <string name="switch_receiving_address_desc">Адреса отримувача буде змінена на інший сервер. Зміна адреси завершиться після того, як відправник з\'явиться в мережі.</string>
     <string name="verify_security_code">Перевірити код безпеки</string>
     <string name="icon_descr_send_message">Надіслати повідомлення</string>
     <string name="icon_descr_record_voice_message">Записати голосове повідомлення</string>
@@ -1637,4 +1637,80 @@
     <string name="call_service_notification_audio_call">Аудіодзвінок</string>
     <string name="unable_to_open_browser_title">Помилка відкриття браузера</string>
     <string name="unable_to_open_browser_desc">Для використання дзвінків потрібен браузер за замовчуванням. Будь ласка, налаштуйте браузер за замовчуванням в системі та надайте більше інформації розробникам.</string>
+    <string name="migrate_from_another_device">Перехід з іншого пристрою</string>
+    <string name="conn_event_enabled_pq">квантово-стійке шифрування e2e</string>
+    <string name="conn_event_disabled_pq">стандартне наскрізне шифрування</string>
+    <string name="e2ee_info_no_pq_short">Цей чат захищений наскрізним шифруванням.</string>
+    <string name="e2ee_info_pq_short">Цей чат захищений квантово-стійким наскрізним шифруванням.</string>
+    <string name="v5_6_safer_groups_descr">Адміністратори можуть заблокувати користувача для всіх.</string>
+    <string name="v5_6_app_data_migration">Міграція даних додатків</string>
+    <string name="v5_6_app_data_migration_descr">Перейдіть на інший пристрій за допомогою QR-коду.</string>
+    <string name="v5_6_picture_in_picture_calls">Дзвінки картинка в картинці</string>
+    <string name="v5_6_quantum_resistant_encryption">Квантово-стійке шифрування</string>
+    <string name="v5_6_safer_groups">Безпечніші групи</string>
+    <string name="invalid_file_link">Невірне посилання</string>
+    <string name="migrate_to_device_title">Мігруйте сюди</string>
+    <string name="migrate_to_device_migrating">Міграція</string>
+    <string name="or_paste_archive_link">Або вставте посилання на архів</string>
+    <string name="paste_archive_link">Вставити посилання на архів</string>
+    <string name="migrate_to_device_download_failed">Не вдалося завантажити</string>
+    <string name="migrate_to_device_downloading_details">Деталі посилання для завантаження</string>
+    <string name="migrate_to_device_database_init">Підготовка до завантаження</string>
+    <string name="migrate_to_device_repeat_download">Повторити завантаження</string>
+    <string name="migrate_to_device_bytes_downloaded">%s завантажено</string>
+    <string name="migrate_to_device_enter_passphrase">Введіть парольну фразу</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">Файл було видалено або посилання недійсне</string>
+    <string name="migrate_to_device_import_failed">Не вдалося імпортувати</string>
+    <string name="migrate_to_device_importing_archive">Імпорт архіву</string>
+    <string name="migrate_to_device_repeat_import">Повторний імпорт</string>
+    <string name="migrate_to_device_finalize_migration">Завершіть міграцію на іншому пристрої.</string>
+    <string name="migrate_to_device_apply_onion">Подати заявку</string>
+    <string name="migrate_from_device_title">Перенести пристрій</string>
+    <string name="migrate_from_device_to_another_device">Перехід на інший пристрій</string>
+    <string name="migrate_from_device_error_exporting_archive">Помилка експорту бази даних чату</string>
+    <string name="migrate_from_device_error_saving_settings">Налаштування збереження помилок</string>
+    <string name="migrate_from_device_error_uploading_archive">Помилка завантаження архіву</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">Експортований файл не існує</string>
+    <string name="migrate_from_device_archive_and_upload">Архівування та завантаження</string>
+    <string name="migrate_from_device_archiving_database">Архівування бази даних</string>
+    <string name="migrate_from_device_confirm_upload">Підтвердити завантаження</string>
+    <string name="migrate_from_device_error_deleting_database">Помилка видалення бази даних</string>
+    <string name="migrate_from_device_chat_should_be_stopped">Для того, щоб продовжити, чат слід зупинити.</string>
+    <string name="migrate_from_device_stopping_chat">Зупинка чату</string>
+    <string name="migrate_from_device_bytes_uploaded">%s завантажено</string>
+    <string name="migrate_from_device_uploading_archive">Завантаження архіву</string>
+    <string name="migrate_from_device_creating_archive_link">Створення архівного посилання</string>
+    <string name="migrate_from_device_delete_database_from_device">Видалити базу даних з цього пристрою</string>
+    <string name="migrate_from_device_finalize_migration">Завершити міграцію</string>
+    <string name="migrate_from_device_or_share_this_file_link">Або безпечно поділіться цим посиланням на файл</string>
+    <string name="migrate_from_device_repeat_upload">Повторити завантаження</string>
+    <string name="migrate_from_device_try_again">Ви можете спробувати ще раз.</string>
+    <string name="migrate_from_device_start_chat">Почати чат</string>
+    <string name="migrate_from_device_starting_chat_on_multiple_devices_unsupported">Попередження: запуск чату на декількох пристроях не підтримується і може призвести до збоїв у доставці повідомлень</string>
+    <string name="migrate_from_device_migration_complete">Міграція завершена</string>
+    <string name="migrate_from_device_verify_database_passphrase">Перевірте пароль до бази даних</string>
+    <string name="migrate_from_device_you_must_not_start_database_on_two_device"><![CDATA[Ви <b>не повинні</b> використовувати одну і ту ж базу даних на двох пристроях.]]></string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>Warning</b>: архів буде видалено.]]></string>
+    <string name="migrate_from_device_check_connection_and_try_again">Перевірте підключення до Інтернету та спробуйте ще раз</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">Переконайтеся, що ви пам\'ятаєте пароль до бази даних для її перенесення.</string>
+    <string name="migrate_from_device_error_verifying_passphrase">Помилка при перевірці парольної фрази:</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Всі ваші контакти, розмови та файли будуть надійно зашифровані та завантажені частинами на налаштовані XFTP-реле.</string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>Please note</b>: використання однієї і тієї ж бази даних на двох пристроях порушить розшифровку повідомлень з ваших з\'єднань, як захист безпеки.]]></string>
+    <string name="migrate_from_device_cancel_migration">Скасувати міграцію</string>
+    <string name="migrate_to_device_chat_migrated">Чат перемістився!</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[Обирайте <i>Migrate from another device</i> на новому пристрої та відскануйте QR-код.]]></string>
+    <string name="migrate_to_device_confirm_network_settings">Підтвердьте налаштування мережі</string>
+    <string name="migrate_to_device_downloading_archive">Завантажити архів</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">Увімкнути в прямих чатах (BETA)!</string>
+    <string name="migrate_to_device_error_downloading_archive">Помилка завантаження архіву</string>
+    <string name="e2ee_info_no_pq"><![CDATA[Повідомлення, файли та дзвінки захищені <b>наскрізним шифруванням</b> з ідеальною секретністю переадресації, відмовою та відновленням після злому.]]></string>
+    <string name="e2ee_info_pq"><![CDATA[Повідомлення, файли та дзвінки захищені <b>квантово-стійким шифруванням e2e</b> з ідеальною прямою секретністю, відмовою та відновленням після злому.]]></string>
+    <string name="auth_open_migration_to_another_device">Відкрийте екран міграції</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">Переконайтеся, що налаштування мережі для цього пристрою є правильними.</string>
+    <string name="migrate_from_device_database_init">Підготовка до завантаження</string>
+    <string name="set_passphrase">Встановити парольну фразу</string>
+    <string name="migrate_from_device_upload_failed">Не вдалося завантажити</string>
+    <string name="v5_6_picture_in_picture_calls_descr">Використовуйте додаток під час розмови.</string>
+    <string name="migrate_from_device_verify_passphrase">Підтвердіть парольну фразу</string>
+    <string name="migrate_to_device_try_again">Ви можете спробувати ще раз.</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
index 693a261be1..d502c35e9e 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/vi/strings.xml
@@ -85,4 +85,15 @@
     <string name="rcv_group_and_other_events">và %d sự kiện khác</string>
     <string name="keychain_is_storing_securely">Android Keystore được sử dụng để lưu trữ passphrase - nó cho phép dịch vụ thông báo hoạt động.</string>
     <string name="keychain_allows_to_receive_ntfs">Android Keystore sẽ được sử dụng để lưu trữ passphrase một cách an toàn sau khi bạn khởi động lại ứng dụng hoặc thay đổi passphrase - nó cho phép tiếp nhận thông báo.</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">Tất cả các liên hệ, cuộc hội thoại và tệp của bạn sẽ được mã hóa an toàn và tải lên từng phần tới các XFTP relay được chỉ định.</string>
+    <string name="v5_6_safer_groups_descr">Quản trị viên có thể chặn một thành viên khỏi tất cả.</string>
+    <string name="empty_chat_profile_is_created">Một hồ sơ trống với tên chỉ định đã được tạo, và ứng dụng sẽ mở ra như bình thường.</string>
+    <string name="answer_call">Trả lời cuộc gọi</string>
+    <string name="connect__a_new_random_profile_will_be_shared">Một hồ sơ ngẫu nhiên mới sẽ được chia sẻ.</string>
+    <string name="notifications_mode_off_desc">Ứng dụng chỉ có thể nhận thông báo khi nó đang chạy, không có dịch vụ nền nào được khởi động</string>
+    <string name="app_version_code">Bản dựng ứng dụng: %s</string>
+    <string name="appearance_settings">Giao diện</string>
+    <string name="settings_section_title_app">ỨNG DỤNG</string>
+    <string name="v5_6_app_data_migration">Di chuyển dữ liệu ứng dụng</string>
+    <string name="full_backup">Sao lưu dữ liệu ứng dụng</string>
 </resources>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
index 44073aa990..7b7762eefc 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
@@ -21,6 +21,7 @@ import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.TerminalView
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import java.awt.event.WindowEvent
@@ -103,7 +104,7 @@ private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
   simplexWindowState.windowState = windowState
   // Reload all strings in all @Composable's after language change at runtime
   if (remember { ChatController.appPrefs.appLanguage.state }.value != "") {
-    Window(state = windowState, onCloseRequest = { closedByError.value = false; exitApplication() }, onKeyEvent = {
+    Window(state = windowState, icon = painterResource(MR.images.ic_simplex), onCloseRequest = { closedByError.value = false; exitApplication() }, onKeyEvent = {
       if (it.key == Key.Escape && it.type == KeyEventType.KeyUp) {
         simplexWindowState.backstack.lastOrNull()?.invoke() != null
       } else {
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/model/NtfManager.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/model/NtfManager.desktop.kt
index 3f2e1a74ab..3fab849361 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/model/NtfManager.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/model/NtfManager.desktop.kt
@@ -111,8 +111,12 @@ object NtfManager {
     }
     try {
       prevNtfs.add(chatId to builder.toast())
-    } catch (e: Exception) {
+    } catch (e: Throwable) {
       Log.e(TAG, e.stackTraceToString())
+      if (e !is Exception) {
+        val text = e.stackTraceToString().lines().getOrNull(0) ?: ""
+        showToast(generalGetString(MR.strings.error_showing_desktop_notification) + " " + text, 4_000)
+      }
     }
   }
 
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/AppCommon.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/AppCommon.desktop.kt
index 72aca181b3..71f862b30a 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/AppCommon.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/AppCommon.desktop.kt
@@ -32,9 +32,9 @@ fun initApp() {
   //testCrypto()
 }
 
-fun discoverVlcLibs(path: String) {
-  uk.co.caprica.vlcj.binding.LibC.INSTANCE.setenv("VLC_PLUGIN_PATH", path, 1)
-}
+//fun discoverVlcLibs(path: String) {
+//  uk.co.caprica.vlcj.binding.LibC.INSTANCE.setenv("VLC_PLUGIN_PATH", path, 1)
+//}
 
 private fun applyAppLocale() {
   val lang = ChatController.appPrefs.appLanguage.get()
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
index 94268002a6..358c20d769 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/ui/theme/Theme.desktop.kt
@@ -1,5 +1,6 @@
 package chat.simplex.common.ui.theme
 
+import androidx.compose.runtime.Composable
 import chat.simplex.common.platform.Log
 import chat.simplex.common.platform.TAG
 import com.jthemedetecor.OsThemeDetector
@@ -9,6 +10,7 @@ private val detector: OsThemeDetector = OsThemeDetector.getDetector()
     registerListener(::reactOnDarkThemeChanges)
   }
 
+@Composable
 actual fun isSystemInDarkTheme(): Boolean = try {
   detector.isDark
 }
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/CIVideoView.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/CIVideoView.desktop.kt
index 8dac39199f..2c063b5888 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/CIVideoView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/CIVideoView.desktop.kt
@@ -7,6 +7,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import chat.simplex.common.platform.*
+import chat.simplex.common.simplexWindowState
+import java.awt.Window
 
 @Composable
 actual fun PlayerView(player: VideoPlayer, width: Dp, onClick: () -> Unit, onLongClick: () -> Unit, stop: () -> Unit) {
@@ -23,14 +25,15 @@ actual fun PlayerView(player: VideoPlayer, width: Dp, onClick: () -> Unit, onLon
   }
 }
 
+/*
+* This function doesn't take into account multi-window environment. In case more windows will be used, modify the code
+* */
 @Composable
-actual fun LocalWindowWidth(): Dp {
-  return with(LocalDensity.current) { (java.awt.Window.getWindows().find { it.isActive }?.width ?: 0).toDp() }
-  /*val density = LocalDensity.current
-  var width by remember { mutableStateOf(with(density) { (java.awt.Window.getWindows().find { it.isActive }?.width ?: 0).toDp() }) }
-  SideEffect {
-    if (width != with(density) { (java.awt.Window.getWindows().find { it.isActive }?.width ?: 0).toDp() })
-      width = with(density) { (java.awt.Window.getWindows().find { it.isActive }?.width ?: 0).toDp() }
+actual fun LocalWindowWidth(): Dp = with(LocalDensity.current) {
+  val windows = java.awt.Window.getWindows()
+  if (windows.size == 1) {
+    (windows.getOrNull(0)?.width ?: 0).toDp()
+  } else {
+    simplexWindowState.windowState.size.width
   }
-  return width.also { println("LALAL $it") }*/
 }
diff --git a/apps/multiplatform/desktop/build.gradle.kts b/apps/multiplatform/desktop/build.gradle.kts
index 4f5536a25b..401c2938d5 100644
--- a/apps/multiplatform/desktop/build.gradle.kts
+++ b/apps/multiplatform/desktop/build.gradle.kts
@@ -12,16 +12,13 @@ version = extra["desktop.version_name"] as String
 
 
 kotlin {
-  jvm {
-    jvmToolchain(11)
-    withJava()
-  }
+  jvm()
   sourceSets {
     val jvmMain by getting {
       dependencies {
         implementation(project(":common"))
         implementation(compose.desktop.currentOs)
-        implementation("net.java.dev.jna:jna:5.13.0")
+        implementation("net.java.dev.jna:jna:5.14.0")
       }
     }
     val jvmTest by getting
@@ -151,7 +148,7 @@ cmake {
 tasks.named("clean") {
   dependsOn("cmakeClean")
 }
-tasks.named("compileJava") {
+tasks.named("compileKotlinJvm") {
   dependsOn("cmakeBuildAndCopy")
 }
 afterEvaluate {
diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties
index a3e9ef0990..9918dadee1 100644
--- a/apps/multiplatform/gradle.properties
+++ b/apps/multiplatform/gradle.properties
@@ -24,13 +24,14 @@ android.nonTransitiveRClass=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.jvm.target=11
 
-android.version_name=5.6
-android.version_code=191
+android.version_name=5.6.1
+android.version_code=193
 
-desktop.version_name=5.6
-desktop.version_code=35
+desktop.version_name=5.6.1
+desktop.version_code=36
 
-kotlin.version=1.8.20
-gradle.plugin.version=7.4.2
-compose.version=1.5.10
+kotlin.version=1.9.23
+gradle.plugin.version=8.2.0
+compose.version=1.6.1
diff --git a/apps/multiplatform/gradle/wrapper/gradle-wrapper.properties b/apps/multiplatform/gradle/wrapper/gradle-wrapper.properties
index 00c09d815c..4e4a6a3f29 100644
--- a/apps/multiplatform/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/multiplatform/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 14 14:23:51 GMT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/apps/simplex-chat/Main.hs b/apps/simplex-chat/Main.hs
index f47bd6c7c4..41321edc68 100644
--- a/apps/simplex-chat/Main.hs
+++ b/apps/simplex-chat/Main.hs
@@ -1,61 +1,8 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE NamedFieldPuns #-}
-
 module Main where
 
-import Control.Concurrent (forkIO, threadDelay)
-import Control.Concurrent.STM
-import Control.Monad
-import Data.Time.Clock (getCurrentTime)
-import Data.Time.LocalTime (getCurrentTimeZone)
-import Server
-import Simplex.Chat.Controller (ChatController (..), ChatResponse (..), currentRemoteHost, versionNumber, versionString)
-import Simplex.Chat.Core
-import Simplex.Chat.Options
-import Simplex.Chat.Terminal
-import Simplex.Chat.View (serializeChatResponse)
-import Simplex.Messaging.Client (NetworkConfig (..))
-import System.Directory (getAppUserDataDirectory)
-import System.Terminal (withTerminal)
+import Server (simplexChatServer)
+import Simplex.Chat.Terminal (terminalChatConfig)
+import Simplex.Chat.Terminal.Main (simplexChatCLI)
 
 main :: IO ()
-main = do
-  appDir <- getAppUserDataDirectory "simplex"
-  opts@ChatOpts {chatCmd, chatServerPort} <- getChatOpts appDir "simplex_v1"
-  if null chatCmd
-    then case chatServerPort of
-      Just chatPort -> simplexChatServer defaultChatServerConfig {chatPort} terminalChatConfig opts
-      _ -> runCLI opts
-    else simplexChatCore terminalChatConfig opts $ runCommand opts
-  where
-    runCLI opts = do
-      welcome opts
-      t <- withTerminal pure
-      simplexChatTerminal terminalChatConfig opts t
-    runCommand ChatOpts {chatCmd, chatCmdLog, chatCmdDelay} user cc = do
-      when (chatCmdLog /= CCLNone) . void . forkIO . forever $ do
-        (_, _, r') <- atomically . readTBQueue $ outputQ cc
-        case r' of
-          CRNewChatItem {} -> printResponse r'
-          _ -> when (chatCmdLog == CCLAll) $ printResponse r'
-      sendChatCmdStr cc chatCmd >>= printResponse
-      threadDelay $ chatCmdDelay * 1000000
-      where
-        printResponse r = do
-          ts <- getCurrentTime
-          tz <- getCurrentTimeZone
-          rh <- readTVarIO $ currentRemoteHost cc
-          putStrLn $ serializeChatResponse (rh, Just user) ts tz rh r
-
-welcome :: ChatOpts -> IO ()
-welcome ChatOpts {coreOptions = CoreChatOpts {dbFilePrefix, networkConfig}} =
-  mapM_
-    putStrLn
-    [ versionString versionNumber,
-      "db: " <> dbFilePrefix <> "_chat.db, " <> dbFilePrefix <> "_agent.db",
-      maybe
-        "direct network connection - use `/network` command or `-x` CLI option to connect via SOCKS5 at :9050"
-        (("using SOCKS5 proxy " <>) . show)
-        (socksProxy networkConfig),
-      "type \"/help\" or \"/h\" for usage info"
-    ]
+main = simplexChatCLI terminalChatConfig (Just simplexChatServer)
diff --git a/apps/simplex-chat/Server.hs b/apps/simplex-chat/Server.hs
index 3f4484eac6..58a167e4f5 100644
--- a/apps/simplex-chat/Server.hs
+++ b/apps/simplex-chat/Server.hs
@@ -28,9 +28,9 @@ import Simplex.Messaging.Util (raceAny_)
 import UnliftIO.Exception
 import UnliftIO.STM
 
-simplexChatServer :: ChatServerConfig -> ChatConfig -> ChatOpts -> IO ()
-simplexChatServer srvCfg cfg opts =
-  simplexChatCore cfg opts . const $ runChatServer srvCfg
+simplexChatServer :: ServiceName -> ChatConfig -> ChatOpts -> IO ()
+simplexChatServer chatPort cfg opts =
+  simplexChatCore cfg opts . const $ runChatServer defaultChatServerConfig {chatPort}
 
 data ChatServerConfig = ChatServerConfig
   { chatPort :: ServiceName,
diff --git a/apps/simplex-directory-service/src/Directory/Events.hs b/apps/simplex-directory-service/src/Directory/Events.hs
index a187ac3e82..1d7a866051 100644
--- a/apps/simplex-directory-service/src/Directory/Events.hs
+++ b/apps/simplex-directory-service/src/Directory/Events.hs
@@ -70,7 +70,7 @@ crDirectoryEvent = \case
   CRChatItemDeleted {deletedChatItem = AChatItem _ SMDRcv (DirectChat ct) _, byUser = False} -> Just $ DEItemDeleteIgnored ct
   CRNewChatItem {chatItem = AChatItem _ SMDRcv (DirectChat ct) ci@ChatItem {content = CIRcvMsgContent mc, meta = CIMeta {itemLive}}} ->
     Just $ case (mc, itemLive) of
-      (MCText t, Nothing) -> DEContactCommand ct ciId $ fromRight err $ A.parseOnly directoryCmdP $ T.dropWhileEnd isSpace t
+      (MCText t, Nothing) -> DEContactCommand ct ciId $ fromRight err $ A.parseOnly (directoryCmdP <* A.endOfInput) $ T.dropWhileEnd isSpace t
       _ -> DEUnsupportedMessage ct ciId
     where
       ciId = chatItemId' ci
diff --git a/apps/simplex-directory-service/src/Directory/Service.hs b/apps/simplex-directory-service/src/Directory/Service.hs
index ea79dabb10..c1428881b9 100644
--- a/apps/simplex-directory-service/src/Directory/Service.hs
+++ b/apps/simplex-directory-service/src/Directory/Service.hs
@@ -177,8 +177,8 @@ directoryService st DirectoryOpts {superUsers, serviceName, searchResults, testi
     badRolesMsg :: GroupRolesStatus -> Maybe String
     badRolesMsg = \case
       GRSOk -> Nothing
-      GRSServiceNotAdmin -> Just "You must have a group *owner* role to register the group"
-      GRSContactNotOwner -> Just "You must grant directory service *admin* role to register the group"
+      GRSServiceNotAdmin -> Just "You must grant directory service *admin* role to register the group"
+      GRSContactNotOwner -> Just "You must have a group *owner* role to register the group"
       GRSBadRoles -> Just "You must have a group *owner* role and you must grant directory service *admin* role to register the group"
 
     getGroupRolesStatus :: GroupInfo -> GroupReg -> IO (Maybe GroupRolesStatus)
@@ -190,8 +190,8 @@ directoryService st DirectoryOpts {superUsers, serviceName, searchResults, testi
     groupRolesStatus :: GroupMemberRole -> GroupMemberRole -> GroupRolesStatus
     groupRolesStatus contactRole serviceRole = case (contactRole, serviceRole) of
       (GROwner, GRAdmin) -> GRSOk
-      (_, GRAdmin) -> GRSServiceNotAdmin
-      (GROwner, _) -> GRSContactNotOwner
+      (_, GRAdmin) -> GRSContactNotOwner
+      (GROwner, _) -> GRSServiceNotAdmin
       _ -> GRSBadRoles
 
     getGroupMember :: GroupReg -> IO (Maybe GroupMember)
diff --git a/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md b/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
index ea4249f250..219dd2d5fe 100644
--- a/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
+++ b/blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md
@@ -15,7 +15,7 @@ This is a major upgrade for SimpleX messaging protocols, we are really proud to
 This post also covers various aspects of end-to-end encryption, compares different messengers, and explains why and how quantum-resistant encryption is added to SimpleX Chat:
 
 - [Why do we need end-to-end encryption?](#why-do-we-need-end-to-end-encryption)
-- [Why encryption is even allowed?](#why-encryption-is-even-allowed)
+- [Why is encryption even allowed?](#why-is-encryption-even-allowed)
 - [End-to-end encryption security: attacks and defense.](#end-to-end-encryption-security-attacks-and-defense)
   - Compromised message size - mitigated by padding messages to a fixed block size.
   - Compromised confidentiality - mitigated by repudiation (deniability).
@@ -40,7 +40,7 @@ End-to-end encryption is an important component of our individual and business s
 
 It's very sad to see the same people who keep their financial affairs private to protect from financial crimes, lock their doors to protect from thieves, and curtain their windows to protect from the occasional prying eyes, when it comes to protecting their personal lives from the data criminals say "we don't care about privacy, we have nothing to hide". Everybody's safety depends on keeping their affairs and relations private, not visible to a vast and ruthless data gathering machines, that abuse our data for commercial gain, without any regard to our interests or even [the safety of our families and children](https://nmdoj.gov/press-release/attorney-general-raul-torrez-files-lawsuit-against-meta-platforms-and-mark-zuckerberg-to-protect-children-from-sexual-abuse-and-human-trafficking/).
 
-## Why encryption is even allowed?
+## Why is encryption even allowed?
 
 <img src="./images/20240314-djb.jpg" class="float-to-right">
 
@@ -75,7 +75,7 @@ While the content encryption is the most important, concealing the actual messag
 
 The only effective mitigation to these attacks is to pad all messages to a fixed size. Using space-efficient schemes like Padme, or padding to encryption block size is ineffective for mitigating these attacks, as they still allow differentiating message sizes.
 
-To the best of our knowledge the only messenger other than SimpleX Chat that padded all messages to a fixed packet size was [Pond](https://github.com/agl/pond) - SimpleX design as an evolution of it.
+To the best of our knowledge, the only messengers other than SimpleX Chat that pad all messages to a fixed packet size are Cwtch and no longer developed [Pond](https://github.com/agl/pond) - SimpleX design can be seen as an evolution of Pond design.
 
 ### 2. Compromised confidential messages - mitigated by repudiation (deniability)
 
@@ -97,15 +97,15 @@ This property is well understood by the users, and most messengers that focus on
 
 ### 4. Compromised long-term or session - mitigated by break-in recovery
 
-This attack is much less understood by the users, and forward secrecy does not protect from it. Arguably, it's almost impossible to compromise individual message keys without compromising long-term or session keys. So the ability of the encryption to recover from break-in (attacker making a copy of the device data without retaining the ongoing access) is both very and pragmatic - break-in attacks are simpler to execute on mobile devices during short-term device access than long-term ongoing compromise.
+This attack is much less understood by the users, and forward secrecy does not protect from it. Arguably, it's almost impossible to compromise individual message keys without compromising long-term or session keys. So the ability of the encryption to recover from break-in (attacker making a copy of the device data without retaining the ongoing access) is both very important and pragmatic - break-in attacks are simpler to execute on mobile devices during short-term device access than long-term ongoing compromise.
 
-Out of all encryption algorithms known to us only Signal double ratchet algorithm provides the ability to encryption security after break-ins. This recovery happens automatically and transparently to the users, without them doing anything special even knowing about break-in, by simply sending messages. Every time one of the communication parties replies to another party message, new random keys are generated and previously stolen keys become useless.
+Out of all encryption algorithms known to us only _Signal double ratchet algorithm_ (also referred to as _Signal algorithm_ or _double ratchet algorithm_, which is not the same as Signal messaging platform and protocols) provides the ability for the encryption security to recover after break-ins attacks. This recovery happens automatically and transparently to the users, without them doing anything special or even knowing about break-in, by simply sending messages. Every time one of the communication parties replies to another party message, new random keys are generated and previously stolen keys become useless.
 
-Signal double ratchet algorithm is used in Signal, Cwtch and SimpleX Chat. This is why you cannot use SimpleX Chat profile on more than one device at the same time - the encryption scheme rotates the long term keys, randomly, and keys on another device become useless, as they would become useless for the attacker who stole them. Security always has some costs to the convenience.
+Double ratchet algorithm is used in Signal, Cwtch and SimpleX Chat. This is why you cannot use SimpleX Chat profile on more than one device at the same time - the encryption scheme rotates the long term keys, randomly, and keys on another device become useless, as they would become useless for the attacker who stole them. Security always has some costs to the convenience.
 
 ### 5. Man-in-the-middle attack - mitigated by two-factor key exchange
 
-Many people incorrectly believe that security of end-to-end encryption cannot be broken by communication provider. But end-to-end encryption is as secure as key exchange. While any intermediary passing the keys between senders and recipients cannot recover the private keys from the public keys, they can simply replace the passed public keys with their own and then proxy all communication between the users having full access to the original messages. So instead of having an end-to-end encrypted channel, users would have two half-way encrypted channels - between users and their communication intermediary.
+Many people incorrectly believe that security of end-to-end encryption cannot be broken by communication provider. But end-to-end encryption is only as secure as key exchange. While any intermediary passing the keys between senders and recipients cannot recover the private keys from the public keys, they can simply replace the passed public keys with their own and then proxy all communication between the users having full access to the original messages. So instead of having an end-to-end encrypted channel, users would have two half-way encrypted channels - between users and their communication intermediary.
 
 Pictures below illustrate how this attack works for RSA encryption.
 
@@ -143,7 +143,7 @@ Post-quantum cryptography, or encryption algorithms that are resistant to quantu
 - many of post-quantum algorithms have known patent claims, so any system deploying them accepts the risks of patent litigation.
 - the silver lining to these limitations is that the risk of appearance of commercially viable quantum computers in the next decade may be exaggerated.
 
-So, to put it bluntly and provocatively, post-quantum cryptography can be compared with a remedy against the illness that nobody has, without any guarantee that it will work. The closest analogy in the history of medicine is _snake oil_.
+So, to say it provocatively, post-quantum cryptography can be compared with a remedy against the illness that nobody has, without any guarantee that it will work. While there is a reasonable hope that it _might_ work, so it's not exactly a _snake oil_, these limitations and risks have to be much better communicated to the end users than they are.
 
 <img src="./images/20240314-datacenter.jpg" width="400" class="float-to-right">
 
@@ -164,8 +164,8 @@ The main objective here is to establish the framework for comparing the security
 Some columns are marked with a yellow checkmark:
 - when messages are padded, but not to a fixed size.
 - when repudiation does not include client-server connection. In case of Cwtch it appears that the presence of cryptographic signatures compromises repudiation (deniability), but it needs to be clarified.
-- when 2-factor key exchange is optional, via security code verification.
-- when post-quantum cryptography is only added to the initial key agreement, does not protect break-in recovery.
+- when 2-factor key exchange is optional (via security code verification).
+- when post-quantum cryptography is only added to the initial key agreement and does not protect break-in recovery.
 
 ## Adding quantum resistance to Signal double ratchet algorithm
 
@@ -201,7 +201,7 @@ The reason it is released as opt-in is because once the conversation is upgraded
 - enable _Show developer options_ toggle.
 - now you will see _Post-quantum E2EE_ toggle - enable it as well.
 
-Now all new contacts you add to the app will use quantum resistant Signal double ratchet algorithm.
+Now all new contacts you add to the app will use quantum resistant double ratchet algorithm.
 
 Once you have enabled it for the new contacts, you can also **enable it for some of the existing contacts**:
 - open the chat with the contact you want to upgrade to be quantum resistant.
@@ -211,7 +211,7 @@ Once you have enabled it for the new contacts, you can also **enable it for some
 
 ## Next for post-quantum crypto - all direct chats, small groups and security audit
 
-We will be making quantum resistance default for all direct chats in v5.7, and they will be upgraded for all users without any action.
+We will be making quantum resistance default for all direct chats in v5.7, and we plan that all existing direct chats will be automatically upgraded when both contacts install v5.7.
 
 We will also be adding quantum resistance to small groups up to 10-20 members. Computing cryptographic keys is much slower, in comparison, and it would be very inefficient (and completely unnecessary) for large public groups.
 
diff --git a/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md b/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md
index f036b95f1f..c017b9d1cc 100644
--- a/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md
+++ b/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md
@@ -1,20 +1,128 @@
 ---
 layout: layouts/article.html
-title: "SimpleX network: real privacy and stable profits, non-profit protocol governance, v5.6 released with quantum resistant e2e encryption and simple profile migration"
+title: "SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration"
 date: 2024-03-23
-# previewBody: blog_previews/20240314.html
-preview: TODO
-draft: true
-# image: images/20240314-kem.jpg
-# imageWide: true
+previewBody: blog_previews/20240323.html
+image: images/20240323-post-preview.png
+imageBottom: true
 permalink: "/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.html"
 ---
 
-# SimpleX network: real privacy and stable profits, non-profit protocol governance, v5.6 released with quantum resistant e2e encryption and simple profile migration
+# SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration
 
-This is a stub for release permalink
+**Published:** Mar 23, 2024
 
-TODO
+SimpleX network: deliver real privacy via a profitable business and non-profit protocol governance:
+- [community and business interests are aligned](#community-and-business-interests-are-aligned).
+- [the journey to the decentralized non-profit protocol governance](#the-journey-to-the-decentralized-non-profit-protocol-governance).
+- [welcome, Esra’a](#welcome-esraa)!
+
+What's new in v5.6:
+- [quantum resistant end-to-end encryption](#quantum-resistant-end-to-end-encryption-beta) (BETA) – enable it for the new contacts.
+- [use the app during the audio and video calls](#use-the-app-during-the-audio-and-video-calls).
+- [migrate all app data to another device via QR code](#migrate-all-app-data-to-another-device-via-qr-code).
+
+There are many other improvements and fixes in this release:
+- group admins can block a member for all other members.
+- filtering chats no longer includes muted chats with unread messages.
+- and more - see the [release notes](https://github.com/simplex-chat/simplex-chat/releases/tag/v5.6.0).
+
+## SimpleX network: deliver real privacy via a profitable business and non-profit protocol governance
+
+### Community and business interests are aligned
+
+Some people in our users' community believe that there is a conflict between the business and the community interests. This view fails to see a bigger picture of how these interests are aligned. I wrote a blog post about it [here](https://www.poberezkin.com/posts/2023-10-31-why-privacy-impossible-without-venture-funding.html). Our goal is to grow the network and the ecosystem while enriching all stakeholders involved, both the community and the business shareholders. This strategy relies on the strengths and opportunities of both the business and the decentralized network we build, with its vibrant community of individuals and organizations. It positions the business not as a controller but as a supporter of the community growth, resilience and sustainability.
+
+By leveraging access to investment resources, its ability to provide stock-based incentives beyond salaries, operating as a business will satisfy users' and community needs more effectively, ensuring the long-term viability and growth of the network, while remaining true to the mission. A purely nonprofit model with no avenue to sustain this growth is simply not possible. Sustainability requires profits, that is simply spending less than earning, as every responsible individual and organization should aim for, and these profits must be based on users' payments, and not on some other sources of revenue or funds. And building the software product that customers are willing to pay for requires substantial business investments. We will accomplish it while maintaining transparency and the commitment to keep SimpleX network and its protocols open and free to use.
+
+### The journey to the decentralized non-profit protocol governance
+
+At the current early stage of network growth the protocols will benefit most from the rapid evolution and centralized design. Many protocols that decentralized their evolution too early failed to evolve and to adapt to the product requirements of the majority of users, causing them to stall in growth. Even the open web became possible only thanks to Netscape, a venture funded company, that developed browsers and web server software taking it upon themselves to rapidly evolve web specification to make it into a robust application platform as we now know it. It is very unlikely that it would have happened if it was managed by a nonprofit or community, in a decentralized way.
+
+Once SimpleX network protocols stabilize and reach the required maturity, we plan to transition its governance to several new nonprofit entities, ensuring its continued evolution aligns more closely with our vision of community-driven, independent and transparent governance. We and our investors believe that this is a win-win strategy. It both maximizes the business value, by creating a product built on protecting privacy and users' trust - a model that we see as the only viable path forward. It also maximizes the value created for the user community.
+
+### Welcome, Esra’a!
+
+To help us deliver these goals, Esra’a Al Shafei joined SimpleX Chat team - we are excited to welcome her!
+
+Esra'a is a longtime privacy and human rights advocate from Bahrain. She is the founder of [Majal.org](http://majal.org), a network of platforms that amplify under-reported and marginalized voices in the Middle East and North Africa. She is also the co-founder of the [Numun Fund](https://numun.fund/), the first dedicated fund for women-led tech in the Global South. Esra’a is currently the Vice Chair of the Board at the [Wikimedia Foundation](https://wikimediafoundation.org/), the nonprofit which hosts Wikipedia. She is also on the Board of the [Tor Project](https://www.torproject.org/), developers of one of the world’s strongest tools for privacy and freedom online. Previously, she served on the Board of [Access Now](https://www.accessnow.org/), an international nonprofit dedicated to an open and free Internet.
+
+In her own words: *"Privacy and security have been the center of my work as a human rights advocate for the last 20 years in one of the most surveilled countries in the world where staying safe remains a burden. Our privacy is our dignity. It is something that belongs to us and something we should treasure - as people, as companies, as governments. Despite messaging being the most intimate aspect of our digital lives, the leading protocols in this space are centralized and we deserve a web that operates on the core principles of genuine privacy and security in a fully decentralized framework. SimpleX network will play a critical role towards that vision."*
+
+Executing the plan towards decentralized nonprofit protocol governance will be Esra’a’s primary responsibility. Our primary objective with this plan is to ensure that no single entity can control or have unrestricted ownership of the protocols, so it can maintain its integrity.
+
+## What's new in v5.6
+
+### Quantum resistant end-to-end encryption (BETA)
+
+Adding post-quantum resistance to the double ratchet end-to-end encryption algorithm in SimpleX Chat is a major upgrade to messaging protocols, and it creates the security against the future quantum computers.
+
+I wrote in detail in the previous post about various properties of end-to-end encryption and how exactly quantum resistance is implemented in SimpleX Chat - currently SimpleX Chat has [the most secure end-to-end encryption design](./20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md#how-secure-is-end-to-end-encryption-in-different-messengers) against the present and future attacks.
+
+We plan to perform a security audit of this design and implementation later this year.
+
+Post-quantum encryption is currently added as opt-in and has to be separately enabled to be active for the new contacts, and, additionally, can be enabled for the existing contacts.
+
+<img src="./images/20240314-pq1.png" width="288"> <img src="./images/20240314-pq2.png" width="288"> <img src="./images/20240314-pq3.png" width="288">
+
+**To enable quantum resistance for the new conversations**:
+- open the app settings (tap user avatar in the top left corner).
+- scroll down to _Developer tools_ and open them.
+- enable _Show developer options_ toggle.
+- now you will see _Post-quantum E2EE_ toggle - enable it as well.
+
+Now all new contacts you add to the app will use quantum resistant Signal double ratchet algorithm.
+
+Once you have enabled it for the new contacts, you can also **enable it for some of the existing contacts**:
+- open the chat with the contact you want to upgrade to be quantum resistant.
+- tap contact name above the chat.
+- tap Allow PQ encryption.
+- exchange several messages back and forth with that contact - the quantum resistant double ratchet will kick in after 3-5 messages (depending on how many messages you send in each direction), and you will see the notice in the chat once it enables.
+
+We will be making quantum resistance default for all direct chats in v5.7, and we plan that all existing direct chats will be automatically upgraded when both contacts install v5.7.
+
+### Use the app during the audio and video calls
+
+<img src="./images/20240323-call1.png" width="220" class="float-to-left"> <img src="./images/20240323-call2.png" width="220" class="float-to-left">
+
+Since we added the audio and video calls in 2022 a lot of work was done to improve the stability of calls. One of the usability downsides until this release was that it was impossible to use the app during the call.
+
+This version solved this problem - now you can return back to the app without interrupting the call and use any of the app functions - for example, you can send the messages or files to the person you are in the call with. If this is a video call, you will continue seeing your contact in a small picture-in-picture view.
+
+### Migrate all app data to another device via QR code
+
+We always believed that cross-platform data portability is very important for any software. Users own their data, and they should have a way to export it from any software they use. So from the version of SimpleX Chat [released in July 2022](./20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.md#database-export-and-import) it was possible to export the database as a self-contained file, including all contacts, messages and files, and import it on a new device.
+
+_"How can I migrate my data to another device?"_ was one of the most frequent user questions, but until this release this process was [quite complex](), requiring too many steps, and most non-technical users were not willing to try it, as even though it was reliable, it appeared risky.
+
+This release made the app data migration very simple, see the steps below.
+
+**Start the migration on the source device**
+
+<img src="./images/20240323-migrate-from1.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-from2.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-from3.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-from4.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-from5.png" width="170">
+
+On the device you migrate your app data from, follow these steps:
+- choose _Migrate to another device_,
+- if necessary, set the database passphrase (initially, the database is encrypted with a random passphrase), or, if it's already set, verify it - for security and to ensure that the archive will be usable on the new device,
+- tap _Archive and upload_ to and upload the app data in chunks to the XFTP servers configured in the app,
+- the app will show the QR code that should be scanned from the new device.
+
+**Migrate data to the target device**
+
+<img src="./images/20240323-migrate-to1.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-to2.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-to3.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-to4.png" width="170"> <img src="./images/arrow.png" width="24"> <img src="./images/20240323-migrate-to5.png" width="170">
+
+On the device you migrate your data to, follow these steps:
+- on the first app page choose _Migrate from another device_,
+- scan the QR code shown on the source device,
+- once the archive downloads, enter the database passphrase and tap _Open chat_,
+
+**Finalize migration on the source device**
+
+<img src="./images/20240323-migrate-from6.png" width="170" class="float-to-left">
+
+When the chat starts on the target device, make sure to tap _Finalize migration_ and then _Delete database_ on the source device.
+
+The database cannot be used on two devices at the same time, doing so would make it impossible to decrypt the received messages. This is a security measure - the break-in recovery property of double ratchet algorithm.
 
 ## SimpleX network
 
diff --git a/blog/20240404-why-i-joined-simplex-chat-esraa-al-shafei.md b/blog/20240404-why-i-joined-simplex-chat-esraa-al-shafei.md
new file mode 100644
index 0000000000..e554db5102
--- /dev/null
+++ b/blog/20240404-why-i-joined-simplex-chat-esraa-al-shafei.md
@@ -0,0 +1,38 @@
+---
+layout: layouts/article.html
+title: "Why I joined SimpleX Chat - by Esra'a al Shafei"
+date: 2024-04-04
+previewBody: blog_previews/20240404.html
+image: images/20240404-esraa.png
+permalink: "/blog/20240404-why-i-joined-simplex-chat-esraa-al-shafei.html"
+---
+
+# Why I joined SimpleX Chat
+
+**Published:** Apr 4, 2024
+
+_By [Esra'a al Shafei](https://mastodon.social/@alshafei)_
+
+Transitioning from a lifelong career dedicated to nonprofits, including Board roles at organizations like the Wikimedia Foundation, Access Now and Tor, my decision to join SimpleX Chat may come as a surprise to some. But, as I step into this new chapter, I want to share the insights and convictions that have guided me here, shedding light on what I think sets SimpleX Chat apart and why this move feels like an essential learning opportunity.
+
+The nonprofit world has been my primary focus for decades. My team and I ran the platforms at Majal.org with an extremely limited budget. We had to navigate many complexities and challenges that shadow the nonprofit model. And because we worked primarily in creating applications and tools, a recurring theme has been financial sustainability. Being a Bahrain-based entity for most of these years meant that the many communities we served were not in a position to provide contributions and we were not eligible for most foundation grants. This drastically limited our growth and the reliability of our apps. When we failed to raise sufficient funds or meet our target budgets, we often had to shutter certain applications, sometimes after spending more than 10 years building them. 
+
+With secure and private messaging, the stakes are even graver. Any failure to commit and resource/fund ongoing development, security patches, etc means lives can be at risk. I still believe in nonprofit models, and it’s why I continue to serve them through various volunteer roles. I do also believe that there is room for a mixture of models that, in the case of something as unique as SimpleX Chat, can serve as a fully open and transparent public interest technology while also having a profitable values-aligned company that can keep the lights on to continue developing, expanding, and improving the protocol, network and their reach.
+
+I’m no stranger to writing about some VC models being [corrupt](https://mastodon.social/@alshafei/112125959080515656). Frankly, I also hold the view that some tech VCs are amongst the [most complicit](https://responsiblestatecraft.org/defense-tech/) in egregious war crimes worldwide, or enabling the [intrusive surveillance](https://mastodon.social/@alshafei/112140566088322925) we’re fighting against. So being part of a VC-funded venture is not a decision I take lightly. However, I have been following SimpleX Chat’s growth since early 2022 when I first met Evgeny at the Mozilla Festival. I appreciated the drive and Evgeny’s firm refusal to settle for the current models of private messaging. We share the belief that messaging is something we need to keep improving and that we must continue pushing its boundaries to make it even more private, secure, usable for groups, and, most importantly - fully decentralized. This is a major undertaking, and it requires funding to achieve. Candidly, I did worry about funding and sustainability because, at the time, SimpleX was still primarily funded by user contributions. 
+
+But even knowing this, I scrutinized SimpleX Chat for taking VC funding ($350K) from Village Global and questioned the individuals featured on its frontpage. I had to speak with Evgeny directly to learn who exactly from this fund was involved, how much power they wielded, if any, and if this changes the ethos of the company - all of which he is already making public. It was only after these discussions that I was comfortable to take a leap of faith and continue to use the app and vouch for its current and future offerings. It required me to question my own views on whether a VC-funded company can actually have major positive contributions to privacy as well as the open ecosystem. 
+
+<img src="./images/20240404-messsaging-apps.png" class="float-to-right" width="50%">
+
+The web has a long history of [trading privacy](https://www.engadget.com/from-its-start-gmail-conditioned-us-to-trade-privacy-for-free-services-120009741.html) for “free” services. Traditionally, these services have also been centralized, closed-source, non-transparent, and profit-oriented. The companies behind these apps and services became prolific because of their disregard of privacy rights, which normalized lucrative surveillance capitalism. There is such an extensive global monopoly that in Africa, only 1 of the 5 biggest messaging apps in Africa isn't owned by Meta, notoriously known for spying not just through its own apps but even through [its competitors](https://qz.com/project-ghostbusters-facebook-meta-wiretap-snapchat-1851366814), – relentless, massive data harvesting that stretches far beyond its own walled gardens:
+
+Some of the world’s top engineers often go to these companies because of the benefits and financial opportunities. We can question their ethics all day long, but we also need to question if the web would look significantly different if there were as many opportunities at privacy-first companies with purpose and strong, proven moral boundaries, set up in a way that can guarantee operational independence from any shareholders and VCs.
+
+SimpleX could have taken the route of other companies in the privacy space, whether it’s Skiff which rushed to take a large amount of [VC money](https://techcrunch.com/2022/03/30/skiff-series-a-encrypted-workspaces/) only to [shutter its doors](https://www.techradar.com/computing/cyber-security/skiff-gets-bought-by-notion-raising-privacy-concerns) after an acquisition, leaving its users hanging with many unanswered questions, or giving up control of the company, which would puts its future solely in the hands of VCs with majority ownership. SimpleX aims to prevent this, and in fact has left money on the table to ensure that it does not occur. Had it not been for this information, I would not have joined, and I would have remained a user of the product, albeit a very cautious one, constantly wondering whether it will be sold or corrupted. 
+
+It’s worth noting that some private foundations operate on the VC model in supporting nonprofits, either by requiring Board seats or requesting that their funding be used towards very specific objectives not always in alignment with the organization’s values and mission. It’s also worth noting that [some nonprofits](https://www.engadget.com/2019-05-31-sex-lies-and-surveillance-fosta-privacy.html) actually operate on the models of surveillance and censorship. Therefore, whether an organization or company is VC-backed or a nonprofit should not be the sole factor in deciding whether or not it is trustworthy. Actions are important, with full transparency being one of the most critical factors, and being fully open source being another to attract valid criticisms and audits to ensure any product or protocol lives up to its privacy and security promise. SimpleX Chat prides itself on being both transparent and open, on top of also being fully decentralized. If you’re new to it and eager to know more, you can start with [this overview](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md).
+
+Another important consideration is that the SimpleX network does have a plan that would rely on users' payments for specific or tailored services, and not on some other sources of revenue or funds (ads, etc.). Building anything that users would be willing to pay for requires substantially more time and resources, hence the VC route to establish a business model that doesn’t translate to the user being the product. But any business services need to be separate from SimpleX as a public interest technology. As outlined in this [recent post](./20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md), I’ll be using my background in nonprofit governance structures to ensure that the SimpleX network protocols evolve under the stewardship of nonprofit entities in various jurisdictions, so that its continued evolution aligns more closely with the vision of community-driven, independent and decentralized governance. This would help create a necessary balance between different structures, in the same way many tech nonprofits also have for-profit subsidiaries to attract fee-for-service agreements to sustain their operations.
+
+In summary: My decision to join Simplex Chat, despite my deep-rooted beliefs and skepticism towards VC funding, reflects a broader realization: that the fight for privacy, security, and decentralization in today’s web is multifaceted and sometimes requires us to depart from our comfort zones to explore sustainable paths for continuous growth and impact so that open source privacy tools and protocols are no longer “niche”, but universally accessible standards. As long as nothing in this journey compromises our moral principles and integrity, this will remain a very worthwhile goal to pursue.
diff --git a/blog/README.md b/blog/README.md
index 3b89628211..cf93260676 100644
--- a/blog/README.md
+++ b/blog/README.md
@@ -1,5 +1,27 @@
 # Blog
 
+Apr 4. 2024 [Why I joined SimpleX Chat](./20240404-why-i-joined-simplex-chat-esraa-al-shafei.md)
+
+_By [Esra'a al Shafei](https://mastodon.social/@alshafei)_
+
+Transitioning from a lifelong career dedicated to nonprofits, including Board roles at organizations like the Wikimedia Foundation, Access Now and Tor, my decision to join SimpleX Chat may come as a surprise to some. But, as I step into this new chapter, I want to share the insights and convictions that have guided me here, shedding light on what I think sets SimpleX Chat apart and why this move feels like an essential learning opportunity.
+
+---
+
+Mar 23, 2024 [SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration](./20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
+
+SimpleX network: deliver real privacy via a profitable business and non-profit protocol governance:
+- community and business interests are aligned.
+- the journey to the decentralized non-profit protocol governance.
+- welcome, Esra’a!
+
+What's new in v5.6:
+- quantum resistant end-to-end encryption (BETA) – enable it for the new contacts.
+- use the app during the audio and video calls.
+- migrate all app data to another device via QR code.
+
+---
+
 Mar 14, 2024 [SimpleX Chat v5.6 (beta): adding quantum resistance to Signal double ratchet algorithm](./20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
 
 This is a major upgrade for SimpleX Chat messaging protocol stack, I am really proud to present this work of the whole team.
diff --git a/blog/images/20240314-comparison.jpg b/blog/images/20240314-comparison.jpg
index 34027a43a7..579b2fd73c 100644
Binary files a/blog/images/20240314-comparison.jpg and b/blog/images/20240314-comparison.jpg differ
diff --git a/blog/images/20240323-call1.png b/blog/images/20240323-call1.png
new file mode 100644
index 0000000000..0cf954a07e
Binary files /dev/null and b/blog/images/20240323-call1.png differ
diff --git a/blog/images/20240323-call2.png b/blog/images/20240323-call2.png
new file mode 100644
index 0000000000..8a69d1891e
Binary files /dev/null and b/blog/images/20240323-call2.png differ
diff --git a/blog/images/20240323-migrate-from0.png b/blog/images/20240323-migrate-from0.png
new file mode 100644
index 0000000000..033ead3fd9
Binary files /dev/null and b/blog/images/20240323-migrate-from0.png differ
diff --git a/blog/images/20240323-migrate-from1.png b/blog/images/20240323-migrate-from1.png
new file mode 100644
index 0000000000..be016ada2c
Binary files /dev/null and b/blog/images/20240323-migrate-from1.png differ
diff --git a/blog/images/20240323-migrate-from2.png b/blog/images/20240323-migrate-from2.png
new file mode 100644
index 0000000000..2cee12e6f4
Binary files /dev/null and b/blog/images/20240323-migrate-from2.png differ
diff --git a/blog/images/20240323-migrate-from3.png b/blog/images/20240323-migrate-from3.png
new file mode 100644
index 0000000000..92d7bf19a6
Binary files /dev/null and b/blog/images/20240323-migrate-from3.png differ
diff --git a/blog/images/20240323-migrate-from4.png b/blog/images/20240323-migrate-from4.png
new file mode 100644
index 0000000000..9b96f9efd8
Binary files /dev/null and b/blog/images/20240323-migrate-from4.png differ
diff --git a/blog/images/20240323-migrate-from5.png b/blog/images/20240323-migrate-from5.png
new file mode 100644
index 0000000000..dfc22a3987
Binary files /dev/null and b/blog/images/20240323-migrate-from5.png differ
diff --git a/blog/images/20240323-migrate-from6.png b/blog/images/20240323-migrate-from6.png
new file mode 100644
index 0000000000..18d9c8b627
Binary files /dev/null and b/blog/images/20240323-migrate-from6.png differ
diff --git a/blog/images/20240323-migrate-to1.png b/blog/images/20240323-migrate-to1.png
new file mode 100644
index 0000000000..b3fb0e32f1
Binary files /dev/null and b/blog/images/20240323-migrate-to1.png differ
diff --git a/blog/images/20240323-migrate-to2.png b/blog/images/20240323-migrate-to2.png
new file mode 100644
index 0000000000..f64544cd9b
Binary files /dev/null and b/blog/images/20240323-migrate-to2.png differ
diff --git a/blog/images/20240323-migrate-to3.png b/blog/images/20240323-migrate-to3.png
new file mode 100644
index 0000000000..626032737b
Binary files /dev/null and b/blog/images/20240323-migrate-to3.png differ
diff --git a/blog/images/20240323-migrate-to4.png b/blog/images/20240323-migrate-to4.png
new file mode 100644
index 0000000000..59153a464c
Binary files /dev/null and b/blog/images/20240323-migrate-to4.png differ
diff --git a/blog/images/20240323-migrate-to5.png b/blog/images/20240323-migrate-to5.png
new file mode 100644
index 0000000000..b86f42b292
Binary files /dev/null and b/blog/images/20240323-migrate-to5.png differ
diff --git a/blog/images/20240323-post-preview.png b/blog/images/20240323-post-preview.png
new file mode 100644
index 0000000000..69c9908a1e
Binary files /dev/null and b/blog/images/20240323-post-preview.png differ
diff --git a/blog/images/20240404-esraa.png b/blog/images/20240404-esraa.png
new file mode 100644
index 0000000000..baee242023
Binary files /dev/null and b/blog/images/20240404-esraa.png differ
diff --git a/blog/images/20240404-messsaging-apps.png b/blog/images/20240404-messsaging-apps.png
new file mode 100644
index 0000000000..6081a468a1
Binary files /dev/null and b/blog/images/20240404-messsaging-apps.png differ
diff --git a/cabal.project b/cabal.project
index be58b64283..62115c136b 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 8496884b42d76bd0d934e5ae481846d9c324d3c7
+    tag: 6bc4f6c94e11f59604b0d9c576e62e01bc08b4cd
 
 source-repository-package
     type: git
diff --git a/docs/DOWNLOADS.md b/docs/DOWNLOADS.md
index 6726fa02fe..0432b0f92e 100644
--- a/docs/DOWNLOADS.md
+++ b/docs/DOWNLOADS.md
@@ -4,10 +4,10 @@ permalink: /downloads/index.html
 revision: 11.02.2024
 ---
 
-| Updated 11.02.2024 | Languages: EN |
+| Updated 23.03.2024 | Languages: EN |
 # Download SimpleX apps
 
-The latest stable version is v5.5.3.
+The latest stable version is v5.6.
 
 You can get the latest beta releases from [GitHub](https://github.com/simplex-chat/simplex-chat/releases).
 
@@ -19,7 +19,7 @@ You can get the latest beta releases from [GitHub](https://github.com/simplex-ch
 
 <img src="/docs/images/simplex-desktop-light.png" alt="desktop app" width=500>
 
-Using the same profile as on mobile device is not yet supported – you need to create a separate profile to use desktop apps.
+You can link your mobile device with desktop to use the same profile remotely, but this is only possible when both devices are connected to the same local network.
 
 **Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-ubuntu-22_04-x86_64.deb).
 
diff --git a/docs/rfcs/2024-03-14-super-peers.md b/docs/rfcs/2024-03-14-super-peers.md
new file mode 100644
index 0000000000..9996c02490
--- /dev/null
+++ b/docs/rfcs/2024-03-14-super-peers.md
@@ -0,0 +1,72 @@
+# Large public grups / channels
+
+## Background
+
+SimpleX Chat users participate in public groups that were created for small, fully connected p2p groups - working groups, teams, etc. The ability to join the groups via the links was added as an afterthought, without forward looking design, simply to accomodate the interest from the users to use SimpleX platform for public groups and communities. Overall, it's correct to say that the emergence of public groups was unexpected in the context of private messaging, and it shows that protecting participants and publishers identity, and having per-group identity is important for many people.
+
+## Problems of the current p2p design
+
+### It doesn't scale to large size
+
+Current design assumes that each peer is connected to each peer and sends messages to all. It creates non-trivial cost of establishing the connections as the group grows, some abandoned connections when some members remain in "connecting" state and also linearly growing traffic to send each message.
+
+Historically, there were p2p designs when peers connected not to all but some members, but they were mostly used by desktop clients with more persistent network connections, did not provide any asynchronous delivery and were trading lower traffic for latency and availability. Such designs were viable for file sharing across desktop devices, but it probably would not work well for dynamic real-time communities with active participation from a small share of members and the design of other members to observe the conversation as it happens.
+
+### It doesn't account for participation asymmetry
+
+Most members of large public groups do not send messages, so connecting them to all other members directly appears unnecessary and costly, and it also requires tracking when members became inactive to stop sending messages to them.
+
+## Objectives for the new design
+
+### Transcript integrity
+
+This issue is covered in detail in [Group integrity](./2023-10-20-group-integrity.md).
+
+### Asynchronous delivery to group
+
+Asynchronous delivery is important to protect participants privacy from traffic observation. In addition to that, sending scheduled posts is quite often a convenient feature to schedule multiple updates for a longer period of time - for example, schedule daily updates for a week, doing it once a week.
+
+### Ability to conceal members list
+
+This is a rather common request for the current groups, and while it could be possible of course to hide it on the client level, this still makes data available via the database, and puts less technical users in unfair position, while not protecting users privacy from technically competent members.
+
+### Support pre-moderation
+
+As the group size grows, so does the activity of the bad actors. Some groups will benefit from switching all, some, most, or new members to pre-moderation - when each post needs to be approved by admin before it becomes visible to all members. It would slow down the conversations, but it would allow a better content quality and owners' control of the content.
+
+## Channels based on super-peers
+
+The proposal is to model the new UX design from Telegram channels, with optional subchannels, and granular participation rights for the members / followers.
+
+Another consideration is to create democratically governed communities when creators don't own the community but only appoint the initial administrators, but as the community grows it can elect the new admins or moderators from the existing members, where voting power is somehow determined by the community score (which is necessary to compensate for anonymous participants who could subvert the vote if plain vote count was made). This is probably out of scope for the initial implementation, but this idea is very appealing and it doesn't exist in any other decentralised platforms.
+
+Technologically, the channel or group would determine which super-peers would host the group or channel, with group content being a merkle tree with ability to remove some content creating holes - which seems to be very important quality, both to remove undesirable content and to protect participants privacy.
+
+Super-peer would manage this merkle-tree state based on the messages from owners, admins and members, with the ability to make some destructive actions confirmed by more than one command. E.g., group/channel deletion may require at least 2 or 3 votes (respectively, for 3 and 5 owners), thus protecting both from accidental deletions and from attacks via owner - one of the owners being compromised won't result in group deletion if 2 votes are required. As the group size grows, owners can also modify rules (which in itself can also require m of n votes).
+
+## Joining group
+
+The current model when the link to join the group is, effectively, an address of one of the admins, is not censorship-resistant, reliable or convenient - the admin can be offline, be removed, etc. So we want to somehow include addresses of multiple super-peers to join the group. Without identity-layer, the addresses are quite large already, and including multiple addresses in one link, while possible, would make the qr code very hard to scan. Practically, without creating identity layer, we can use up to 2-3 super-peer addresses for the group, and increase it later. 2 addresses is likely to be satisfactory, as one of them could be super-peer hosted by SimpleX Chat, and another - by group owners.
+
+The client then will be connecting to all super-peers in the address. Once connected, these super-peers could send the addresses of the additional super-peers, but this is probably unnecessary for the initial release.
+
+## MVP
+
+The challenge is to decide what should be in scope for the initial release, to make it a valuable upgrade and a viable starting point, without overloading it with the functions that can be added later.
+
+MVP scope:
+
+- Core functioning of the group - creation/deletion/choosing and changing super-peers. While a large scope, it appears essential.
+- Message delivery via super-peers.
+- Super-peer protocol extension. Most likely super-peer would receive ordinary chat messages, but some operations should be added and require additional protocol messages - adding/removing super-peers to groups.
+- Protocol extensions for owner actions with approvals - we already had several accidental deletions or lost owner accounts. Possibly, it is out of MVP scope.
+- Search and history navigation. Current decision to send 100 messages both creates unnecessary traffic spikes, and also doesn't provide access to older history and search functions. But, possibly, it should also be in follow up improvements, and only should be included as the initial protocol design.
+- New format of the group address to include more than one super-peer.
+- Granular permissions and management model. While the user interface can evolve, the protocol and the scenarios, and also rules models seems better to be added from the beginning.
+
+Follow-up / improvements:
+- More scalable client - we already observe scalability issues with directory service, so replacing SQLite with Postgres, if the group participation starts growing seems very important.
+
+Out of scope:
+- additional super-peers.
+- smart-contacts. While very tempting to generalise permissions and management model via smart contracts, that would radically increase complexity and delivery time.
diff --git a/docs/rfcs/2024-03-22-communicating-reject.md b/docs/rfcs/2024-03-22-communicating-reject.md
new file mode 100644
index 0000000000..37bb4eab26
--- /dev/null
+++ b/docs/rfcs/2024-03-22-communicating-reject.md
@@ -0,0 +1,95 @@
+# Communicating rejection
+
+## Problem
+
+Many interactions support either approval, or silent rejection. From privacy perspective, rejection being silent is a correct default. However, for improved usability we could add optional communication of rejection, as many users don't mind sending such signals to their contacts.
+
+Features currently not supporting communicating rejection:
+- Rejecting contact request
+- Rejecting group join request
+- Rejecting call
+- Rejecting group invitation
+- TBC Other?
+
+## Solution
+
+## Rejection of contact / group join requests
+
+- Contact and group join requests are very similar between each other and different from other features as they both use mechanism of "contact connections".
+
+- Rejection can be made to the address proposed by requester in AgentInvitation message, where currently AgentConfirmation is sent in case of acceptance.
+
+  ``` haskell
+  data AgentMsgEnvelope
+    = ...
+    | AgentRejection
+        { e2eEncryption :: RcvE2ERatchetParams 'C.X448,
+          encRejectionInfo :: ByteString
+        }
+  ```
+
+- Unlike other AgentMsgEnvelope constructors, AgentRejection doesn't require agentVersion since connection will be deleted after sending this message.
+
+  - We may be able to re-use recently added mechanism of marking connection for deletion with deleted_at_wait_delivery field without much additional work.
+
+- e2eEncryption will be used to encrypt first message, same as for AgentConfirmation. (?)
+
+- Both sync and async versions of agent functions are required, as contact rejection will be user action, while group join rejection will be automated (in case, for example, if link host is no longer admin).
+
+  - Group requests non-automatic approval is a separate matter and requires UI consideration, but if it was added it would use sync function.
+
+  - For sync function either new API can be added, or rejectContact can be parameterized.
+
+- Chat protocol requires adding new messages to be sent in encRejectionInfo, to be processed on requester side based on connections' semantics.
+
+  ```haskell
+  -- / contact request rejection
+  XReject :: ChatMsgEvent 'Json
+  -- or
+  -- (contact can send reason for rejection; we don't even have welcome messages in XContact though)
+  XReject :: Maybe Text -> ChatMsgEvent 'Json
+
+  -- / group join request rejection
+  XGrpReject :: Maybe GrpRejectReason -> ChatMsgEvent 'Json
+
+  data GrpRejectReason
+    = GRRNone                -- manual reject with no reason? use Nothing in GRRText instead?
+    | GRRCantInvite          -- e.g., no longer admin
+    | GRRText {text :: Text} -- manual reject once supported? Maybe Text?
+
+  -- add similar type for contact request rejection?
+  -- minimal is to always send XReject without reasons
+  ```
+
+  - As a side note, it may have been a design mistake to mix both "connInfo" messages as well as regular chat messages in a single type for protocol messages, so it may be best to keep these as separate constructors.
+
+- Versioning considerations:
+  - Increase chat version.
+  - We already save peer chat version on contact_requests on initial REQ message. It can be used to differentiate UI whether contact supports rejection messages and not offer option to reject with notification.
+  - Increase agent version? Agent can prohibit sending AgentRejection based on version in AgentInvitation, though it shouldn't be reachable as chat should also prohibit it.
+
+## Rejecting calls
+
+- New chat protocol message is enough
+  - Based on user action in reply to XCallInv instead of XCallOffer.
+  - Send in APIRejectCall.
+
+  ```haskell
+  XCallReject :: CallId -> ChatMsgEvent 'Json
+  ```
+
+- Same chat versioning considerations as above.
+
+## Rejecting group invitation
+
+- Same, new protocol message.
+  - Based on user action in reply to XGrpInv instead of XGrpAcpt.
+  - Can't be sent as simple chat message since there's no group ID in invitation? (only optional groupLinkId)
+    - So, have to send as "conn info" via join, same as for XGrpAcpt.
+  - APIDeleteChat is already used for deleting group invitations, can re-use. In this case `notify` parameter in APIDeleteChat can be used to send rejection.
+
+  ```haskell
+  XGrpReject :: CallId -> ChatMsgEvent 'Json
+  ```
+
+- Same chat versioning considerations as above.
diff --git a/package.yaml b/package.yaml
index 7d8af47401..3e187c5653 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.6.0.4
+version: 5.6.1.1
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -104,16 +104,20 @@ executables:
       - -threaded
 
   simplex-broadcast-bot:
-    source-dirs: apps/simplex-broadcast-bot/src
-    main: ../Main.hs
+    source-dirs:
+      - apps/simplex-broadcast-bot
+      - apps/simplex-broadcast-bot/src
+    main: Main.hs
     dependencies:
       - simplex-chat
     ghc-options:
       - -threaded
 
   simplex-directory-service:
-    source-dirs: apps/simplex-directory-service/src
-    main: ../Main.hs
+    source-dirs:
+      - apps/simplex-directory-service
+      - apps/simplex-directory-service/src
+    main: Main.hs
     dependencies:
       - simplex-chat
     ghc-options:
@@ -147,6 +151,7 @@ tests:
 
 ghc-options:
   # - -haddock
+  - -O2
   - -Wall
   - -Wcompat
   - -Werror=incomplete-patterns
@@ -154,3 +159,6 @@ ghc-options:
   - -Wincomplete-record-updates
   - -Wincomplete-uni-patterns
   - -Wunused-type-patterns
+
+default-extensions:
+  - StrictData
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 1fd783a1d3..d2701dc45f 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."8496884b42d76bd0d934e5ae481846d9c324d3c7" = "0c040s00zc1qg0ilsvpv54f01xz7flh8rsar2nplcs4a4gnp78qs";
+  "https://github.com/simplex-chat/simplexmq.git"."6bc4f6c94e11f59604b0d9c576e62e01bc08b4cd" = "08l00ay1ibz7skhlpfjp6z2821zpfd0kxplwdm6zc63m2f6za7cv";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 9caa46da55..fb0635abad 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        5.6.0.4
+version:        5.6.1.1
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -138,6 +138,8 @@ library
       Simplex.Chat.Migrations.M20240222_app_settings
       Simplex.Chat.Migrations.M20240226_users_restrict
       Simplex.Chat.Migrations.M20240228_pq
+      Simplex.Chat.Migrations.M20240313_drop_agent_ack_cmd_id
+      Simplex.Chat.Migrations.M20240324_custom_data
       Simplex.Chat.Mobile
       Simplex.Chat.Mobile.File
       Simplex.Chat.Mobile.Shared
@@ -167,6 +169,7 @@ library
       Simplex.Chat.Styled
       Simplex.Chat.Terminal
       Simplex.Chat.Terminal.Input
+      Simplex.Chat.Terminal.Main
       Simplex.Chat.Terminal.Notification
       Simplex.Chat.Terminal.Output
       Simplex.Chat.Types
@@ -178,7 +181,9 @@ library
       Paths_simplex_chat
   hs-source-dirs:
       src
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns
+  default-extensions:
+      StrictData
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -238,7 +243,9 @@ executable simplex-bot
       Paths_simplex_chat
   hs-source-dirs:
       apps/simplex-bot
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  default-extensions:
+      StrictData
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -299,7 +306,9 @@ executable simplex-bot-advanced
       Paths_simplex_chat
   hs-source-dirs:
       apps/simplex-bot-advanced
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  default-extensions:
+      StrictData
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -355,14 +364,17 @@ executable simplex-bot-advanced
       , text >=1.2.3.0 && <1.3
 
 executable simplex-broadcast-bot
-  main-is: ../Main.hs
+  main-is: Main.hs
+  hs-source-dirs:
+      apps/simplex-broadcast-bot
+      apps/simplex-broadcast-bot/src
+  default-extensions:
+      StrictData
   other-modules:
       Broadcast.Bot
       Broadcast.Options
       Paths_simplex_chat
-  hs-source-dirs:
-      apps/simplex-broadcast-bot/src
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -424,7 +436,9 @@ executable simplex-chat
       Paths_simplex_chat
   hs-source-dirs:
       apps/simplex-chat
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  default-extensions:
+      StrictData
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -481,7 +495,12 @@ executable simplex-chat
       , text >=1.2.3.0 && <1.3
 
 executable simplex-directory-service
-  main-is: ../Main.hs
+  main-is: Main.hs
+  hs-source-dirs:
+      apps/simplex-directory-service
+      apps/simplex-directory-service/src
+  default-extensions:
+      StrictData
   other-modules:
       Directory.Events
       Directory.Options
@@ -489,9 +508,7 @@ executable simplex-directory-service
       Directory.Service
       Directory.Store
       Paths_simplex_chat
-  hs-source-dirs:
-      apps/simplex-directory-service/src
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       aeson ==2.2.*
     , ansi-terminal >=0.10 && <0.12
@@ -583,7 +600,9 @@ test-suite simplex-chat-test
       tests
       apps/simplex-broadcast-bot/src
       apps/simplex-directory-service/src
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
+  default-extensions:
+      StrictData
+  ghc-options: -O2 -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
   build-depends:
       QuickCheck ==2.14.*
     , aeson ==2.2.*
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index cdb6f90a98..7948875180 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -132,7 +132,7 @@ defaultChatConfig =
   ChatConfig
     { agentConfig =
         defaultAgentConfig
-          { tcpPort = undefined, -- agent does not listen to TCP
+          { tcpPort = Nothing, -- agent does not listen to TCP
             tbqSize = 1024
           },
       chatVRange = supportedChatVRange,
@@ -161,7 +161,8 @@ defaultChatConfig =
       ciExpirationInterval = 30 * 60 * 1000000, -- 30 minutes
       coreApi = False,
       highlyAvailable = False,
-      deviceNameForRemote = ""
+      deviceNameForRemote = "",
+      chatHooks = defaultChatHooks
     }
 
 _defaultSMPServers :: NonEmpty SMPServerWithAuth
@@ -321,11 +322,10 @@ cfgServers p DefaultAgentServers {smp, xftp} = case p of
   SPSMP -> smp
   SPXFTP -> xftp
 
-startChatController :: forall m. ChatMonad' m => Bool -> m (Async ())
+startChatController :: Bool -> CM' (Async ())
 startChatController mainApp = do
-  asks smpAgent >>= resumeAgentClient
-  unless mainApp $
-    chatWriteVar subscriptionMode SMOnlyCreate
+  asks smpAgent >>= liftIO . resumeAgentClient
+  unless mainApp $ chatWriteVar' subscriptionMode SMOnlyCreate
   users <- fromRight [] <$> runExceptT (withStore' getUsers)
   restoreCalls
   s <- asks agentAsync
@@ -363,43 +363,43 @@ startChatController mainApp = do
           startExpireCIThread user
           setExpireCIFlag user True
 
-subscribeUsers :: forall m. ChatMonad' m => Bool -> [User] -> m ()
+subscribeUsers :: Bool -> [User] -> CM' ()
 subscribeUsers onlyNeeded users = do
   let (us, us') = partition activeUser users
-  vr <- chatVersionRange
+  vr <- chatVersionRange'
   subscribe vr us
   subscribe vr us'
   where
-    subscribe :: (PQSupport -> VersionRangeChat) -> [User] -> m ()
+    subscribe :: (PQSupport -> VersionRangeChat) -> [User] -> CM' ()
     subscribe vr = mapM_ $ runExceptT . subscribeUserConnections vr onlyNeeded Agent.subscribeConnections
 
-startFilesToReceive :: forall m. ChatMonad' m => [User] -> m ()
+startFilesToReceive :: [User] -> CM' ()
 startFilesToReceive users = do
   let (us, us') = partition activeUser users
   startReceive us
   startReceive us'
   where
-    startReceive :: [User] -> m ()
+    startReceive :: [User] -> CM' ()
     startReceive = mapM_ $ runExceptT . startReceiveUserFiles
 
-startReceiveUserFiles :: ChatMonad m => User -> m ()
+startReceiveUserFiles :: User -> CM ()
 startReceiveUserFiles user = do
   filesToReceive <- withStore' (`getRcvFilesToReceive` user)
   forM_ filesToReceive $ \ft ->
     flip catchChatError (toView . CRChatError (Just user)) $
       toView =<< receiveFile' user ft Nothing Nothing
 
-restoreCalls :: ChatMonad' m => m ()
+restoreCalls :: CM' ()
 restoreCalls = do
   savedCalls <- fromRight [] <$> runExceptT (withStore' getCalls)
   let callsMap = M.fromList $ map (\call@Call {contactId} -> (contactId, call)) savedCalls
   calls <- asks currentCalls
   atomically $ writeTVar calls callsMap
 
-stopChatController :: forall m. MonadUnliftIO m => ChatController -> m ()
+stopChatController :: ChatController -> IO ()
 stopChatController ChatController {smpAgent, agentAsync = s, sndFiles, rcvFiles, expireCIFlags, remoteHostSessions, remoteCtrlSession} = do
-  readTVarIO remoteHostSessions >>= mapM_ (liftIO . cancelRemoteHost False . snd)
-  atomically (stateTVar remoteCtrlSession (,Nothing)) >>= mapM_ (liftIO . cancelRemoteCtrl False . snd)
+  readTVarIO remoteHostSessions >>= mapM_ (cancelRemoteHost False . snd)
+  atomically (stateTVar remoteCtrlSession (,Nothing)) >>= mapM_ (cancelRemoteCtrl False . snd)
   disconnectAgentClient smpAgent
   readTVarIO s >>= mapM_ (\(a1, a2) -> uninterruptibleCancel a1 >> mapM_ uninterruptibleCancel a2)
   closeFiles sndFiles
@@ -409,13 +409,13 @@ stopChatController ChatController {smpAgent, agentAsync = s, sndFiles, rcvFiles,
     forM_ keys $ \k -> TM.insert k False expireCIFlags
     writeTVar s Nothing
   where
-    closeFiles :: TVar (Map Int64 Handle) -> m ()
+    closeFiles :: TVar (Map Int64 Handle) -> IO ()
     closeFiles files = do
       fs <- readTVarIO files
       mapM_ hClose fs
       atomically $ writeTVar files M.empty
 
-execChatCommand :: ChatMonad' m => Maybe RemoteHostId -> ByteString -> m ChatResponse
+execChatCommand :: Maybe RemoteHostId -> ByteString -> CM' ChatResponse
 execChatCommand rh s = do
   u <- readTVarIO =<< asks currentUser
   case parseChatCommand s of
@@ -424,18 +424,20 @@ execChatCommand rh s = do
       Just rhId
         | allowRemoteCommand cmd -> execRemoteCommand u rhId cmd s
         | otherwise -> pure $ CRChatCmdError u $ ChatErrorRemoteHost (RHId rhId) $ RHELocalCommand
-      _ -> execChatCommand_ u cmd
+      _ -> do
+        cc@ChatController {config = ChatConfig {chatHooks}} <- ask
+        liftIO (preCmdHook chatHooks cc cmd) >>= either pure (execChatCommand_ u)
 
-execChatCommand' :: ChatMonad' m => ChatCommand -> m ChatResponse
+execChatCommand' :: ChatCommand -> CM' ChatResponse
 execChatCommand' cmd = asks currentUser >>= readTVarIO >>= (`execChatCommand_` cmd)
 
-execChatCommand_ :: ChatMonad' m => Maybe User -> ChatCommand -> m ChatResponse
+execChatCommand_ :: Maybe User -> ChatCommand -> CM' ChatResponse
 execChatCommand_ u cmd = handleCommandError u $ processChatCommand cmd
 
-execRemoteCommand :: ChatMonad' m => Maybe User -> RemoteHostId -> ChatCommand -> ByteString -> m ChatResponse
+execRemoteCommand :: Maybe User -> RemoteHostId -> ChatCommand -> ByteString -> CM' ChatResponse
 execRemoteCommand u rhId cmd s = handleCommandError u $ getRemoteHostClient rhId >>= \rh -> processRemoteCommand rhId rh cmd s
 
-handleCommandError :: ChatMonad' m => Maybe User -> ExceptT ChatError m ChatResponse -> m ChatResponse
+handleCommandError :: Maybe User -> CM ChatResponse -> CM' ChatResponse
 handleCommandError u a = either (CRChatCmdError u) id <$> (runExceptT a `E.catches` ioErrors)
   where
     ioErrors =
@@ -447,12 +449,12 @@ parseChatCommand :: ByteString -> Either String ChatCommand
 parseChatCommand = A.parseOnly chatCommandP . B.dropWhileEnd isSpace
 
 -- | Chat API commands interpreted in context of a local zone
-processChatCommand :: forall m. ChatMonad m => ChatCommand -> m ChatResponse
+processChatCommand :: ChatCommand -> CM ChatResponse
 processChatCommand cmd =
   chatVersionRange >>= (`processChatCommand'` cmd)
 {-# INLINE processChatCommand #-}
 
-processChatCommand' :: forall m. ChatMonad m => (PQSupport -> VersionRangeChat) -> ChatCommand -> m ChatResponse
+processChatCommand' :: (PQSupport -> VersionRangeChat) -> ChatCommand -> CM ChatResponse
 processChatCommand' vr = \case
   ShowActiveUser -> withUser' $ pure . CRActiveUser
   CreateActiveUser NewUser {profile, sameServers, pastTimestamp} -> do
@@ -475,7 +477,7 @@ processChatCommand' vr = \case
     atomically . writeTVar u $ Just user
     pure $ CRActiveUser user
     where
-      chooseServers :: (ProtocolTypeI p, UserProtocol p) => SProtocolType p -> m (NonEmpty (ProtoServerWithAuth p), [ServerCfg p])
+      chooseServers :: (ProtocolTypeI p, UserProtocol p) => SProtocolType p -> CM (NonEmpty (ProtoServerWithAuth p), [ServerCfg p])
       chooseServers protocol
         | sameServers =
             asks currentUser >>= readTVarIO >>= \case
@@ -494,7 +496,7 @@ processChatCommand' vr = \case
       day = 86400
   ListUsers -> CRUsersList <$> withStore' getUsersInfo
   APISetActiveUser userId' viewPwd_ -> do
-    unlessM chatStarted $ throwChatError CEChatNotStarted
+    unlessM (lift chatStarted) $ throwChatError CEChatNotStarted
     user_ <- chatReadVar currentUser
     user' <- privateGetUser userId'
     validateUserPassword_ user_ user' viewPwd_
@@ -557,27 +559,28 @@ processChatCommand' vr = \case
   StartChat mainApp -> withUser' $ \_ ->
     asks agentAsync >>= readTVarIO >>= \case
       Just _ -> pure CRChatRunning
-      _ -> checkStoreNotChanged $ startChatController mainApp $> CRChatStarted
+      _ -> checkStoreNotChanged . lift $ startChatController mainApp $> CRChatStarted
   APIStopChat -> do
-    ask >>= stopChatController
+    ask >>= liftIO . stopChatController
     pure CRChatStopped
   APIActivateChat restoreChat -> withUser $ \_ -> do
-    when restoreChat restoreCalls
-    withAgent foregroundAgent
+    lift $ when restoreChat restoreCalls
+    lift $ withAgent' foregroundAgent
     chatWriteVar chatActivated True
     when restoreChat $ do
       users <- withStore' getUsers
-      void . forkIO $ subscribeUsers True users
-      void . forkIO $ startFilesToReceive users
-      setAllExpireCIFlags True
+      lift $ do
+        void . forkIO $ subscribeUsers True users
+        void . forkIO $ startFilesToReceive users
+        setAllExpireCIFlags True
     ok_
   APISuspendChat t -> do
     chatWriteVar chatActivated False
-    setAllExpireCIFlags False
+    lift $ setAllExpireCIFlags False
     stopRemoteCtrl
-    withAgent (`suspendAgent` t)
+    lift $ withAgent' (`suspendAgent` t)
     ok_
-  ResubscribeAllConnections -> withStore' getUsers >>= subscribeUsers False >> ok_
+  ResubscribeAllConnections -> withStore' getUsers >>= lift . subscribeUsers False >> ok_
   -- has to be called before StartChat
   SetTempFolder tf -> do
     createDirectoryIfMissing True tf
@@ -607,13 +610,13 @@ processChatCommand' vr = \case
             pure $ CRContactPQAllowed user ct' pqEnc
       Nothing -> throwChatError $ CEContactNotActive ct
   SetContactPQ cName pqEnc -> withContactName cName (`APISetContactPQ` pqEnc)
-  APIExportArchive cfg -> checkChatStopped $ exportArchive cfg >> ok_
+  APIExportArchive cfg -> checkChatStopped $ lift (exportArchive cfg) >> ok_
   ExportArchive -> do
     ts <- liftIO getCurrentTime
     let filePath = "simplex-chat." <> formatTime defaultTimeLocale "%FT%H%M%SZ" ts <> ".zip"
     processChatCommand $ APIExportArchive $ ArchiveConfig filePath Nothing Nothing
   APIImportArchive cfg -> checkChatStopped $ do
-    fileErrs <- importArchive cfg
+    fileErrs <- lift $ importArchive cfg
     setStoreChanged
     pure $ CRArchiveImported fileErrs
   APISaveAppSettings as -> withStore' (`saveAppSettings` as) >> ok_
@@ -683,11 +686,11 @@ processChatCommand' vr = \case
             startProximateTimedItemThread user (ChatRef CTDirect contactId, chatItemId' ci)
           pure $ CRNewChatItem user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
       where
-        setupSndFileTransfer :: Contact -> m (Maybe (FileInvitation, CIFile 'MDSnd))
+        setupSndFileTransfer :: Contact -> CM (Maybe (FileInvitation, CIFile 'MDSnd))
         setupSndFileTransfer ct = forM file_ $ \file -> do
           fileSize <- checkSndFile file
           xftpSndFileTransfer user file fileSize 1 $ CGContact ct
-        prepareMsg :: Maybe FileInvitation -> Maybe CITimed -> m (MsgContainer, Maybe (CIQuote 'CTDirect))
+        prepareMsg :: Maybe FileInvitation -> Maybe CITimed -> CM (MsgContainer, Maybe (CIQuote 'CTDirect))
         prepareMsg fInv_ timed_ = case quotedItemId_ of
           Nothing -> pure (MCSimple (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
           Just quotedItemId -> do
@@ -699,7 +702,7 @@ processChatCommand' vr = \case
                 quotedItem = CIQuote {chatDir = qd, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc, formattedText}
             pure (MCQuote QuotedMsg {msgRef, content = qmc} (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Just quotedItem)
           where
-            quoteData :: ChatItem c d -> m (MsgContent, CIQDirection 'CTDirect, Bool)
+            quoteData :: ChatItem c d -> CM (MsgContent, CIQDirection 'CTDirect, Bool)
             quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} = throwChatError CEInvalidQuote
             quoteData ChatItem {content = CISndMsgContent qmc} = pure (qmc, CIQDirectSnd, True)
             quoteData ChatItem {content = CIRcvMsgContent qmc} = pure (qmc, CIQDirectRcv, False)
@@ -725,7 +728,7 @@ processChatCommand' vr = \case
                 startProximateTimedItemThread user (ChatRef CTGroup groupId, chatItemId' ci)
               pure $ CRNewChatItem user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) ci)
         notAllowedError f = pure $ chatCmdError (Just user) ("feature not allowed " <> T.unpack (groupFeatureNameText f))
-        setupSndFileTransfer :: Group -> Int -> m (Maybe (FileInvitation, CIFile 'MDSnd))
+        setupSndFileTransfer :: Group -> Int -> CM (Maybe (FileInvitation, CIFile 'MDSnd))
         setupSndFileTransfer g n = forM file_ $ \file -> do
           fileSize <- checkSndFile file
           xftpSndFileTransfer user file fileSize n $ CGGroup g
@@ -733,7 +736,7 @@ processChatCommand' vr = \case
     CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
     CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
     where
-      xftpSndFileTransfer :: User -> CryptoFile -> Integer -> Int -> ContactOrGroup -> m (FileInvitation, CIFile 'MDSnd)
+      xftpSndFileTransfer :: User -> CryptoFile -> Integer -> Int -> ContactOrGroup -> CM (FileInvitation, CIFile 'MDSnd)
       xftpSndFileTransfer user file fileSize n contactOrGroup = do
         (fInv, ciFile, ft) <- xftpSndFileTransfer_ user file fileSize n $ Just contactOrGroup
         case contactOrGroup of
@@ -756,7 +759,7 @@ processChatCommand' vr = \case
     let cd = CDLocalSnd nf
     ciId <- createLocalChatItem user cd content createdAt
     ciFile_ <- forM file_ $ \cf@CryptoFile {filePath, cryptoArgs} -> do
-      fsFilePath <- toFSFilePath filePath
+      fsFilePath <- lift $ toFSFilePath filePath
       fileSize <- liftIO $ CF.getFileContentsSize $ CryptoFile fsFilePath cryptoArgs
       chunkSize <- asks $ fileChunkSize . config
       withStore' $ \db -> do
@@ -994,7 +997,7 @@ processChatCommand' vr = \case
         withStore' $ \db -> deleteGroupItemsAndMembers db user gInfo members
         withStore' $ \db -> deleteGroup db user gInfo
         let contactIds = mapMaybe memberContactId members
-        (errs1, (errs2, connIds)) <- second unzip . partitionEithers <$> withStoreBatch (\db -> map (deleteUnusedContact db) contactIds)
+        (errs1, (errs2, connIds)) <- lift $ second unzip . partitionEithers <$> withStoreBatch (\db -> map (deleteUnusedContact db) contactIds)
         let errs = errs1 <> mapMaybe (fmap ChatErrorStore) errs2
         unless (null errs) $ toView $ CRChatErrors (Just user) errs
         deleteAgentConnectionsAsync user $ concat connIds
@@ -1132,7 +1135,7 @@ processChatCommand' vr = \case
       (SndMessage {msgId}, _) <- sendDirectContactMessage user ct (XCallEnd callId)
       updateCallItemStatus user ct call WCSDisconnected $ Just msgId
       pure Nothing
-  APIGetCallInvitations -> withUser $ \_ -> do
+  APIGetCallInvitations -> withUser $ \_ -> lift $ do
     calls <- asks currentCalls >>= readTVarIO
     let invs = mapMaybe callInvitation $ M.elems calls
     rcvCallInvitations <- rights <$> mapM rcvCallInvitation invs
@@ -1193,12 +1196,12 @@ processChatCommand' vr = \case
     withChatLock "setUserSMPServers" $ do
       withStore $ \db -> overwriteProtocolServers db user servers
       cfg <- asks config
-      withAgent $ \a -> setProtocolServers a (aUserId user) $ activeAgentServers cfg p servers
+      lift $ withAgent' $ \a -> setProtocolServers a (aUserId user) $ activeAgentServers cfg p servers
       ok user
   SetUserProtoServers serversConfig -> withUser $ \User {userId} ->
     processChatCommand $ APISetUserProtoServers userId serversConfig
   APITestProtoServer userId srv@(AProtoServerWithAuth _ server) -> withUserId userId $ \user ->
-    CRServerTestResult user srv <$> withAgent (\a -> testProtocolServer a (aUserId user) server)
+    lift $ CRServerTestResult user srv <$> withAgent' (\a -> testProtocolServer a (aUserId user) server)
   TestProtoServer srv -> withUser $ \User {userId} ->
     processChatCommand $ APITestProtoServer userId srv
   APISetChatItemTTL userId newTTL_ -> withUserId userId $ \user ->
@@ -1207,15 +1210,15 @@ processChatCommand' vr = \case
         case newTTL_ of
           Nothing -> do
             withStore' $ \db -> setChatItemTTL db user newTTL_
-            setExpireCIFlag user False
+            lift $ setExpireCIFlag user False
           Just newTTL -> do
             oldTTL <- withStore' (`getChatItemTTL` user)
             when (maybe True (newTTL <) oldTTL) $ do
-              setExpireCIFlag user False
+              lift $ setExpireCIFlag user False
               expireChatItems user newTTL True
             withStore' $ \db -> setChatItemTTL db user newTTL_
-            startExpireCIThread user
-            whenM chatStarted $ setExpireCIFlag user True
+            lift $ startExpireCIThread user
+            lift . whenM chatStarted $ setExpireCIFlag user True
         ok user
   SetChatItemTTL newTTL_ -> withUser' $ \User {userId} -> do
     processChatCommand $ APISetChatItemTTL userId newTTL_
@@ -1224,10 +1227,10 @@ processChatCommand' vr = \case
     pure $ CRChatItemTTL user ttl
   GetChatItemTTL -> withUser' $ \User {userId} -> do
     processChatCommand $ APIGetChatItemTTL userId
-  APISetNetworkConfig cfg -> withUser' $ \_ -> withAgent (`setNetworkConfig` cfg) >> ok_
+  APISetNetworkConfig cfg -> withUser' $ \_ -> lift (withAgent' (`setNetworkConfig` cfg)) >> ok_
   APIGetNetworkConfig -> withUser' $ \_ ->
-    CRNetworkConfig <$> withAgent getNetworkConfig
-  ReconnectAllServers -> withUser' $ \_ -> withAgent reconnectAllServers >> ok_
+    lift $ CRNetworkConfig <$> withAgent' getNetworkConfig
+  ReconnectAllServers -> withUser' $ \_ -> lift (withAgent' reconnectAllServers) >> ok_
   APISetChatSettings (ChatRef cType chatId) chatSettings -> withUser $ \user -> case cType of
     CTDirect -> do
       ct <- withStore $ \db -> do
@@ -1429,7 +1432,7 @@ processChatCommand' vr = \case
     incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
     let profileToSend = userProfileToSend user incognitoProfile Nothing False
     pqSup <- chatReadVar pqExperimentalEnabled
-    withAgent' (\a -> connRequestPQSupport a pqSup cReq) >>= \case
+    lift (withAgent' $ \a -> connRequestPQSupport a pqSup cReq) >>= \case
       Nothing -> throwChatError CEInvalidConnReq
       -- TODO PQ the error above should be CEIncompatibleConnReqVersion, also the same API should be called in Plan
       Just (agentV, pqSup') -> do
@@ -1563,19 +1566,40 @@ processChatCommand' vr = \case
     processChatCommand . APISendMessage chatRef True Nothing $ ComposedMessage Nothing Nothing mc
   SendMessageBroadcast msg -> withUser $ \user -> do
     contacts <- withStore' $ \db -> getUserContacts db vr user
-    let cts = filter (\ct -> contactReady ct && contactActive ct && directOrUsed ct) contacts
-    ChatConfig {logLevel} <- asks config
     withChatLock "sendMessageBroadcast" . procCmd $ do
-      (successes, failures) <- foldM (sendAndCount user logLevel) (0, 0) cts
-      timestamp <- liftIO getCurrentTime
-      pure CRBroadcastSent {user, msgContent = mc, successes, failures, timestamp}
+      let ctConns_ = L.nonEmpty $ foldr addContactConn [] contacts
+      case ctConns_ of
+        Nothing -> do
+          timestamp <- liftIO getCurrentTime
+          pure CRBroadcastSent {user, msgContent = mc, successes = 0, failures = 0, timestamp}
+        Just (ctConns :: NonEmpty (Contact, Connection)) -> do
+          let idsEvts = L.map ctSndEvent ctConns
+          sndMsgs <- lift $ createSndMessages idsEvts
+          let msgReqs_ :: NonEmpty (Either ChatError MsgReq) = L.zipWith (fmap . ctMsgReq) ctConns sndMsgs
+          (errs, ctSndMsgs :: [(Contact, SndMessage)]) <-
+            lift $ partitionEithers . L.toList . zipWith3' combineResults ctConns sndMsgs <$> deliverMessagesB msgReqs_
+          timestamp <- liftIO getCurrentTime
+          lift . void $ withStoreBatch' $ \db -> map (createCI db user timestamp) ctSndMsgs
+          pure CRBroadcastSent {user, msgContent = mc, successes = length ctSndMsgs, failures = length errs, timestamp}
     where
       mc = MCText msg
-      sendAndCount user ll (s, f) ct =
-        (sendToContact user ct $> (s + 1, f)) `catchChatError` \e -> when (ll <= CLLInfo) (toView $ CRChatError (Just user) e) $> (s, f + 1)
-      sendToContact user ct = do
-        (sndMsg, _) <- sendDirectContactMessage user ct (XMsgNew $ MCSimple (extMsgContent mc Nothing))
-        void $ saveSndChatItem user (CDDirectSnd ct) sndMsg (CISndMsgContent mc)
+      addContactConn :: Contact -> [(Contact, Connection)] -> [(Contact, Connection)]
+      addContactConn ct ctConns = case contactSendConn_ ct of
+        Right conn | directOrUsed ct -> (ct, conn) : ctConns
+        _ -> ctConns
+      ctSndEvent :: (Contact, Connection) -> (ConnOrGroupId, PQSupport, ChatMsgEvent 'Json)
+      ctSndEvent (_, Connection {connId, pqSupport}) = (ConnectionId connId, pqSupport, XMsgNew $ MCSimple (extMsgContent mc Nothing))
+      ctMsgReq :: (Contact, Connection) -> SndMessage -> MsgReq
+      ctMsgReq (_, conn) SndMessage {msgId, msgBody} = (conn, MsgFlags {notification = hasNotification XMsgNew_}, msgBody, msgId)
+      zipWith3' :: (a -> b -> c -> d) -> NonEmpty a -> NonEmpty b -> NonEmpty c -> NonEmpty d
+      zipWith3' f ~(x :| xs) ~(y :| ys) ~(z :| zs) = f x y z :| zipWith3 f xs ys zs
+      combineResults :: (Contact, Connection) -> Either ChatError SndMessage -> Either ChatError (Int64, PQEncryption) -> Either ChatError (Contact, SndMessage)
+      combineResults (ct, _) (Right msg') (Right _) = Right (ct, msg')
+      combineResults _ (Left e) _ = Left e
+      combineResults _ _ (Left e) = Left e
+      createCI :: DB.Connection -> User -> UTCTime -> (Contact, SndMessage) -> IO ()
+      createCI db user createdAt (ct, sndMsg) =
+        void $ createNewSndChatItem db user (CDDirectSnd ct) sndMsg (CISndMsgContent mc) Nothing Nothing False createdAt
   SendMessageQuote cName (AMsgDirection msgDir) quotedMsg msg -> withUser $ \user@User {userId} -> do
     contactId <- withStore $ \db -> getContactIdByName db user cName
     quotedItemId <- withStore $ \db -> getDirectChatItemIdByText db userId contactId msgDir quotedMsg
@@ -1821,7 +1845,7 @@ processChatCommand' vr = \case
         -- [incognito] reuse membership incognito profile
         ct <- withStore' $ \db -> createMemberContact db user connId cReq g m mConn subMode
         -- TODO not sure it is correct to set connections status here?
-        setContactNetworkStatus ct NSConnected
+        lift $ setContactNetworkStatus ct NSConnected
         pure $ CRNewMemberContact user ct g m
       _ -> throwChatError CEGroupMemberNotActive
   APISendMemberContactInvitation contactId msgContent_ -> withUser $ \user -> do
@@ -1898,7 +1922,7 @@ processChatCommand' vr = \case
       _ -> processChatCommand . APISendMessage chatRef False Nothing $ ComposedMessage (Just f) Nothing (MCFile "")
   SendImage chatName f@(CryptoFile fPath _) -> withUser $ \user -> do
     chatRef <- getChatRef user chatName
-    filePath <- toFSFilePath fPath
+    filePath <- lift $ toFSFilePath fPath
     unless (any (`isSuffixOf` map toLower fPath) imageExtensions) $ throwChatError CEFileImageType {filePath}
     fileSize <- getFileSize filePath
     unless (fileSize <= maxImageSize) $ throwChatError CEFileImageSize {filePath}
@@ -1953,10 +1977,10 @@ processChatCommand' vr = \case
                 pure $ CRRcvFileCancelled user ci ftr
               Just XFTPRcvFile {agentRcvFileId} -> do
                 forM_ (liveRcvFileTransferPath ftr) $ \filePath -> do
-                  fsFilePath <- toFSFilePath filePath
+                  fsFilePath <- lift $ toFSFilePath filePath
                   liftIO $ removeFile fsFilePath `catchAll_` pure ()
-                forM_ agentRcvFileId $ \(AgentRcvFileId aFileId) ->
-                  withAgent (`xftpDeleteRcvFile` aFileId)
+                lift . forM_ agentRcvFileId $ \(AgentRcvFileId aFileId) ->
+                  withAgent' (`xftpDeleteRcvFile` aFileId)
                 ci <- withStore $ \db -> do
                   liftIO $ do
                     updateCIFileStatus db user fileId CIFSRcvInvitation
@@ -2032,7 +2056,7 @@ processChatCommand' vr = \case
   ListRemoteCtrls -> withUser_ $ CRRemoteCtrlList <$> listRemoteCtrls
   DeleteRemoteCtrl rc -> withUser_ $ deleteRemoteCtrl rc >> ok_
   APIUploadStandaloneFile userId file@CryptoFile {filePath} -> withUserId userId $ \user -> do
-    fsFilePath <- toFSFilePath filePath
+    fsFilePath <- lift $ toFSFilePath filePath
     fileSize <- liftIO $ CF.getFileContentsSize file {filePath = fsFilePath}
     when (fileSize > toInteger maxFileSizeHard) $ throwChatError $ CEFileSize filePath
     (_, _, fileTransferMeta) <- xftpSndFileTransfer_ user file fileSize 1 Nothing
@@ -2048,18 +2072,18 @@ processChatCommand' vr = \case
     chatMigrations <- map upMigration <$> withStore' (Migrations.getCurrent . DB.conn)
     agentMigrations <- withAgent getAgentMigrations
     pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations}
-  DebugLocks -> do
+  DebugLocks -> lift $ do
     chatLockName <- atomically . tryReadTMVar =<< asks chatLock
-    agentLocks <- withAgent debugAgentLocks
+    agentLocks <- withAgent' debugAgentLocks
     pure CRDebugLocks {chatLockName, agentLocks}
-  GetAgentWorkers -> CRAgentWorkersSummary <$> withAgent getAgentWorkersSummary
-  GetAgentWorkersDetails -> CRAgentWorkersDetails <$> withAgent getAgentWorkersDetails
-  GetAgentStats -> CRAgentStats . map stat <$> withAgent getAgentStats
+  GetAgentWorkers -> lift $ CRAgentWorkersSummary <$> withAgent' getAgentWorkersSummary
+  GetAgentWorkersDetails -> lift $ CRAgentWorkersDetails <$> withAgent' getAgentWorkersDetails
+  GetAgentStats -> lift $ CRAgentStats . map stat <$> withAgent' getAgentStats
     where
       stat (AgentStatsKey {host, clientTs, cmd, res}, count) =
         map B.unpack [host, clientTs, cmd, res, bshow count]
-  ResetAgentStats -> withAgent resetAgentStats >> ok_
-  GetAgentSubs -> summary <$> withAgent getAgentSubscriptions
+  ResetAgentStats -> lift (withAgent' resetAgentStats) >> ok_
+  GetAgentSubs -> lift $ summary <$> withAgent' getAgentSubscriptions
     where
       summary SubscriptionsInfo {activeSubscriptions, pendingSubscriptions, removedSubscriptions} =
         CRAgentSubs
@@ -2072,7 +2096,10 @@ processChatCommand' vr = \case
           accSubErrors m = \case
             SubInfo {server, subError = Just e} -> M.alter (Just . maybe [e] (e :)) server m
             _ -> m
-  GetAgentSubsDetails -> CRAgentSubsDetails <$> withAgent getAgentSubscriptions
+  GetAgentSubsDetails -> lift $ CRAgentSubsDetails <$> withAgent' getAgentSubscriptions
+  -- CustomChatCommand is unsupported, it can be processed in preCmdHook
+  -- in a modified CLI app or core - the hook should return Either ChatResponse ChatCommand
+  CustomChatCommand _cmd -> withUser $ \user -> pure $ chatCmdError (Just user) "not supported"
   where
     withChatLock name action = asks chatLock >>= \l -> withLock l name action
     -- below code would make command responses asynchronous where they can be slow
@@ -2086,11 +2113,11 @@ processChatCommand' vr = \case
     --       (atomically . writeTBQueue q) . (Just corrId,) =<< (action `catchChatError` (pure . CRChatError))
     --   pure $ CRCmdAccepted corrId
     -- use function below to make commands "synchronous"
-    procCmd :: m ChatResponse -> m ChatResponse
+    procCmd :: CM ChatResponse -> CM ChatResponse
     procCmd = id
     ok_ = pure $ CRCmdOk Nothing
     ok = pure . CRCmdOk . Just
-    getChatRef :: User -> ChatName -> m ChatRef
+    getChatRef :: User -> ChatName -> CM ChatRef
     getChatRef user (ChatName cType name) =
       ChatRef cType <$> case cType of
         CTDirect -> withStore $ \db -> getContactIdByName db user name
@@ -2099,25 +2126,25 @@ processChatCommand' vr = \case
           | name == "" -> withStore (`getUserNoteFolderId` user)
           | otherwise -> throwChatError $ CECommandError "not supported"
         _ -> throwChatError $ CECommandError "not supported"
-    checkChatStopped :: m ChatResponse -> m ChatResponse
+    checkChatStopped :: CM ChatResponse -> CM ChatResponse
     checkChatStopped a = asks agentAsync >>= readTVarIO >>= maybe a (const $ throwChatError CEChatNotStopped)
-    setStoreChanged :: m ()
+    setStoreChanged :: CM ()
     setStoreChanged = asks chatStoreChanged >>= atomically . (`writeTVar` True)
-    withStoreChanged :: m () -> m ChatResponse
+    withStoreChanged :: CM () -> CM ChatResponse
     withStoreChanged a = checkChatStopped $ a >> setStoreChanged >> ok_
-    checkStoreNotChanged :: m ChatResponse -> m ChatResponse
+    checkStoreNotChanged :: CM ChatResponse -> CM ChatResponse
     checkStoreNotChanged = ifM (asks chatStoreChanged >>= readTVarIO) (throwChatError CEChatStoreChanged)
-    withUserName :: UserName -> (UserId -> ChatCommand) -> m ChatResponse
+    withUserName :: UserName -> (UserId -> ChatCommand) -> CM ChatResponse
     withUserName uName cmd = withStore (`getUserIdByName` uName) >>= processChatCommand . cmd
-    withContactName :: ContactName -> (ContactId -> ChatCommand) -> m ChatResponse
+    withContactName :: ContactName -> (ContactId -> ChatCommand) -> CM ChatResponse
     withContactName cName cmd = withUser $ \user ->
       withStore (\db -> getContactIdByName db user cName) >>= processChatCommand . cmd
-    withMemberName :: GroupName -> ContactName -> (GroupId -> GroupMemberId -> ChatCommand) -> m ChatResponse
+    withMemberName :: GroupName -> ContactName -> (GroupId -> GroupMemberId -> ChatCommand) -> CM ChatResponse
     withMemberName gName mName cmd = withUser $ \user ->
       getGroupAndMemberId user gName mName >>= processChatCommand . uncurry cmd
-    getConnectionCode :: ConnId -> m Text
+    getConnectionCode :: ConnId -> CM Text
     getConnectionCode connId = verificationCode <$> withAgent (`getConnectionRatchetAdHash` connId)
-    verifyConnectionCode :: User -> Connection -> Maybe Text -> m ChatResponse
+    verifyConnectionCode :: User -> Connection -> Maybe Text -> CM ChatResponse
     verifyConnectionCode user conn@Connection {connId} (Just code) = do
       code' <- getConnectionCode $ aConnId conn
       let verified = sameVerificationCode code code'
@@ -2127,19 +2154,19 @@ processChatCommand' vr = \case
       code' <- getConnectionCode $ aConnId conn
       withStore' $ \db -> setConnectionVerified db user connId Nothing
       pure $ CRConnectionVerified user False code'
-    getSentChatItemIdByText :: User -> ChatRef -> Text -> m Int64
+    getSentChatItemIdByText :: User -> ChatRef -> Text -> CM Int64
     getSentChatItemIdByText user@User {userId, localDisplayName} (ChatRef cType cId) msg = case cType of
       CTDirect -> withStore $ \db -> getDirectChatItemIdByText db userId cId SMDSnd msg
       CTGroup -> withStore $ \db -> getGroupChatItemIdByText db user cId (Just localDisplayName) msg
       CTLocal -> withStore $ \db -> getLocalChatItemIdByText db user cId SMDSnd msg
       _ -> throwChatError $ CECommandError "not supported"
-    getChatItemIdByText :: User -> ChatRef -> Text -> m Int64
+    getChatItemIdByText :: User -> ChatRef -> Text -> CM Int64
     getChatItemIdByText user (ChatRef cType cId) msg = case cType of
       CTDirect -> withStore $ \db -> getDirectChatItemIdByText' db user cId msg
       CTGroup -> withStore $ \db -> getGroupChatItemIdByText' db user cId msg
       CTLocal -> withStore $ \db -> getLocalChatItemIdByText' db user cId msg
       _ -> throwChatError $ CECommandError "not supported"
-    connectViaContact :: User -> IncognitoEnabled -> ConnectionRequestUri 'CMContact -> m ChatResponse
+    connectViaContact :: User -> IncognitoEnabled -> ConnectionRequestUri 'CMContact -> CM ChatResponse
     connectViaContact user@User {userId} incognito cReq@(CRContactUri ConnReqUriData {crClientData}) = withChatLock "connectViaContact" $ do
       let groupLinkId = crClientData >>= decodeJSON >>= \(CRDataGroup gli) -> Just gli
           cReqHash = ConnReqUriHash . C.sha256Hash $ strEncode cReq
@@ -2169,7 +2196,7 @@ processChatCommand' vr = \case
           (connId, incognitoProfile, subMode, chatV) <- requestContact user incognito cReq xContactId inGroup pqSup
           conn <- withStore' $ \db -> createConnReqConnection db userId connId cReqHash xContactId incognitoProfile groupLinkId subMode chatV pqSup
           pure $ CRSentInvitation user conn incognitoProfile
-    connectContactViaAddress :: User -> IncognitoEnabled -> Contact -> ConnectionRequestUri 'CMContact -> m ChatResponse
+    connectContactViaAddress :: User -> IncognitoEnabled -> Contact -> ConnectionRequestUri 'CMContact -> CM ChatResponse
     connectContactViaAddress user incognito ct cReq =
       withChatLock "connectViaContact" $ do
         newXContactId <- XContactId <$> drgRandomBytes 16
@@ -2178,7 +2205,7 @@ processChatCommand' vr = \case
         let cReqHash = ConnReqUriHash . C.sha256Hash $ strEncode cReq
         ct' <- withStore $ \db -> createAddressContactConnection db vr user ct connId cReqHash newXContactId incognitoProfile subMode chatV pqSup
         pure $ CRSentInvitationToContact user ct' incognitoProfile
-    requestContact :: User -> IncognitoEnabled -> ConnectionRequestUri 'CMContact -> XContactId -> Bool -> PQSupport -> m (ConnId, Maybe Profile, SubscriptionMode, VersionChat)
+    requestContact :: User -> IncognitoEnabled -> ConnectionRequestUri 'CMContact -> XContactId -> Bool -> PQSupport -> CM (ConnId, Maybe Profile, SubscriptionMode, VersionChat)
     requestContact user incognito cReq xContactId inGroup pqSup = do
       -- [incognito] generate profile to send
       incognitoProfile <- if incognito then Just <$> liftIO generateRandomProfile else pure Nothing
@@ -2186,7 +2213,7 @@ processChatCommand' vr = \case
       -- 0) toggle disabled - PQSupportOff
       -- 1) toggle enabled, address supports PQ (connRequestPQSupport returns Just True) - PQSupportOn, enable support with compression
       -- 2) toggle enabled, address doesn't support PQ - PQSupportOn but without compression, with version range indicating support
-      withAgent' (\a -> connRequestPQSupport a pqSup cReq) >>= \case
+      lift (withAgent' $ \a -> connRequestPQSupport a pqSup cReq) >>= \case
         Nothing -> throwChatError CEInvalidConnReq
         Just (agentV, _) -> do
           let chatV = agentToChatVersion agentV
@@ -2198,16 +2225,16 @@ processChatCommand' vr = \case
     contactMember Contact {contactId} =
       find $ \GroupMember {memberContactId = cId, memberStatus = s} ->
         cId == Just contactId && s /= GSMemRemoved && s /= GSMemLeft
-    checkSndFile :: CryptoFile -> m Integer
+    checkSndFile :: CryptoFile -> CM Integer
     checkSndFile (CryptoFile f cfArgs) = do
-      fsFilePath <- toFSFilePath f
+      fsFilePath <- lift $ toFSFilePath f
       unlessM (doesFileExist fsFilePath) . throwChatError $ CEFileNotFound f
       fileSize <- liftIO $ CF.getFileContentsSize $ CryptoFile fsFilePath cfArgs
       when (fromInteger fileSize > maxFileSize) $ throwChatError $ CEFileSize f
       pure fileSize
-    updateProfile :: User -> Profile -> m ChatResponse
+    updateProfile :: User -> Profile -> CM ChatResponse
     updateProfile user p' = updateProfile_ user p' $ withStore $ \db -> updateUserProfile db user p'
-    updateProfile_ :: User -> Profile -> m User -> m ChatResponse
+    updateProfile_ :: User -> Profile -> CM User -> CM ChatResponse
     updateProfile_ user@User {profile = p@LocalProfile {displayName = n}} p'@Profile {displayName = n'} updateUser
       | p' == fromLocalProfile p = pure $ CRUserProfileNoChange user
       | otherwise = do
@@ -2221,12 +2248,12 @@ processChatCommand' vr = \case
             summary <- case changedCts_ of
               Nothing -> pure $ UserProfileUpdateSummary 0 0 []
               Just changedCts -> do
-                let idsEvts = L.map ctSndMsg changedCts
-                msgReqs_ <- L.zipWith ctMsgReq changedCts <$> createSndMessages idsEvts
-                (errs, cts) <- partitionEithers . L.toList . L.zipWith (second . const) changedCts <$> deliverMessagesB msgReqs_
+                let idsEvts = L.map ctSndEvent changedCts
+                msgReqs_ <- lift $ L.zipWith ctMsgReq changedCts <$> createSndMessages idsEvts
+                (errs, cts) <- lift $ partitionEithers . L.toList . L.zipWith (second . const) changedCts <$> deliverMessagesB msgReqs_
                 unless (null errs) $ toView $ CRChatErrors (Just user) errs
                 let changedCts' = filter (\ChangedProfileContact {ct, ct'} -> directOrUsed ct' && mergedPreferences ct' /= mergedPreferences ct) cts
-                createContactsSndFeatureItems user' changedCts'
+                lift $ createContactsSndFeatureItems user' changedCts'
                 pure
                   UserProfileUpdateSummary
                     { updateSuccesses = length cts,
@@ -2238,21 +2265,20 @@ processChatCommand' vr = \case
         -- [incognito] filter out contacts with whom user has incognito connections
         addChangedProfileContact :: User -> Contact -> [ChangedProfileContact] -> [ChangedProfileContact]
         addChangedProfileContact user' ct changedCts = case contactSendConn_ ct' of
-          Left _ -> changedCts
-          Right conn
-            | connIncognito conn || mergedProfile' == mergedProfile -> changedCts
-            | otherwise -> ChangedProfileContact ct ct' mergedProfile' conn : changedCts
+          Right conn | not (connIncognito conn) && mergedProfile' /= mergedProfile ->
+            ChangedProfileContact ct ct' mergedProfile' conn : changedCts
+          _ -> changedCts
           where
             mergedProfile = userProfileToSend user Nothing (Just ct) False
             ct' = updateMergedPreferences user' ct
             mergedProfile' = userProfileToSend user' Nothing (Just ct') False
-        ctSndMsg :: ChangedProfileContact -> (ConnOrGroupId, PQSupport, ChatMsgEvent 'Json)
-        ctSndMsg ChangedProfileContact {mergedProfile', conn = Connection {connId, pqSupport}} = (ConnectionId connId, pqSupport, XInfo mergedProfile')
+        ctSndEvent :: ChangedProfileContact -> (ConnOrGroupId, PQSupport, ChatMsgEvent 'Json)
+        ctSndEvent ChangedProfileContact {mergedProfile', conn = Connection {connId, pqSupport}} = (ConnectionId connId, pqSupport, XInfo mergedProfile')
         ctMsgReq :: ChangedProfileContact -> Either ChatError SndMessage -> Either ChatError MsgReq
         ctMsgReq ChangedProfileContact {conn} =
           fmap $ \SndMessage {msgId, msgBody} ->
             (conn, MsgFlags {notification = hasNotification XInfo_}, msgBody, msgId)
-    updateContactPrefs :: User -> Contact -> Preferences -> m ChatResponse
+    updateContactPrefs :: User -> Contact -> Preferences -> CM ChatResponse
     updateContactPrefs _ ct@Contact {activeConn = Nothing} _ = throwChatError $ CEContactNotActive ct
     updateContactPrefs user@User {userId} ct@Contact {activeConn = Just Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
       | contactUserPrefs == contactUserPrefs' = pure $ CRContactPrefsUpdated user ct ct
@@ -2265,9 +2291,9 @@ processChatCommand' vr = \case
           when (mergedProfile' /= mergedProfile) $
             withChatLock "updateProfile" $ do
               void (sendDirectContactMessage user ct' $ XInfo mergedProfile') `catchChatError` (toView . CRChatError (Just user))
-              when (directOrUsed ct') $ createSndFeatureItems user ct ct'
+              lift . when (directOrUsed ct') $ createSndFeatureItems user ct ct'
           pure $ CRContactPrefsUpdated user ct ct'
-    runUpdateGroupProfile :: User -> Group -> GroupProfile -> m ChatResponse
+    runUpdateGroupProfile :: User -> Group -> GroupProfile -> CM ChatResponse
     runUpdateGroupProfile user (Group g@GroupInfo {groupProfile = p@GroupProfile {displayName = n}} ms) p'@GroupProfile {displayName = n'} = do
       assertUserGroupRole g GROwner
       when (n /= n') $ checkValidName n'
@@ -2279,30 +2305,30 @@ processChatCommand' vr = \case
         toView $ CRNewChatItem user (AChatItem SCTGroup SMDSnd (GroupChat g') ci)
       createGroupFeatureChangedItems user cd CISndGroupFeature g g'
       pure $ CRGroupUpdated user g g' Nothing
-    checkValidName :: GroupName -> m ()
+    checkValidName :: GroupName -> CM ()
     checkValidName displayName = do
       when (T.null displayName) $ throwChatError CEInvalidDisplayName {displayName, validName = ""}
       let validName = T.pack $ mkValidName $ T.unpack displayName
       when (displayName /= validName) $ throwChatError CEInvalidDisplayName {displayName, validName}
-    assertUserGroupRole :: GroupInfo -> GroupMemberRole -> m ()
+    assertUserGroupRole :: GroupInfo -> GroupMemberRole -> CM ()
     assertUserGroupRole g@GroupInfo {membership} requiredRole = do
       let GroupMember {memberRole = membershipMemRole} = membership
       when (membershipMemRole < requiredRole) $ throwChatError $ CEGroupUserRole g requiredRole
       when (memberStatus membership == GSMemInvited) $ throwChatError (CEGroupNotJoined g)
       when (memberRemoved membership) $ throwChatError CEGroupMemberUserRemoved
       unless (memberActive membership) $ throwChatError CEGroupMemberNotActive
-    delGroupChatItem :: MsgDirectionI d => User -> GroupInfo -> ChatItem 'CTGroup d -> MessageId -> Maybe GroupMember -> m ChatResponse
+    delGroupChatItem :: MsgDirectionI d => User -> GroupInfo -> ChatItem 'CTGroup d -> MessageId -> Maybe GroupMember -> CM ChatResponse
     delGroupChatItem user gInfo ci msgId byGroupMember = do
       deletedTs <- liftIO getCurrentTime
       if groupFeatureAllowed SGFFullDelete gInfo
         then deleteGroupCI user gInfo ci True False byGroupMember deletedTs
         else markGroupCIDeleted user gInfo ci msgId True byGroupMember deletedTs
-    updateGroupProfileByName :: GroupName -> (GroupProfile -> GroupProfile) -> m ChatResponse
+    updateGroupProfileByName :: GroupName -> (GroupProfile -> GroupProfile) -> CM ChatResponse
     updateGroupProfileByName gName update = withUser $ \user -> do
       g@(Group GroupInfo {groupProfile = p} _) <- withStore $ \db ->
         getGroupIdByName db user gName >>= getGroup db vr user
       runUpdateGroupProfile user g $ update p
-    withCurrentCall :: ContactId -> (User -> Contact -> Call -> m (Maybe Call)) -> m ChatResponse
+    withCurrentCall :: ContactId -> (User -> Contact -> Call -> CM (Maybe Call)) -> CM ChatResponse
     withCurrentCall ctId action = do
       (user, ct) <- withStore $ \db -> do
         user <- getUserByContactId db ctId
@@ -2323,11 +2349,11 @@ processChatCommand' vr = \case
                     atomically $ TM.delete ctId calls
                 ok user
             | otherwise -> throwChatError $ CECallContact contactId
-    withServerProtocol :: ProtocolTypeI p => SProtocolType p -> (UserProtocol p => m a) -> m a
+    withServerProtocol :: ProtocolTypeI p => SProtocolType p -> (UserProtocol p => CM a) -> CM a
     withServerProtocol p action = case userProtocol p of
       Just Dict -> action
       _ -> throwChatError $ CEServerProtocol $ AProtocolType p
-    forwardFile :: ChatName -> FileTransferId -> (ChatName -> CryptoFile -> ChatCommand) -> m ChatResponse
+    forwardFile :: ChatName -> FileTransferId -> (ChatName -> CryptoFile -> ChatCommand) -> CM ChatResponse
     forwardFile chatName fileId sendCommand = withUser $ \user -> do
       withStore (\db -> getFileTransfer db user fileId) >>= \case
         FTRcv RcvFileTransfer {fileStatus = RFSComplete RcvFileInfo {filePath}, cryptoArgs} -> forward filePath cryptoArgs
@@ -2335,13 +2361,13 @@ processChatCommand' vr = \case
         _ -> throwChatError CEFileNotReceived {fileId}
       where
         forward path cfArgs = processChatCommand . sendCommand chatName $ CryptoFile path cfArgs
-    getGroupAndMemberId :: User -> GroupName -> ContactName -> m (GroupId, GroupMemberId)
+    getGroupAndMemberId :: User -> GroupName -> ContactName -> CM (GroupId, GroupMemberId)
     getGroupAndMemberId user gName groupMemberName =
       withStore $ \db -> do
         groupId <- getGroupIdByName db user gName
         groupMemberId <- getGroupMemberIdByName db user groupId groupMemberName
         pure (groupId, groupMemberId)
-    sendGrpInvitation :: User -> Contact -> GroupInfo -> GroupMember -> ConnReqInvitation -> m ()
+    sendGrpInvitation :: User -> Contact -> GroupInfo -> GroupMember -> ConnReqInvitation -> CM ()
     sendGrpInvitation user ct@Contact {localDisplayName} gInfo@GroupInfo {groupId, groupProfile, membership} GroupMember {groupMemberId, memberId, memberRole = memRole} cReq = do
       currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
       let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
@@ -2358,27 +2384,27 @@ processChatCommand' vr = \case
       let content = CISndGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
       ci <- saveSndChatItem user (CDDirectSnd ct) msg content
       toView $ CRNewChatItem user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
-    sndContactCITimed :: Bool -> Contact -> Maybe Int -> m (Maybe CITimed)
+    sndContactCITimed :: Bool -> Contact -> Maybe Int -> CM (Maybe CITimed)
     sndContactCITimed live = sndCITimed_ live . contactTimedTTL
-    sndGroupCITimed :: Bool -> GroupInfo -> Maybe Int -> m (Maybe CITimed)
+    sndGroupCITimed :: Bool -> GroupInfo -> Maybe Int -> CM (Maybe CITimed)
     sndGroupCITimed live = sndCITimed_ live . groupTimedTTL
-    sndCITimed_ :: Bool -> Maybe (Maybe Int) -> Maybe Int -> m (Maybe CITimed)
+    sndCITimed_ :: Bool -> Maybe (Maybe Int) -> Maybe Int -> CM (Maybe CITimed)
     sndCITimed_ live chatTTL itemTTL =
       forM (chatTTL >>= (itemTTL <|>)) $ \ttl ->
         CITimed ttl
           <$> if live
             then pure Nothing
             else Just . addUTCTime (realToFrac ttl) <$> liftIO getCurrentTime
-    drgRandomBytes :: Int -> m ByteString
+    drgRandomBytes :: Int -> CM ByteString
     drgRandomBytes n = asks random >>= atomically . C.randomBytes n
-    privateGetUser :: UserId -> m User
+    privateGetUser :: UserId -> CM User
     privateGetUser userId =
       tryChatError (withStore (`getUser` userId)) >>= \case
         Left _ -> throwChatError CEUserUnknown
         Right user -> pure user
-    validateUserPassword :: User -> User -> Maybe UserPwd -> m ()
+    validateUserPassword :: User -> User -> Maybe UserPwd -> CM ()
     validateUserPassword = validateUserPassword_ . Just
-    validateUserPassword_ :: Maybe User -> User -> Maybe UserPwd -> m ()
+    validateUserPassword_ :: Maybe User -> User -> Maybe UserPwd -> CM ()
     validateUserPassword_ user_ User {userId = userId', viewPwdHash} viewPwd_ =
       forM_ viewPwdHash $ \pwdHash ->
         let userId_ = (\User {userId} -> userId) <$> user_
@@ -2389,13 +2415,13 @@ processChatCommand' vr = \case
     validPassword :: Text -> UserPwdHash -> Bool
     validPassword pwd UserPwdHash {hash = B64UrlByteString hash, salt = B64UrlByteString salt} =
       hash == C.sha512Hash (encodeUtf8 pwd <> salt)
-    setUserNotifications :: UserId -> Bool -> m ChatResponse
+    setUserNotifications :: UserId -> Bool -> CM ChatResponse
     setUserNotifications userId' showNtfs = withUser $ \user -> do
       user' <- privateGetUser userId'
       case viewPwdHash user' of
         Just _ -> throwChatError $ CEHiddenUserAlwaysMuted userId'
         _ -> setUserPrivacy user user' {showNtfs}
-    setUserPrivacy :: User -> User -> m ChatResponse
+    setUserPrivacy :: User -> User -> CM ChatResponse
     setUserPrivacy user@User {userId} user'@User {userId = userId'}
       | userId == userId' = do
           asks currentUser >>= atomically . (`writeTVar` Just user')
@@ -2404,12 +2430,12 @@ processChatCommand' vr = \case
       | otherwise = do
           withStore' (`updateUserPrivacy` user')
           pure $ CRUserPrivacy {user, updatedUser = user'}
-    checkDeleteChatUser :: User -> m ()
+    checkDeleteChatUser :: User -> CM ()
     checkDeleteChatUser user@User {userId} = do
       users <- withStore' getUsers
       let otherVisible = filter (\User {userId = userId', viewPwdHash} -> userId /= userId' && isNothing viewPwdHash) users
       when (activeUser user && length otherVisible > 0) $ throwChatError (CECantDeleteActiveUser userId)
-    deleteChatUser :: User -> Bool -> m ChatResponse
+    deleteChatUser :: User -> Bool -> CM ChatResponse
     deleteChatUser user delSMPQueues = do
       filesInfo <- withStore' (`getUserFileInfo` user)
       cancelFilesInProgress user filesInfo
@@ -2418,7 +2444,7 @@ processChatCommand' vr = \case
       withStore' (`deleteUserRecord` user)
       when (activeUser user) $ chatWriteVar currentUser Nothing
       ok_
-    updateChatSettings :: ChatName -> (ChatSettings -> ChatSettings) -> m ChatResponse
+    updateChatSettings :: ChatName -> (ChatSettings -> ChatSettings) -> CM ChatResponse
     updateChatSettings (ChatName cType name) updateSettings = withUser $ \user -> do
       (chatId, chatSettings) <- case cType of
         CTDirect -> withStore $ \db -> do
@@ -2432,7 +2458,7 @@ processChatCommand' vr = \case
             pure (gId, chatSettings)
         _ -> throwChatError $ CECommandError "not supported"
       processChatCommand $ APISetChatSettings (ChatRef cType chatId) $ updateSettings chatSettings
-    connectPlan :: User -> AConnectionRequestUri -> m ConnectionPlan
+    connectPlan :: User -> AConnectionRequestUri -> CM ConnectionPlan
     connectPlan user (ACR SCMInvitation (CRInvitationUri crData e2e)) = do
       withStore' (\db -> getConnectionEntityByConnReq db vr user cReqSchemas) >>= \case
         Nothing -> pure $ CPInvitationLink ILPOk
@@ -2510,7 +2536,7 @@ processChatCommand' vr = \case
               updateDirectChatItemView user ct itemId aciContent False Nothing
         _ -> pure () -- prohibited
 
-toggleNtf :: ChatMonad m => User -> GroupMember -> Bool -> m ()
+toggleNtf :: User -> GroupMember -> Bool -> CM ()
 toggleNtf user m ntfOn =
   when (memberActive m) $
     forM_ (memberConnId m) $ \connId ->
@@ -2523,7 +2549,7 @@ data ChangedProfileContact = ChangedProfileContact
     conn :: Connection
   }
 
-prepareGroupMsg :: forall m. ChatMonad m => User -> GroupInfo -> MsgContent -> Maybe ChatItemId -> Maybe FileInvitation -> Maybe CITimed -> Bool -> m (MsgContainer, Maybe (CIQuote 'CTGroup))
+prepareGroupMsg :: User -> GroupInfo -> MsgContent -> Maybe ChatItemId -> Maybe FileInvitation -> Maybe CITimed -> Bool -> CM (MsgContainer, Maybe (CIQuote 'CTGroup))
 prepareGroupMsg user GroupInfo {groupId, membership} mc quotedItemId_ fInv_ timed_ live = case quotedItemId_ of
   Nothing -> pure (MCSimple (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Nothing)
   Just quotedItemId -> do
@@ -2535,7 +2561,7 @@ prepareGroupMsg user GroupInfo {groupId, membership} mc quotedItemId_ fInv_ time
         quotedItem = CIQuote {chatDir = qd, itemId = Just quotedItemId, sharedMsgId = itemSharedMsgId, sentAt = itemTs, content = qmc, formattedText}
     pure (MCQuote QuotedMsg {msgRef, content = qmc} (ExtMsgContent mc fInv_ (ttl' <$> timed_) (justTrue live)), Just quotedItem)
   where
-    quoteData :: ChatItem c d -> GroupMember -> m (MsgContent, CIQDirection 'CTGroup, Bool, GroupMember)
+    quoteData :: ChatItem c d -> GroupMember -> CM (MsgContent, CIQDirection 'CTGroup, Bool, GroupMember)
     quoteData ChatItem {meta = CIMeta {itemDeleted = Just _}} _ = throwChatError CEInvalidQuote
     quoteData ChatItem {chatDir = CIGroupSnd, content = CISndMsgContent qmc} membership' = pure (qmc, CIQGroupSnd, True, membership')
     quoteData ChatItem {chatDir = CIGroupRcv m, content = CIRcvMsgContent qmc} _ = pure (qmc, CIQGroupRcv $ Just m, False, m)
@@ -2567,7 +2593,7 @@ quoteContent mc qmc ciFile_
     qFileName = maybe qText (T.pack . getFileName) ciFile_
     qTextOrFile = if T.null qText then qFileName else qText
 
-assertDirectAllowed :: ChatMonad m => User -> MsgDirection -> Contact -> CMEventTag e -> m ()
+assertDirectAllowed :: User -> MsgDirection -> Contact -> CMEventTag e -> CM ()
 assertDirectAllowed user dir ct event =
   unless (allowedChatEvent || anyDirectOrUsed ct) . unlessM directMessagesAllowed $
     throwChatError (CEDirectMessagesProhibited dir ct)
@@ -2587,12 +2613,12 @@ roundedFDCount n
   | n <= 0 = 4
   | otherwise = max 4 $ fromIntegral $ (2 :: Integer) ^ (ceiling (logBase 2 (fromIntegral n) :: Double) :: Integer)
 
-startExpireCIThread :: forall m. ChatMonad' m => User -> m ()
+startExpireCIThread :: User -> CM' ()
 startExpireCIThread user@User {userId} = do
   expireThreads <- asks expireCIThreads
   atomically (TM.lookup userId expireThreads) >>= \case
     Nothing -> do
-      a <- Just <$> async (void $ runExceptT runExpireCIs)
+      a <- Just <$> async runExpireCIs
       atomically $ TM.insert userId a expireThreads
     _ -> pure ()
   where
@@ -2601,37 +2627,37 @@ startExpireCIThread user@User {userId} = do
       liftIO $ threadDelay' delay
       interval <- asks $ ciExpirationInterval . config
       forever $ do
-        flip catchChatError (toView . CRChatError (Just user)) $ do
+        flip catchChatError' (toView' . CRChatError (Just user)) $ do
           expireFlags <- asks expireCIFlags
           atomically $ TM.lookup userId expireFlags >>= \b -> unless (b == Just True) retry
-          waitChatStartedAndActivated
+          lift waitChatStartedAndActivated
           ttl <- withStore' (`getChatItemTTL` user)
           forM_ ttl $ \t -> expireChatItems user t False
         liftIO $ threadDelay' interval
 
-setExpireCIFlag :: ChatMonad' m => User -> Bool -> m ()
+setExpireCIFlag :: User -> Bool -> CM' ()
 setExpireCIFlag User {userId} b = do
   expireFlags <- asks expireCIFlags
   atomically $ TM.insert userId b expireFlags
 
-setAllExpireCIFlags :: ChatMonad' m => Bool -> m ()
+setAllExpireCIFlags :: Bool -> CM' ()
 setAllExpireCIFlags b = do
   expireFlags <- asks expireCIFlags
   atomically $ do
     keys <- M.keys <$> readTVar expireFlags
     forM_ keys $ \k -> TM.insert k b expireFlags
 
-cancelFilesInProgress :: forall m. ChatMonad m => User -> [CIFileInfo] -> m ()
+cancelFilesInProgress :: User -> [CIFileInfo] -> CM ()
 cancelFilesInProgress user filesInfo = do
   let filesInfo' = filter (not . fileEnded) filesInfo
-  (sfs, rfs) <- splitFTTypes <$> withStoreBatch (\db -> map (getFT db) filesInfo')
-  forM_ rfs $ \RcvFileTransfer {fileId} -> closeFileHandle fileId rcvFiles `catchChatError` \_ -> pure ()
-  void . withStoreBatch' $ \db -> map (updateSndFileCancelled db) sfs
-  void . withStoreBatch' $ \db -> map (updateRcvFileCancelled db) rfs
+  (sfs, rfs) <- lift $ splitFTTypes <$> withStoreBatch (\db -> map (getFT db) filesInfo')
+  forM_ rfs $ \RcvFileTransfer {fileId} -> lift (closeFileHandle fileId rcvFiles) `catchChatError` \_ -> pure ()
+  lift . void . withStoreBatch' $ \db -> map (updateSndFileCancelled db) sfs
+  lift . void . withStoreBatch' $ \db -> map (updateRcvFileCancelled db) rfs
   let xsfIds = mapMaybe (\(FileTransferMeta {fileId, xftpSndFile}, _) -> (,fileId) <$> xftpSndFile) sfs
       xrfIds = mapMaybe (\RcvFileTransfer {fileId, xftpRcvFile} -> (,fileId) <$> xftpRcvFile) rfs
-  agentXFTPDeleteSndFilesRemote user xsfIds
-  agentXFTPDeleteRcvFiles xrfIds
+  lift $ agentXFTPDeleteSndFilesRemote user xsfIds
+  lift $ agentXFTPDeleteRcvFiles xrfIds
   let smpSFConnIds = concatMap (\(ft, sfts) -> mapMaybe (smpSndFileConnId ft) sfts) sfs
       smpRFConnIds = mapMaybe smpRcvFileConnId rfs
   deleteAgentConnectionsAsync user smpSFConnIds
@@ -2673,7 +2699,7 @@ cancelFilesInProgress user filesInfo = do
       | otherwise = Nothing
     sndFTEnded SndFileTransfer {fileStatus} = fileStatus == FSCancelled || fileStatus == FSComplete
 
-deleteFilesLocally :: forall m. ChatMonad m => [CIFileInfo] -> m ()
+deleteFilesLocally :: [CIFileInfo] -> CM ()
 deleteFilesLocally files =
   withFilesFolder $ \filesFolder ->
     liftIO . forM_ files $ \CIFileInfo {filePath} ->
@@ -2684,20 +2710,20 @@ deleteFilesLocally files =
       removeFile fPath `catchAll` \_ ->
         removePathForcibly fPath `catchAll_` pure ()
     -- perform an action only if filesFolder is set (i.e. on mobile devices)
-    withFilesFolder :: (FilePath -> m ()) -> m ()
+    withFilesFolder :: (FilePath -> CM ()) -> CM ()
     withFilesFolder action = asks filesFolder >>= readTVarIO >>= mapM_ action
 
-updateCallItemStatus :: ChatMonad m => User -> Contact -> Call -> WebRTCCallStatus -> Maybe MessageId -> m ()
+updateCallItemStatus :: User -> Contact -> Call -> WebRTCCallStatus -> Maybe MessageId -> CM ()
 updateCallItemStatus user ct Call {chatItemId} receivedStatus msgId_ = do
   aciContent_ <- callStatusItemContent user ct chatItemId receivedStatus
   forM_ aciContent_ $ \aciContent -> updateDirectChatItemView user ct chatItemId aciContent False msgId_
 
-updateDirectChatItemView :: ChatMonad m => User -> Contact -> ChatItemId -> ACIContent -> Bool -> Maybe MessageId -> m ()
+updateDirectChatItemView :: User -> Contact -> ChatItemId -> ACIContent -> Bool -> Maybe MessageId -> CM ()
 updateDirectChatItemView user ct chatItemId (ACIContent msgDir ciContent) live msgId_ = do
   ci' <- withStore $ \db -> updateDirectChatItem db user ct chatItemId ciContent live msgId_
   toView $ CRChatItemUpdated user (AChatItem SCTDirect msgDir (DirectChat ct) ci')
 
-callStatusItemContent :: ChatMonad m => User -> Contact -> ChatItemId -> WebRTCCallStatus -> m (Maybe ACIContent)
+callStatusItemContent :: User -> Contact -> ChatItemId -> WebRTCCallStatus -> CM (Maybe ACIContent)
 callStatusItemContent user Contact {contactId} chatItemId receivedStatus = do
   CChatItem msgDir ChatItem {meta = CIMeta {updatedAt}, content} <-
     withStore $ \db -> getDirectChatItem db user contactId chatItemId
@@ -2729,17 +2755,17 @@ callStatusItemContent user Contact {contactId} chatItemId receivedStatus = do
 -- mobile clients use file paths relative to app directory (e.g. for the reason ios app directory changes on updates),
 -- so we have to differentiate between the file path stored in db and communicated with frontend, and the file path
 -- used during file transfer for actual operations with file system
-toFSFilePath :: ChatMonad' m => FilePath -> m FilePath
+toFSFilePath :: FilePath -> CM' FilePath
 toFSFilePath f =
   maybe f (</> f) <$> (readTVarIO =<< asks filesFolder)
 
-setFileToEncrypt :: ChatMonad m => RcvFileTransfer -> m RcvFileTransfer
+setFileToEncrypt :: RcvFileTransfer -> CM RcvFileTransfer
 setFileToEncrypt ft@RcvFileTransfer {fileId} = do
   cfArgs <- atomically . CF.randomArgs =<< asks random
   withStore' $ \db -> setFileCryptoArgs db fileId cfArgs
   pure (ft :: RcvFileTransfer) {cryptoArgs = Just cfArgs}
 
-receiveFile' :: ChatMonad m => User -> RcvFileTransfer -> Maybe Bool -> Maybe FilePath -> m ChatResponse
+receiveFile' :: User -> RcvFileTransfer -> Maybe Bool -> Maybe FilePath -> CM ChatResponse
 receiveFile' user ft rcvInline_ filePath_ = do
   (CRRcvFileAccepted user <$> acceptFileReceive user ft rcvInline_ filePath_) `catchChatError` processError
   where
@@ -2749,7 +2775,7 @@ receiveFile' user ft rcvInline_ filePath_ = do
       ChatErrorAgent (CONN DUPLICATE) _ -> pure $ CRRcvFileAcceptedSndCancelled user ft
       e -> throwError e
 
-acceptFileReceive :: forall m. ChatMonad m => User -> RcvFileTransfer -> Maybe Bool -> Maybe FilePath -> m AChatItem
+acceptFileReceive :: User -> RcvFileTransfer -> Maybe Bool -> Maybe FilePath -> CM AChatItem
 acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileInvitation = FileInvitation {fileName = fName, fileConnReq, fileInline, fileSize}, fileStatus, grpMemberId, cryptoArgs} rcvInline_ filePath_ = do
   unless (fileStatus == RFSNew) $ case fileStatus of
     RFSCancelled _ -> throwChatError $ CEFileCancelled fName
@@ -2789,7 +2815,7 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
             _ -> throwChatError $ CEFileInternal "member connection not active"
         _ -> throwChatError $ CEFileInternal "invalid chat ref for file transfer"
   where
-    acceptFile :: CommandFunction -> (ChatMsgEvent 'Json -> m ()) -> m AChatItem
+    acceptFile :: CommandFunction -> (ChatMsgEvent 'Json -> CM ()) -> CM AChatItem
     acceptFile cmdFunction send = do
       filePath <- getRcvFilePath fileId filePath_ fName True
       inline <- receiveInline
@@ -2807,7 +2833,7 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
             subMode <- chatReadVar subscriptionMode
             connIds <- createAgentConnectionAsync user cmdFunction True SCMInvitation subMode
             withStore $ \db -> acceptRcvFileTransfer db vr user fileId connIds ConnNew filePath subMode
-    receiveInline :: m Bool
+    receiveInline :: CM Bool
     receiveInline = do
       ChatConfig {fileChunkSize, inlineFiles = InlineFilesConfig {receiveChunks, offerChunks}} <- asks config
       pure $
@@ -2817,7 +2843,7 @@ acceptFileReceive user@User {userId} RcvFileTransfer {fileId, xftpRcvFile, fileI
                 || (rcvInline_ == Just True && fileSize <= fileChunkSize * offerChunks)
              )
 
-receiveViaCompleteFD :: ChatMonad m => User -> FileTransferId -> RcvFileDescr -> Maybe CryptoFileArgs -> m ()
+receiveViaCompleteFD :: User -> FileTransferId -> RcvFileDescr -> Maybe CryptoFileArgs -> CM ()
 receiveViaCompleteFD user fileId RcvFileDescr {fileDescrText, fileDescrComplete} cfArgs =
   when fileDescrComplete $ do
     rd <- parseFileDescription fileDescrText
@@ -2825,7 +2851,7 @@ receiveViaCompleteFD user fileId RcvFileDescr {fileDescrText, fileDescrComplete}
     startReceivingFile user fileId
     withStore' $ \db -> updateRcvFileAgentId db fileId (Just $ AgentRcvFileId aFileId)
 
-receiveViaURI :: ChatMonad m => User -> FileDescriptionURI -> CryptoFile -> m RcvFileTransfer
+receiveViaURI :: User -> FileDescriptionURI -> CryptoFile -> CM RcvFileTransfer
 receiveViaURI user@User {userId} FileDescriptionURI {description} cf@CryptoFile {cryptoArgs} = do
   fileId <- withStore $ \db -> createRcvStandaloneFileTransfer db userId cf fileSize chunkSize
   aFileId <- withAgent $ \a -> xftpReceiveFile a (aUserId user) description cryptoArgs
@@ -2838,7 +2864,7 @@ receiveViaURI user@User {userId} FileDescriptionURI {description} cf@CryptoFile
   where
     FD.ValidFileDescription FD.FileDescription {size = FD.FileSize fileSize, chunkSize = FD.FileSize chunkSize} = description
 
-startReceivingFile :: ChatMonad m => User -> FileTransferId -> m ()
+startReceivingFile :: User -> FileTransferId -> CM ()
 startReceivingFile user fileId = do
   vr <- chatVersionRange
   ci <- withStore $ \db -> do
@@ -2847,16 +2873,16 @@ startReceivingFile user fileId = do
     getChatItemByFileId db vr user fileId
   toView $ CRRcvFileStart user ci
 
-getRcvFilePath :: forall m. ChatMonad m => FileTransferId -> Maybe FilePath -> String -> Bool -> m FilePath
+getRcvFilePath :: FileTransferId -> Maybe FilePath -> String -> Bool -> CM FilePath
 getRcvFilePath fileId fPath_ fn keepHandle = case fPath_ of
   Nothing ->
     chatReadVar filesFolder >>= \case
       Nothing -> do
-        defaultFolder <- getDefaultFilesFolder
-        fPath <- defaultFolder `uniqueCombine` fn
+        defaultFolder <- lift getDefaultFilesFolder
+        fPath <- liftIO $ defaultFolder `uniqueCombine` fn
         createEmptyFile fPath $> fPath
       Just filesFolder -> do
-        fPath <- filesFolder `uniqueCombine` fn
+        fPath <- liftIO $ filesFolder `uniqueCombine` fn
         createEmptyFile fPath
         pure $ takeFileName fPath
   Just fPath ->
@@ -2868,21 +2894,21 @@ getRcvFilePath fileId fPath_ fn keepHandle = case fPath_ of
         (throwChatError $ CEFileAlreadyExists fPath)
         (createEmptyFile fPath $> fPath)
   where
-    createInPassedDirectory :: FilePath -> m FilePath
+    createInPassedDirectory :: FilePath -> CM FilePath
     createInPassedDirectory fPathDir = do
-      fPath <- fPathDir `uniqueCombine` fn
+      fPath <- liftIO $ fPathDir `uniqueCombine` fn
       createEmptyFile fPath $> fPath
-    createEmptyFile :: FilePath -> m ()
+    createEmptyFile :: FilePath -> CM ()
     createEmptyFile fPath = emptyFile `catchThrow` (ChatError . CEFileWrite fPath . show)
       where
-        emptyFile :: m ()
+        emptyFile :: CM ()
         emptyFile
           | keepHandle = do
               h <- getFileHandle fileId fPath rcvFiles AppendMode
               liftIO $ B.hPut h "" >> hFlush h
           | otherwise = liftIO $ B.writeFile fPath ""
 
-acceptContactRequest :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> m Contact
+acceptContactRequest :: User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> CM Contact
 acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = cp, userContactLinkId, xContactId, pqSupport} incognitoProfile contactUsed = do
   subMode <- chatReadVar subscriptionMode
   pqSup <- chatReadVar pqExperimentalEnabled
@@ -2894,7 +2920,7 @@ acceptContactRequest user UserContactRequest {agentInvitationId = AgentInvId inv
   acId <- withAgent $ \a -> acceptContact a True invId dm pqSup' subMode
   withStore' $ \db -> createAcceptedContact db user acId chatV cReqChatVRange cName profileId cp userContactLinkId xContactId incognitoProfile subMode pqSup' contactUsed
 
-acceptContactRequestAsync :: ChatMonad m => User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> PQSupport -> m Contact
+acceptContactRequestAsync :: User -> UserContactRequest -> Maybe IncognitoProfile -> Bool -> PQSupport -> CM Contact
 acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvId invId, cReqChatVRange, localDisplayName = cName, profileId, profile = p, userContactLinkId, xContactId} incognitoProfile contactUsed pqSup = do
   subMode <- chatReadVar subscriptionMode
   let profileToSend = profileToSendOnAccept user incognitoProfile False
@@ -2906,7 +2932,7 @@ acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvI
     forM_ activeConn $ \Connection {connId} -> setCommandConnId db user cmdId connId
     pure ct
 
-acceptGroupJoinRequestAsync :: ChatMonad m => User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> Maybe IncognitoProfile -> m GroupMember
+acceptGroupJoinRequestAsync :: User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> Maybe IncognitoProfile -> CM GroupMember
 acceptGroupJoinRequestAsync
   user
   gInfo@GroupInfo {groupProfile, membership}
@@ -2942,30 +2968,30 @@ profileToSendOnAccept user ip = userProfileToSend user (getIncognitoProfile <$>
       NewIncognito p -> p
       ExistingIncognito lp -> fromLocalProfile lp
 
-deleteGroupLink' :: ChatMonad m => User -> GroupInfo -> m ()
+deleteGroupLink' :: User -> GroupInfo -> CM ()
 deleteGroupLink' user gInfo = do
   vr <- chatVersionRange
   conn <- withStore $ \db -> getGroupLinkConnection db vr user gInfo
   deleteGroupLink_ user gInfo conn
 
-deleteGroupLinkIfExists :: ChatMonad m => User -> GroupInfo -> m ()
+deleteGroupLinkIfExists :: User -> GroupInfo -> CM ()
 deleteGroupLinkIfExists user gInfo = do
   vr <- chatVersionRange
   conn_ <- eitherToMaybe <$> withStore' (\db -> runExceptT $ getGroupLinkConnection db vr user gInfo)
   mapM_ (deleteGroupLink_ user gInfo) conn_
 
-deleteGroupLink_ :: ChatMonad m => User -> GroupInfo -> Connection -> m ()
+deleteGroupLink_ :: User -> GroupInfo -> Connection -> CM ()
 deleteGroupLink_ user gInfo conn = do
   deleteAgentConnectionAsync user $ aConnId conn
   withStore' $ \db -> deleteGroupLink db user gInfo
 
-agentSubscriber :: forall m. (MonadUnliftIO m, MonadReader ChatController m) => m ()
+agentSubscriber :: CM' ()
 agentSubscriber = do
   q <- asks $ subQ . smpAgent
   l <- asks chatLock
-  forever $ atomically (readTBQueue q) >>= void . process l
+  forever $ atomically (readTBQueue q) >>= process l
   where
-    process :: Lock -> (ACorrId, EntityId, APartyCmd 'Agent) -> m (Either ChatError ())
+    process :: Lock -> (ACorrId, EntityId, APartyCmd 'Agent) -> CM' ()
     process l (corrId, entId, APC e msg) = run $ case e of
       SAENone -> processAgentMessageNoConn msg
       SAEConn -> processAgentMessage corrId entId msg
@@ -2974,13 +3000,13 @@ agentSubscriber = do
       where
         run action = do
           let name = "agentSubscriber entity=" <> show e <> " entId=" <> str entId <> " msg=" <> str (aCommandTag msg)
-          withLock l name $ runExceptT $ action `catchChatError` (toView . CRChatError Nothing)
+          withLock' l name $ action `catchChatError'` (toView' . CRChatError Nothing)
         str :: StrEncoding a => a -> String
         str = B.unpack . strEncode
 
-type AgentBatchSubscribe m = AgentClient -> [ConnId] -> ExceptT AgentErrorType m (Map ConnId (Either AgentErrorType ()))
+type AgentBatchSubscribe = AgentClient -> [ConnId] -> ExceptT AgentErrorType IO (Map ConnId (Either AgentErrorType ()))
 
-subscribeUserConnections :: forall m. ChatMonad m => (PQSupport -> VersionRangeChat) -> Bool -> AgentBatchSubscribe m -> User -> m ()
+subscribeUserConnections :: (PQSupport -> VersionRangeChat) -> Bool -> AgentBatchSubscribe -> User -> CM ()
 subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
   -- get user connections
   ce <- asks $ subscriptionEvents . config
@@ -3034,37 +3060,37 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
           createdAt,
           updatedAt = createdAt
         }
-    getContactConns :: m ([ConnId], Map ConnId Contact)
+    getContactConns :: CM ([ConnId], Map ConnId Contact)
     getContactConns = do
       cts <- withStore_ (`getUserContacts` vr)
       let cts' = mapMaybe (\ct -> (,ct) <$> contactConnId ct) $ filter contactActive cts
       pure (map fst cts', M.fromList cts')
-    getUserContactLinkConns :: m ([ConnId], Map ConnId UserContact)
+    getUserContactLinkConns :: CM ([ConnId], Map ConnId UserContact)
     getUserContactLinkConns = do
       (cs, ucs) <- unzip <$> withStore_ (`getUserContactLinks` vr)
       let connIds = map aConnId cs
       pure (connIds, M.fromList $ zip connIds ucs)
-    getGroupMemberConns :: m ([Group], [ConnId], Map ConnId GroupMember)
+    getGroupMemberConns :: CM ([Group], [ConnId], Map ConnId GroupMember)
     getGroupMemberConns = do
       gs <- withStore_ (`getUserGroups` vr)
       let mPairs = concatMap (\(Group _ ms) -> mapMaybe (\m -> (,m) <$> memberConnId m) (filter (not . memberRemoved) ms)) gs
       pure (gs, map fst mPairs, M.fromList mPairs)
-    getSndFileTransferConns :: m ([ConnId], Map ConnId SndFileTransfer)
+    getSndFileTransferConns :: CM ([ConnId], Map ConnId SndFileTransfer)
     getSndFileTransferConns = do
       sfts <- withStore_ getLiveSndFileTransfers
       let connIds = map sndFileTransferConnId sfts
       pure (connIds, M.fromList $ zip connIds sfts)
-    getRcvFileTransferConns :: m ([ConnId], Map ConnId RcvFileTransfer)
+    getRcvFileTransferConns :: CM ([ConnId], Map ConnId RcvFileTransfer)
     getRcvFileTransferConns = do
       rfts <- withStore_ getLiveRcvFileTransfers
       let rftPairs = mapMaybe (\ft -> (,ft) <$> liveRcvFileTransferConnId ft) rfts
       pure (map fst rftPairs, M.fromList rftPairs)
-    getPendingContactConns :: m ([ConnId], Map ConnId PendingContactConnection)
+    getPendingContactConns :: CM ([ConnId], Map ConnId PendingContactConnection)
     getPendingContactConns = do
       pcs <- withStore_ getPendingContactConnections
       let connIds = map aConnId' pcs
       pure (connIds, M.fromList $ zip connIds pcs)
-    contactSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId Contact -> Bool -> m ()
+    contactSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId Contact -> Bool -> CM ()
     contactSubsToView rs cts ce = do
       chatModifyVar connNetworkStatuses $ M.union (M.fromList statuses)
       ifM (asks $ coreApi . config) (notifyAPI statuses) notifyCLI
@@ -3090,16 +3116,16 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
               ChatErrorAgent (SMP SMP.AUTH) _ -> "contact deleted"
               e -> show e
     -- TODO possibly below could be replaced with less noisy events for API
-    contactLinkSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId UserContact -> m ()
+    contactLinkSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId UserContact -> CM ()
     contactLinkSubsToView rs = toView . CRUserContactSubSummary user . map (uncurry UserContactSubStatus) . resultsFor rs
-    groupSubsToView :: Map ConnId (Either AgentErrorType ()) -> [Group] -> Map ConnId GroupMember -> Bool -> m ()
+    groupSubsToView :: Map ConnId (Either AgentErrorType ()) -> [Group] -> Map ConnId GroupMember -> Bool -> CM ()
     groupSubsToView rs gs ms ce = do
       mapM_ groupSub $
         sortOn (\(Group GroupInfo {localDisplayName = g} _) -> g) gs
       toView . CRMemberSubSummary user $ map (uncurry MemberSubStatus) mRs
       where
         mRs = resultsFor rs ms
-        groupSub :: Group -> m ()
+        groupSub :: Group -> CM ()
         groupSub (Group g@GroupInfo {membership, groupId = gId} members) = do
           when ce $ mapM_ (toView . uncurry (CRMemberSubError user g)) mErrors
           toView groupEvent
@@ -3117,7 +3143,7 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
                     then CRGroupEmpty user g
                     else CRGroupRemoved user g
               | otherwise = CRGroupSubscribed user g
-    sndFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId SndFileTransfer -> m ()
+    sndFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId SndFileTransfer -> CM ()
     sndFileSubsToView rs sfts = do
       let sftRs = resultsFor rs sfts
       forM_ sftRs $ \(ft@SndFileTransfer {fileId, fileStatus}, err_) -> do
@@ -3127,11 +3153,11 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
           l <- asks chatLock
           when (fileStatus == FSConnected) . unlessM (isFileActive fileId sndFiles) . withLock l "subscribe sendFileChunk" $
             sendFileChunk user ft
-    rcvFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId RcvFileTransfer -> m ()
+    rcvFileSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId RcvFileTransfer -> CM ()
     rcvFileSubsToView rs = mapM_ (toView . uncurry (CRRcvFileSubError user)) . filterErrors . resultsFor rs
-    pendingConnSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId PendingContactConnection -> m ()
+    pendingConnSubsToView :: Map ConnId (Either AgentErrorType ()) -> Map ConnId PendingContactConnection -> CM ()
     pendingConnSubsToView rs = toView . CRPendingSubSummary user . map (uncurry PendingSubStatus) . resultsFor rs
-    withStore_ :: (DB.Connection -> User -> IO [a]) -> m [a]
+    withStore_ :: (DB.Connection -> User -> IO [a]) -> CM [a]
     withStore_ a = withStore' (`a` user) `catchChatError` \e -> toView (CRChatError (Just user) e) $> []
     filterErrors :: [(a, Maybe ChatError)] -> [(a, ChatError)]
     filterErrors = mapMaybe (\(a, e_) -> (a,) <$> e_)
@@ -3146,7 +3172,7 @@ subscribeUserConnections vr onlyNeeded agentBatchSubscribe user = do
       Just _ -> Nothing
       _ -> Just . ChatError . CEAgentNoSubResult $ AgentConnId connId
 
-cleanupManager :: forall m. ChatMonad m => m ()
+cleanupManager :: CM ()
 cleanupManager = do
   interval <- asks (cleanupManagerInterval . config)
   runWithoutInitialDelay interval
@@ -3155,17 +3181,18 @@ cleanupManager = do
   stepDelay <- asks (cleanupManagerStepDelay . config)
   forever $ do
     flip catchChatError (toView . CRChatError Nothing) $ do
-      waitChatStartedAndActivated
+      lift waitChatStartedAndActivated
       users <- withStore' getUsers
       let (us, us') = partition activeUser users
       forM_ us $ cleanupUser interval stepDelay
       forM_ us' $ cleanupUser interval stepDelay
       cleanupMessages `catchChatError` (toView . CRChatError Nothing)
+      -- TODO possibly, also cleanup async commands
       cleanupProbes `catchChatError` (toView . CRChatError Nothing)
     liftIO $ threadDelay' $ diffToMicroseconds interval
   where
     runWithoutInitialDelay cleanupInterval = flip catchChatError (toView . CRChatError Nothing) $ do
-      waitChatStartedAndActivated
+      lift waitChatStartedAndActivated
       users <- withStore' getUsers
       let (us, us') = partition activeUser users
       forM_ us $ \u -> cleanupTimedItems cleanupInterval u `catchChatError` (toView . CRChatError (Just u))
@@ -3195,14 +3222,14 @@ cleanupManager = do
       let cutoffTs = addUTCTime (-(14 * nominalDay)) ts
       withStore' (`deleteOldProbes` cutoffTs)
 
-startProximateTimedItemThread :: ChatMonad m => User -> (ChatRef, ChatItemId) -> UTCTime -> m ()
+startProximateTimedItemThread :: User -> (ChatRef, ChatItemId) -> UTCTime -> CM ()
 startProximateTimedItemThread user itemRef deleteAt = do
   interval <- asks (cleanupManagerInterval . config)
   ts <- liftIO getCurrentTime
   when (diffUTCTime deleteAt ts <= interval) $
     startTimedItemThread user itemRef deleteAt
 
-startTimedItemThread :: ChatMonad m => User -> (ChatRef, ChatItemId) -> UTCTime -> m ()
+startTimedItemThread :: User -> (ChatRef, ChatItemId) -> UTCTime -> CM ()
 startTimedItemThread user itemRef deleteAt = do
   itemThreads <- asks timedItemThreads
   threadTVar_ <- atomically $ do
@@ -3217,11 +3244,11 @@ startTimedItemThread user itemRef deleteAt = do
     tId <- mkWeakThreadId =<< deleteTimedItem user itemRef deleteAt `forkFinally` const (atomically $ TM.delete itemRef itemThreads)
     atomically $ writeTVar threadTVar (Just tId)
 
-deleteTimedItem :: ChatMonad m => User -> (ChatRef, ChatItemId) -> UTCTime -> m ()
+deleteTimedItem :: User -> (ChatRef, ChatItemId) -> UTCTime -> CM ()
 deleteTimedItem user (ChatRef cType chatId, itemId) deleteAt = do
   ts <- liftIO getCurrentTime
   liftIO $ threadDelay' $ diffToMicroseconds $ diffUTCTime deleteAt ts
-  waitChatStartedAndActivated
+  lift waitChatStartedAndActivated
   vr <- chatVersionRange
   case cType of
     CTDirect -> do
@@ -3233,33 +3260,33 @@ deleteTimedItem user (ChatRef cType chatId, itemId) deleteAt = do
       deleteGroupCI user gInfo ci True True Nothing deletedTs >>= toView
     _ -> toView . CRChatError (Just user) . ChatError $ CEInternalError "bad deleteTimedItem cType"
 
-startUpdatedTimedItemThread :: ChatMonad m => User -> ChatRef -> ChatItem c d -> ChatItem c d -> m ()
+startUpdatedTimedItemThread :: User -> ChatRef -> ChatItem c d -> ChatItem c d -> CM ()
 startUpdatedTimedItemThread user chatRef ci ci' =
   case (chatItemTimed ci >>= timedDeleteAt', chatItemTimed ci' >>= timedDeleteAt') of
     (Nothing, Just deleteAt') ->
       startProximateTimedItemThread user (chatRef, chatItemId' ci') deleteAt'
     _ -> pure ()
 
-expireChatItems :: forall m. ChatMonad m => User -> Int64 -> Bool -> m ()
+expireChatItems :: User -> Int64 -> Bool -> CM ()
 expireChatItems user@User {userId} ttl sync = do
   currentTs <- liftIO getCurrentTime
   vr <- chatVersionRange
   let expirationDate = addUTCTime (-1 * fromIntegral ttl) currentTs
       -- this is to keep group messages created during last 12 hours even if they're expired according to item_ts
       createdAtCutoff = addUTCTime (-43200 :: NominalDiffTime) currentTs
-  waitChatStartedAndActivated
+  lift waitChatStartedAndActivated
   contacts <- withStore' $ \db -> getUserContacts db vr user
   loop contacts $ processContact expirationDate
-  waitChatStartedAndActivated
+  lift waitChatStartedAndActivated
   groups <- withStore' $ \db -> getUserGroupDetails db vr user Nothing Nothing
   loop groups $ processGroup vr expirationDate createdAtCutoff
   where
-    loop :: [a] -> (a -> m ()) -> m ()
+    loop :: [a] -> (a -> CM ()) -> CM ()
     loop [] _ = pure ()
     loop (a : as) process = continue $ do
       process a `catchChatError` (toView . CRChatError (Just user))
       loop as process
-    continue :: m () -> m ()
+    continue :: CM () -> CM ()
     continue a =
       if sync
         then a
@@ -3267,16 +3294,16 @@ expireChatItems user@User {userId} ttl sync = do
           expireFlags <- asks expireCIFlags
           expire <- atomically $ TM.lookup userId expireFlags
           when (expire == Just True) $ threadDelay 100000 >> a
-    processContact :: UTCTime -> Contact -> m ()
+    processContact :: UTCTime -> Contact -> CM ()
     processContact expirationDate ct = do
-      waitChatStartedAndActivated
+      lift waitChatStartedAndActivated
       filesInfo <- withStore' $ \db -> getContactExpiredFileInfo db user ct expirationDate
       cancelFilesInProgress user filesInfo
       deleteFilesLocally filesInfo
       withStore' $ \db -> deleteContactExpiredCIs db user ct expirationDate
-    processGroup :: (PQSupport -> VersionRangeChat) -> UTCTime -> UTCTime -> GroupInfo -> m ()
+    processGroup :: (PQSupport -> VersionRangeChat) -> UTCTime -> UTCTime -> GroupInfo -> CM ()
     processGroup vr expirationDate createdAtCutoff gInfo = do
-      waitChatStartedAndActivated
+      lift waitChatStartedAndActivated
       filesInfo <- withStore' $ \db -> getGroupExpiredFileInfo db user gInfo expirationDate createdAtCutoff
       cancelFilesInProgress user filesInfo
       deleteFilesLocally filesInfo
@@ -3284,7 +3311,7 @@ expireChatItems user@User {userId} ttl sync = do
       membersToDelete <- withStore' $ \db -> getGroupMembersForExpiration db vr user gInfo
       forM_ membersToDelete $ \m -> withStore' $ \db -> deleteGroupMember db user m
 
-processAgentMessage :: forall m. ChatMonad m => ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> m ()
+processAgentMessage :: ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> CM ()
 processAgentMessage _ connId (DEL_RCVQ srv qId err_) =
   toView $ CRAgentRcvQueueDeleted (AgentConnId connId) srv (AgentQueueId qId) err_
 processAgentMessage _ connId DEL_CONN =
@@ -3303,13 +3330,13 @@ processAgentMessage corrId connId msg = do
 -- - without ACK the message delivery will be stuck,
 -- - with ACK message will be lost, as it failed to be saved.
 -- Full app restart is likely to resolve database condition and the message will be received and processed again.
-critical :: ChatMonad m => m a -> m a
+critical :: CM a -> CM a
 critical a =
   a `catchChatError` \case
     ChatErrorStore SEDBBusyError {message} -> throwError $ ChatErrorAgent (CRITICAL True message) Nothing
     e -> throwError e
 
-processAgentMessageNoConn :: forall m. ChatMonad m => ACommand 'Agent 'AENone -> m ()
+processAgentMessageNoConn :: ACommand 'Agent 'AENone -> CM ()
 processAgentMessageNoConn = \case
   CONNECT p h -> hostEvent $ CRHostConnected p h
   DISCONNECT p h -> hostEvent $ CRHostDisconnected p h
@@ -3318,7 +3345,7 @@ processAgentMessageNoConn = \case
   SUSPENDED -> toView CRChatSuspended
   DEL_USER agentUserId -> toView $ CRAgentUserDeleted agentUserId
   where
-    hostEvent :: ChatResponse -> m ()
+    hostEvent :: ChatResponse -> CM ()
     hostEvent = whenM (asks $ hostEvents . config) . toView
     serverEvent srv conns nsStatus event = do
       chatModifyVar connNetworkStatuses $ \m -> foldl' (\m' cId -> M.insert cId nsStatus m') m connIds
@@ -3330,15 +3357,15 @@ processAgentMessageNoConn = \case
           cs <- withStore' (`getConnectionsContacts` conns)
           toView $ event srv cs
 
-processAgentMsgSndFile :: forall m. ChatMonad m => ACorrId -> SndFileId -> ACommand 'Agent 'AESndFile -> m ()
+processAgentMsgSndFile :: ACorrId -> SndFileId -> ACommand 'Agent 'AESndFile -> CM ()
 processAgentMsgSndFile _corrId aFileId msg =
   withStore' (`getUserByASndFileId` AgentSndFileId aFileId) >>= \case
     Just user -> process user `catchChatError` (toView . CRChatError (Just user))
     _ -> do
-      withAgent (`xftpDeleteSndFileInternal` aFileId)
+      lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
       throwChatError $ CENoSndFileUser $ AgentSndFileId aFileId
   where
-    process :: User -> m ()
+    process :: User -> CM ()
     process user = do
       (ft@FileTransferMeta {fileId, xftpRedirectFor, cancelled}, sfts) <- withStore $ \db -> do
         fileId <- getXFTPSndFileDBId db user $ AgentSndFileId aFileId
@@ -3356,7 +3383,7 @@ processAgentMsgSndFile _corrId aFileId msg =
           ci <- withStore $ \db -> lookupChatItemByFileId db vr user fileId
           case ci of
             Nothing -> do
-              withAgent (`xftpDeleteSndFileInternal` aFileId)
+              lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
               withStore' $ \db -> createExtraSndFTDescrs db user fileId (map fileDescrText rfds)
               case rfds of
                 [] -> sendFileError "no receiver descriptions" fileId vr ft
@@ -3379,7 +3406,7 @@ processAgentMsgSndFile _corrId aFileId msg =
                       withStore' $ \db -> createExtraSndFTDescrs db user fileId (map fileDescrText extraRFDs)
                       msgDeliveryId <- sendFileDescription sft rfd sharedMsgId $ sendDirectContactMessage user ct
                       withStore' $ \db -> updateSndFTDeliveryXFTP db sft msgDeliveryId
-                      withAgent (`xftpDeleteSndFileInternal` aFileId)
+                      lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
                     (_, _, SMDSnd, GroupChat g@GroupInfo {groupId}) -> do
                       ms <- withStore' $ \db -> getGroupMembers db vr user g
                       let rfdsMemberFTs = zip rfds $ memberFTs ms
@@ -3389,7 +3416,7 @@ processAgentMsgSndFile _corrId aFileId msg =
                       ci' <- withStore $ \db -> do
                         liftIO $ updateCIFileStatus db user fileId CIFSSndComplete
                         getChatItemByFileId db vr user fileId
-                      withAgent (`xftpDeleteSndFileInternal` aFileId)
+                      lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
                       toView $ CRSndFileCompleteXFTP user ci' ft
                       where
                         memberFTs :: [GroupMember] -> [(Connection, SndFileTransfer)]
@@ -3401,7 +3428,7 @@ processAgentMsgSndFile _corrId aFileId msg =
                               | (connStatus == ConnReady || connStatus == ConnSndReady) && not (connDisabled conn) = Just (groupMemberId, conn)
                               | otherwise = Nothing
                             useMember _ = Nothing
-                        sendToMember :: (ValidFileDescription 'FRecipient, (Connection, SndFileTransfer)) -> m ()
+                        sendToMember :: (ValidFileDescription 'FRecipient, (Connection, SndFileTransfer)) -> CM ()
                         sendToMember (rfd, (conn, sft)) =
                           void $ sendFileDescription sft rfd sharedMsgId $ \msg' -> do
                             (sndMsg, msgDeliveryId, _) <- sendDirectMemberMessage conn msg' groupId
@@ -3416,7 +3443,7 @@ processAgentMsgSndFile _corrId aFileId msg =
       where
         fileDescrText :: FilePartyI p => ValidFileDescription p -> T.Text
         fileDescrText = safeDecodeUtf8 . strEncode
-        sendFileDescription :: SndFileTransfer -> ValidFileDescription 'FRecipient -> SharedMsgId -> (ChatMsgEvent 'Json -> m (SndMessage, Int64)) -> m Int64
+        sendFileDescription :: SndFileTransfer -> ValidFileDescription 'FRecipient -> SharedMsgId -> (ChatMsgEvent 'Json -> CM (SndMessage, Int64)) -> CM Int64
         sendFileDescription sft rfd msgId sendMsg = do
           let rfdText = fileDescrText rfd
           withStore' $ \db -> updateSndFTDescrXFTP db user sft rfdText
@@ -3424,22 +3451,22 @@ processAgentMsgSndFile _corrId aFileId msg =
           loopSend parts
           where
             -- returns msgDeliveryId of the last file description message
-            loopSend :: NonEmpty FileDescr -> m Int64
+            loopSend :: NonEmpty FileDescr -> CM Int64
             loopSend (fileDescr :| fds) = do
               (_, msgDeliveryId) <- sendMsg $ XMsgFileDescr {msgId, fileDescr}
               case L.nonEmpty fds of
                 Just fds' -> loopSend fds'
                 Nothing -> pure msgDeliveryId
-        sendFileError :: Text -> Int64 -> (PQSupport -> VersionRangeChat) -> FileTransferMeta -> m ()
+        sendFileError :: Text -> Int64 -> (PQSupport -> VersionRangeChat) -> FileTransferMeta -> CM ()
         sendFileError err fileId vr ft = do
           logError $ "Sent file error: " <> err
           ci <- withStore $ \db -> do
             liftIO $ updateFileCancelled db user fileId CIFSSndError
             lookupChatItemByFileId db vr user fileId
-          withAgent (`xftpDeleteSndFileInternal` aFileId)
+          lift $ withAgent' (`xftpDeleteSndFileInternal` aFileId)
           toView $ CRSndFileError user ci ft err
 
-splitFileDescr :: ChatMonad m => RcvFileDescrText -> m (NonEmpty FileDescr)
+splitFileDescr :: RcvFileDescrText -> CM (NonEmpty FileDescr)
 splitFileDescr rfdText = do
   partSize <- asks $ xftpDescrPartSize . config
   pure $ splitParts 1 partSize rfdText
@@ -3452,15 +3479,15 @@ splitFileDescr rfdText = do
             then fileDescr :| []
             else fileDescr <| splitParts (partNo + 1) partSize rest
 
-processAgentMsgRcvFile :: forall m. ChatMonad m => ACorrId -> RcvFileId -> ACommand 'Agent 'AERcvFile -> m ()
+processAgentMsgRcvFile :: ACorrId -> RcvFileId -> ACommand 'Agent 'AERcvFile -> CM ()
 processAgentMsgRcvFile _corrId aFileId msg =
   withStore' (`getUserByARcvFileId` AgentRcvFileId aFileId) >>= \case
     Just user -> process user `catchChatError` (toView . CRChatError (Just user))
     _ -> do
-      withAgent (`xftpDeleteRcvFile` aFileId)
+      lift $ withAgent' (`xftpDeleteRcvFile` aFileId)
       throwChatError $ CENoRcvFileUser $ AgentRcvFileId aFileId
   where
-    process :: User -> m ()
+    process :: User -> CM ()
     process user = do
       ft@RcvFileTransfer {fileId} <- withStore $ \db -> do
         fileId <- getXFTPRcvFileDBId db $ AgentRcvFileId aFileId
@@ -3477,7 +3504,7 @@ processAgentMsgRcvFile _corrId aFileId msg =
           case liveRcvFileTransferPath ft of
             Nothing -> throwChatError $ CEInternalError "no target path for received XFTP file"
             Just targetPath -> do
-              fsTargetPath <- toFSFilePath targetPath
+              fsTargetPath <- lift $ toFSFilePath targetPath
               renameFile xftpPath fsTargetPath
               ci_ <- withStore $ \db -> do
                 liftIO $ do
@@ -3496,7 +3523,7 @@ processAgentMsgRcvFile _corrId aFileId msg =
               agentXFTPDeleteRcvFile aFileId fileId
               toView $ CRRcvFileError user ci e ft
 
-processAgentMessageConn :: forall m. ChatMonad m => (PQSupport -> VersionRangeChat) -> User -> ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> m ()
+processAgentMessageConn :: (PQSupport -> VersionRangeChat) -> User -> ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> CM ()
 processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage = do
   -- Missing connection/entity errors here will be sent to the view but not shown as CRITICAL alert,
   -- as in this case no need to ACK message - we can't process messages for this connection anyway.
@@ -3520,7 +3547,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       UserContactConnection conn uc ->
         processUserContactRequest agentMessage entity conn uc
   where
-    updateConnStatus :: ConnectionEntity -> m ConnectionEntity
+    updateConnStatus :: ConnectionEntity -> CM ConnectionEntity
     updateConnStatus acEntity = case agentMsgConnStatus agentMessage of
       Just connStatus -> do
         let conn = (entityConnection acEntity) {connStatus}
@@ -3535,7 +3562,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       CON _ -> Just ConnReady
       _ -> Nothing
 
-    processCONFpqSupport :: Connection -> PQSupport -> m Connection
+    processCONFpqSupport :: Connection -> PQSupport -> CM Connection
     processCONFpqSupport conn@Connection {connId, pqSupport = pq} pq'
       | pq == PQSupportOn && pq' == PQSupportOff = do
           let pqEnc' = CR.pqSupportToEnc pq'
@@ -3546,11 +3573,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           pure conn
       | otherwise = pure conn
 
-    processINFOpqSupport :: Connection -> PQSupport -> m ()
+    processINFOpqSupport :: Connection -> PQSupport -> CM ()
     processINFOpqSupport Connection {pqSupport = pq} pq' =
       when (pq /= pq') $ messageWarning "processINFOpqSupport: unexpected pqSupport change"
 
-    processDirectMessage :: ACommand 'Agent e -> ConnectionEntity -> Connection -> Maybe Contact -> m ()
+    processDirectMessage :: ACommand 'Agent e -> ConnectionEntity -> Connection -> Maybe Contact -> CM ()
     processDirectMessage agentMsg connEntity conn@Connection {connId, connChatVersion, peerChatVRange, viaUserContactLink, customUserProfileId, connectionCode} = \case
       Nothing -> case agentMsg of
         CONF confId pqSupport _ connInfo -> do
@@ -3569,15 +3596,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           -- TODO only acknowledge without saving message?
           -- probably this branch is never executed, so there should be no reason
           -- to save message if contact hasn't been created yet - chat item isn't created anyway
-          withAckMessage agentConnId conn meta False $ \cmdId -> do
-            (_conn', _) <- saveDirectRcvMSG conn meta cmdId msgBody
-            pure False
+          withAckMessage' agentConnId meta $
+            void $ saveDirectRcvMSG conn meta msgBody
         SENT msgId ->
           sentMsgDeliveryEvent conn msgId
         OK ->
           -- [async agent commands] continuation on receiving OK
-          withCompletedCommand conn agentMsg $ \CommandData {cmdFunction, cmdId} ->
-            when (cmdFunction == CFAckMessage) $ ackMsgDeliveryEvent conn cmdId
+          when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         MERR _ err -> do
           toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
           incAuthErrCounter connEntity conn err
@@ -3602,11 +3627,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   sendXGrpMemInv hostConnId (Just directConnReq) xGrpMemIntroCont
               CRContactUri _ -> throwChatError $ CECommandError "unexpected ConnectionRequestUri type"
         MSG msgMeta _msgFlags msgBody ->
-          withAckMessage agentConnId conn msgMeta True $ \cmdId -> do
+          withAckMessage agentConnId msgMeta True $ do
             let MsgMeta {pqEncryption} = msgMeta
             (ct', conn') <- updateContactPQRcv user ct conn pqEncryption
             checkIntegrityCreateItem (CDDirectRcv ct') msgMeta `catchChatError` \_ -> pure ()
-            (conn'', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveDirectRcvMSG conn' msgMeta cmdId msgBody
+            (conn'', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveDirectRcvMSG conn' msgMeta msgBody
             let ct'' = ct' {activeConn = Just conn''} :: Contact
             assertDirectAllowed user MDRcv ct'' $ toCMEventTag event
             updateChatLock "direct message" event
@@ -3636,7 +3661,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             let Contact {chatSettings = ChatSettings {sendRcpts}} = ct''
             pure $ fromMaybe (sendRcptsContacts user) sendRcpts && hasDeliveryReceipt (toCMEventTag event)
         RCVD msgMeta msgRcpt ->
-          withAckMessage' agentConnId conn msgMeta $
+          withAckMessage' agentConnId msgMeta $
             directMsgReceived ct conn msgMeta msgRcpt
         CONF confId pqSupport _ connInfo -> do
           conn' <- processCONFpqSupport conn pqSupport
@@ -3678,7 +3703,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   ct' = ct {activeConn = Just conn'} :: Contact
               -- [incognito] print incognito profile used for this contact
               incognitoProfile <- forM customUserProfileId $ \profileId -> withStore (\db -> getProfileById db userId profileId)
-              setContactNetworkStatus ct' NSConnected
+              lift $ setContactNetworkStatus ct' NSConnected
               toView $ CRContactConnected user ct' (fmap fromLocalProfile incognitoProfile)
               when (directOrUsed ct') $ do
                 createInternalChatItem user (CDDirectRcv ct') (CIRcvDirectE2EEInfo $ E2EInfo pqEnc) Nothing
@@ -3744,8 +3769,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               createInternalChatItem user (CDDirectRcv ct') (CIRcvConnEvent $ RCERatchetSync rss) Nothing
         OK ->
           -- [async agent commands] continuation on receiving OK
-          withCompletedCommand conn agentMsg $ \CommandData {cmdFunction, cmdId} ->
-            when (cmdFunction == CFAckMessage) $ ackMsgDeliveryEvent conn cmdId
+          when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         MERR msgId err -> do
           updateDirectItemStatus ct conn msgId $ agentErrToItemStatus err
           toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
@@ -3760,7 +3784,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         -- TODO add debugging output
         _ -> pure ()
 
-    processGroupMessage :: ACommand 'Agent e -> ConnectionEntity -> Connection -> GroupInfo -> GroupMember -> m ()
+    processGroupMessage :: ACommand 'Agent e -> ConnectionEntity -> Connection -> GroupInfo -> GroupMember -> CM ()
     processGroupMessage agentMsg connEntity conn@Connection {connId, connectionCode} gInfo@GroupInfo {groupId, groupProfile, membership, chatSettings} m = case agentMsg of
       INV (ACR _ cReq) ->
         withCompletedCommand conn agentMsg $ \CommandData {cmdFunction} ->
@@ -3792,7 +3816,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 sendGrpInvitation ct m groupLinkId
                 toView $ CRSentGroupInvitation user gInfo ct m
                 where
-                  sendGrpInvitation :: Contact -> GroupMember -> Maybe GroupLinkId -> m ()
+                  sendGrpInvitation :: Contact -> GroupMember -> Maybe GroupLinkId -> CM ()
                   sendGrpInvitation ct GroupMember {memberId, memberRole = memRole} groupLinkId = do
                     currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
                     let GroupMember {memberRole = userRole, memberId = userMemberId} = membership
@@ -3921,7 +3945,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                     let GroupInfo {groupProfile = GroupProfile {description}} = gInfo
                     fmap (\descr -> XMsgNew $ MCSimple $ extMsgContent (MCText descr) Nothing) description
                 | otherwise = Nothing
-              itemForwardEvents :: CChatItem 'CTGroup -> m [ChatMsgEvent 'Json]
+              itemForwardEvents :: CChatItem 'CTGroup -> CM [ChatMsgEvent 'Json]
               itemForwardEvents cci = case cci of
                 (CChatItem SMDRcv ci@ChatItem {chatDir = CIGroupRcv sender, content = CIRcvMsgContent mc, file})
                   | not (blockedByAdmin sender) -> do
@@ -3932,7 +3956,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   processContentItem membership ci mc fInvDescr_
                 _ -> pure []
                 where
-                  getRcvFileInvDescr :: CIFile 'MDRcv -> m (Maybe (FileInvitation, RcvFileDescrText))
+                  getRcvFileInvDescr :: CIFile 'MDRcv -> CM (Maybe (FileInvitation, RcvFileDescrText))
                   getRcvFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
                     expired <- fileExpired
                     if fileProtocol /= FPXFTP || fileStatus == CIFSRcvCancelled || expired
@@ -3940,7 +3964,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                       else do
                         rfd <- withStore $ \db -> getRcvFileDescrByRcvFileId db fileId
                         pure $ invCompleteDescr ciFile rfd
-                  getSndFileInvDescr :: CIFile 'MDSnd -> m (Maybe (FileInvitation, RcvFileDescrText))
+                  getSndFileInvDescr :: CIFile 'MDSnd -> CM (Maybe (FileInvitation, RcvFileDescrText))
                   getSndFileInvDescr ciFile@CIFile {fileId, fileProtocol, fileStatus} = do
                     expired <- fileExpired
                     if fileProtocol /= FPXFTP || fileStatus == CIFSSndCancelled || expired
@@ -3950,7 +3974,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                         -- would be best if snd file had a single rcv description for all members saved in files table
                         rfd <- withStore $ \db -> getRcvFileDescrBySndFileId db fileId
                         pure $ invCompleteDescr ciFile rfd
-                  fileExpired :: m Bool
+                  fileExpired :: CM Bool
                   fileExpired = do
                     ttl <- asks $ rcvFilesTTL . agentConfig . config
                     cutoffTs <- addUTCTime (-ttl) <$> liftIO getCurrentTime
@@ -3962,7 +3986,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                             fInv = xftpFileInvitation fileName fileSize fInvDescr
                          in Just (fInv, fileDescrText)
                     | otherwise = Nothing
-                  processContentItem :: GroupMember -> ChatItem 'CTGroup d -> MsgContent -> Maybe (FileInvitation, RcvFileDescrText) -> m [ChatMsgEvent 'Json]
+                  processContentItem :: GroupMember -> ChatItem 'CTGroup d -> MsgContent -> Maybe (FileInvitation, RcvFileDescrText) -> CM [ChatMsgEvent 'Json]
                   processContentItem sender ChatItem {meta, quotedItem} mc fInvDescr_ =
                     if isNothing fInvDescr_ && not (msgContentHasText mc)
                       then pure []
@@ -4011,11 +4035,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                       void $ sendDirectMemberMessage imConn (XGrpMemCon memberId) groupId
                 _ -> messageWarning "sendXGrpMemCon: member category GCPreMember or GCPostMember is expected"
       MSG msgMeta _msgFlags msgBody -> do
-        withAckMessage agentConnId conn msgMeta True $ \cmdId -> do
+        withAckMessage agentConnId msgMeta True $ do
           checkIntegrityCreateItem (CDGroupRcv gInfo m) msgMeta `catchChatError` \_ -> pure ()
           forM_ aChatMsgs $ \case
             Right (ACMsg _ chatMsg) ->
-              processEvent cmdId chatMsg `catchChatError` \e -> toView $ CRChatError (Just user) e
+              processEvent chatMsg `catchChatError` \e -> toView $ CRChatError (Just user) e
             Left e -> toView $ CRChatError (Just user) (ChatError . CEException $ "error parsing chat message: " <> e)
           checkSendRcpt $ rights aChatMsgs
         -- currently only a single message is forwarded
@@ -4026,9 +4050,9 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         where
           aChatMsgs = parseChatMessages msgBody
           brokerTs = metaBrokerTs msgMeta
-          processEvent :: MsgEncodingI e => CommandId -> ChatMessage e -> m ()
-          processEvent cmdId chatMsg = do
-            (m', conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveGroupRcvMsg user groupId m conn msgMeta cmdId msgBody chatMsg
+          processEvent :: MsgEncodingI e => ChatMessage e -> CM ()
+          processEvent chatMsg = do
+            (m', conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveGroupRcvMsg user groupId m conn msgMeta msgBody chatMsg
             updateChatLock "groupMessage" event
             case event of
               XMsgNew mc -> memberCanSend m' $ newGroupContentMessage gInfo m' mc msg brokerTs False
@@ -4060,7 +4084,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               XInfoProbeOk probe -> xInfoProbeOk (COMGroupMember m') probe
               BFileChunk sharedMsgId chunk -> bFileChunkGroup gInfo sharedMsgId chunk msgMeta
               _ -> messageError $ "unsupported message: " <> T.pack (show event)
-          checkSendRcpt :: [AChatMessage] -> m Bool
+          checkSendRcpt :: [AChatMessage] -> CM Bool
           checkSendRcpt aMsgs = do
             currentMemCount <- withStore' $ \db -> getGroupCurrentMembersCount db user gInfo
             let GroupInfo {chatSettings = ChatSettings {sendRcpts}} = gInfo
@@ -4071,7 +4095,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             where
               aChatMsgHasReceipt (ACMsg _ ChatMessage {chatMsgEvent}) =
                 hasDeliveryReceipt (toCMEventTag chatMsgEvent)
-          forwardMsg_ :: MsgEncodingI e => ChatMessage e -> m ()
+          forwardMsg_ :: MsgEncodingI e => ChatMessage e -> CM ()
           forwardMsg_ chatMsg =
             forM_ (forwardedGroupMsg chatMsg) $ \chatMsg' -> do
               ChatConfig {highlyAvailable} <- asks config
@@ -4088,7 +4112,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               unless (null ms) . void $
                 sendGroupMessage' user gInfo ms msg
       RCVD msgMeta msgRcpt ->
-        withAckMessage' agentConnId conn msgMeta $
+        withAckMessage' agentConnId msgMeta $
           groupMsgReceived gInfo m conn msgMeta msgRcpt
       SENT msgId -> do
         sentMsgDeliveryEvent conn msgId
@@ -4128,8 +4152,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             createInternalChatItem user (CDGroupRcv gInfo m') (CIRcvConnEvent $ RCERatchetSync rss) Nothing
       OK ->
         -- [async agent commands] continuation on receiving OK
-        withCompletedCommand conn agentMsg $ \CommandData {cmdFunction, cmdId} ->
-          when (cmdFunction == CFAckMessage) $ ackMsgDeliveryEvent conn cmdId
+        when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
       MERR msgId err -> do
         withStore' $ \db -> updateGroupItemErrorStatus db msgId (groupMemberId' m) $ agentErrToItemStatus err
         -- group errors are silenced to reduce load on UI event log
@@ -4174,7 +4197,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         r n'' = Just (ci, CIRcvDecryptionError mde n'')
     mdeUpdatedCI _ _ = Nothing
 
-    processSndFileConn :: ACommand 'Agent e -> ConnectionEntity -> Connection -> SndFileTransfer -> m ()
+    processSndFileConn :: ACommand 'Agent e -> ConnectionEntity -> Connection -> SndFileTransfer -> CM ()
     processSndFileConn agentMsg connEntity conn ft@SndFileTransfer {fileId, fileName, fileStatus} =
       case agentMsg of
         -- SMP CONF for SndFileConnection happens for direct file protocol
@@ -4211,17 +4234,17 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 lookupChatItemByFileId db vr user fileId
               toView $ CRSndFileRcvCancelled user ci ft
             _ -> throwChatError $ CEFileSend fileId err
-        MSG meta _ _ -> withAckMessage' agentConnId conn meta $ pure ()
+        MSG meta _ _ -> withAckMessage' agentConnId meta $ pure ()
         OK ->
           -- [async agent commands] continuation on receiving OK
-          withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
+          when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         ERR err -> do
           toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
           when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         -- TODO add debugging output
         _ -> pure ()
 
-    processRcvFileConn :: ACommand 'Agent e -> ConnectionEntity -> Connection -> RcvFileTransfer -> m ()
+    processRcvFileConn :: ACommand 'Agent e -> ConnectionEntity -> Connection -> RcvFileTransfer -> CM ()
     processRcvFileConn agentMsg connEntity conn ft@RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName}, grpMemberId} =
       case agentMsg of
         INV (ACR _ cReq) ->
@@ -4260,7 +4283,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           parseFileChunk msgBody >>= receiveFileChunk ft (Just conn) meta
         OK ->
           -- [async agent commands] continuation on receiving OK
-          withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
+          when (corrId /= "") $ withCompletedCommand conn agentMsg $ \_cmdData -> pure ()
         MERR _ err -> do
           toView $ CRChatError (Just user) (ChatErrorAgent err $ Just connEntity)
           incAuthErrCounter connEntity conn err
@@ -4270,7 +4293,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         -- TODO add debugging output
         _ -> pure ()
 
-    receiveFileChunk :: RcvFileTransfer -> Maybe Connection -> MsgMeta -> FileChunk -> m ()
+    receiveFileChunk :: RcvFileTransfer -> Maybe Connection -> MsgMeta -> FileChunk -> CM ()
     receiveFileChunk ft@RcvFileTransfer {fileId, chunkSize} conn_ meta@MsgMeta {recipient = (msgId, _), integrity} = \case
       FileChunkCancel ->
         unless (rcvFileCompleteOrCancelled ft) $ do
@@ -4287,7 +4310,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           RcvChunkOk ->
             if B.length chunk /= fromInteger chunkSize
               then badRcvFileChunk ft "incorrect chunk size"
-              else ack $ appendFileChunk ft chunkNo chunk False
+              else withAckMessage' agentConnId meta $ appendFileChunk ft chunkNo chunk False
           RcvChunkFinal ->
             if B.length chunk > fromInteger chunkSize
               then badRcvFileChunk ft "incorrect chunk size"
@@ -4301,14 +4324,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   getChatItemByFileId db vr user fileId
                 toView $ CRRcvFileComplete user ci
                 forM_ conn_ $ \conn -> deleteAgentConnectionAsync user (aConnId conn)
-          RcvChunkDuplicate -> ack $ pure ()
+          RcvChunkDuplicate -> withAckMessage' agentConnId meta $ pure ()
           RcvChunkError -> badRcvFileChunk ft $ "incorrect chunk number " <> show chunkNo
-      where
-        ack a = case conn_ of
-          Just conn -> withAckMessage' agentConnId conn meta a
-          Nothing -> a
 
-    processUserContactRequest :: ACommand 'Agent e -> ConnectionEntity -> Connection -> UserContact -> m ()
+    processUserContactRequest :: ACommand 'Agent e -> ConnectionEntity -> Connection -> UserContact -> CM ()
     processUserContactRequest agentMsg connEntity conn UserContact {userContactLinkId} = case agentMsg of
       REQ invId pqSupport _ connInfo -> do
         ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage conn connInfo
@@ -4326,7 +4345,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       -- TODO add debugging output
       _ -> pure ()
       where
-        profileContactRequest :: InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> PQSupport -> m ()
+        profileContactRequest :: InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> PQSupport -> CM ()
         profileContactRequest invId chatVRange p xContactId_ reqPQSup = do
           withStore (\db -> createOrUpdateContactRequest db vr user userContactLinkId invId chatVRange p xContactId_ reqPQSup) >>= \case
             CORContact contact -> toView $ CRContactRequestAlreadyAccepted user contact
@@ -4356,12 +4375,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                         toView $ CRAcceptingGroupJoinRequest user gInfo ct
                 _ -> toView $ CRReceivedContactRequest user cReq
 
-    memberCanSend :: GroupMember -> m () -> m ()
+    memberCanSend :: GroupMember -> CM () -> CM ()
     memberCanSend GroupMember {memberRole} a
       | memberRole <= GRObserver = messageError "member is not allowed to send messages"
       | otherwise = a
 
-    incAuthErrCounter :: ConnectionEntity -> Connection -> AgentErrorType -> m ()
+    incAuthErrCounter :: ConnectionEntity -> Connection -> AgentErrorType -> CM ()
     incAuthErrCounter connEntity conn err = do
       case err of
         SMP SMP.AUTH -> do
@@ -4370,14 +4389,16 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             toView $ CRConnectionDisabled connEntity
         _ -> pure ()
 
-    updateChatLock :: MsgEncodingI enc => String -> ChatMsgEvent enc -> m ()
+    updateChatLock :: MsgEncodingI enc => String -> ChatMsgEvent enc -> CM ()
     updateChatLock name event = do
       l <- asks chatLock
       atomically $ tryReadTMVar l >>= mapM_ (swapTMVar l . (<> s))
       where
         s = " " <> name <> "=" <> B.unpack (strEncode $ toCMEventTag event)
 
-    withCompletedCommand :: forall e. AEntityI e => Connection -> ACommand 'Agent e -> (CommandData -> m ()) -> m ()
+    -- TODO v5.7 / v6.0 - together with deprecating old group protocol establishing direct connections?
+    -- we could save command records only for agent APIs we process continuations for (INV)
+    withCompletedCommand :: forall e. AEntityI e => Connection -> ACommand 'Agent e -> (CommandData -> CM ()) -> CM ()
     withCompletedCommand Connection {connId} agentMsg action = do
       let agentMsgTag = APCT (sAEntity @e) $ aCommandTag agentMsg
       cmdData_ <- withStore' $ \db -> getCommandDataByCorrId db user corrId
@@ -4394,38 +4415,29 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           withStore' $ \db -> updateCommandStatus db user cmdId CSError
           throwChatError . CEAgentCommandError $ msg
 
-    createAckCmd :: Connection -> m CommandId
-    createAckCmd Connection {connId} = do
-      withStore' $ \db -> createCommand db user (Just connId) CFAckMessage
+    withAckMessage' :: ConnId -> MsgMeta -> CM () -> CM ()
+    withAckMessage' cId msgMeta action = do
+      withAckMessage cId msgMeta False $ action $> False
 
-    withAckMessage' :: ConnId -> Connection -> MsgMeta -> m () -> m ()
-    withAckMessage' cId conn msgMeta action = do
-      withAckMessage cId conn msgMeta False $ \_cmdId -> action $> False
-
-    withAckMessage :: ConnId -> Connection -> MsgMeta -> Bool -> (CommandId -> m Bool) -> m ()
-    withAckMessage cId conn msgMeta showCritical action = do
-      cmdId <- createAckCmd conn `catchChatError` \e -> throwError $ ChatErrorAgent (CRITICAL True $ show e) Nothing
-      -- [async agent commands] command should be asynchronous, continuation is ackMsgDeliveryEvent
+    withAckMessage :: ConnId -> MsgMeta -> Bool -> CM Bool -> CM ()
+    withAckMessage cId msgMeta showCritical action =
+      -- [async agent commands] command should be asynchronous
       -- TODO catching error and sending ACK after an error, particularly if it is a database error, will result in the message not processed (and no notification to the user).
       -- Possible solutions are:
       -- 1) retry processing several times
       -- 2) stabilize database
       -- 3) show screen of death to the user asking to restart
-      tryChatError (action cmdId) >>= \case
-        Right withRcpt -> ackMsg cId cmdId msgMeta $ if withRcpt then Just "" else Nothing
+      tryChatError action >>= \case
+        Right withRcpt -> ackMsg msgMeta $ if withRcpt then Just "" else Nothing
         -- If showCritical is True, then these errors don't result in ACK and show user visible alert
         -- This prevents losing the message that failed to be processed.
         Left (ChatErrorStore SEDBBusyError {message}) | showCritical -> throwError $ ChatErrorAgent (CRITICAL True message) Nothing
-        Left e -> ackMsg cId cmdId msgMeta Nothing >> throwError e
+        Left e -> ackMsg msgMeta Nothing >> throwError e
+        where
+          ackMsg :: MsgMeta -> Maybe MsgReceiptInfo -> CM ()
+          ackMsg MsgMeta {recipient = (msgId, _)} rcpt = withAgent $ \a -> ackMessageAsync a "" cId msgId rcpt
 
-    ackMsg :: ConnId -> CommandId -> MsgMeta -> Maybe MsgReceiptInfo -> m ()
-    ackMsg cId cmdId MsgMeta {recipient = (msgId, _)} rcpt = withAgent $ \a -> ackMessageAsync a (aCorrId cmdId) cId msgId rcpt
-
-    ackMsgDeliveryEvent :: Connection -> CommandId -> m ()
-    ackMsgDeliveryEvent Connection {connId} ackCmdId =
-      withStore' $ \db -> updateRcvMsgDeliveryStatus db connId ackCmdId MDSRcvAcknowledged
-
-    sentMsgDeliveryEvent :: Connection -> AgentMsgId -> m ()
+    sentMsgDeliveryEvent :: Connection -> AgentMsgId -> CM ()
     sentMsgDeliveryEvent Connection {connId} msgId =
       withStore' $ \db -> updateSndMsgDeliveryStatus db connId msgId MDSSndSent
 
@@ -4433,28 +4445,28 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     agentErrToItemStatus (SMP AUTH) = CISSndErrorAuth
     agentErrToItemStatus err = CISSndError . T.unpack . safeDecodeUtf8 $ strEncode err
 
-    badRcvFileChunk :: RcvFileTransfer -> String -> m ()
+    badRcvFileChunk :: RcvFileTransfer -> String -> CM ()
     badRcvFileChunk ft err =
       unless (rcvFileCompleteOrCancelled ft) $ do
         cancelRcvFileTransfer user ft >>= mapM_ (deleteAgentConnectionAsync user)
         throwChatError $ CEFileRcvChunk err
 
-    memberConnectedChatItem :: GroupInfo -> GroupMember -> m ()
+    memberConnectedChatItem :: GroupInfo -> GroupMember -> CM ()
     memberConnectedChatItem gInfo m =
       -- ts should be broker ts but we don't have it for CON
       createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvGroupEvent RGEMemberConnected) Nothing
 
-    groupDescriptionChatItem :: GroupInfo -> GroupMember -> Text -> m ()
+    groupDescriptionChatItem :: GroupInfo -> GroupMember -> Text -> CM ()
     groupDescriptionChatItem gInfo m descr =
       createInternalChatItem user (CDGroupRcv gInfo m) (CIRcvMsgContent $ MCText descr) Nothing
 
-    notifyMemberConnected :: GroupInfo -> GroupMember -> Maybe Contact -> m ()
+    notifyMemberConnected :: GroupInfo -> GroupMember -> Maybe Contact -> CM ()
     notifyMemberConnected gInfo m ct_ = do
       memberConnectedChatItem gInfo m
-      mapM_ (`setContactNetworkStatus` NSConnected) ct_
+      lift $ mapM_ (`setContactNetworkStatus` NSConnected) ct_
       toView $ CRConnectedToGroupMember user gInfo m ct_
 
-    probeMatchingContactsAndMembers :: Contact -> IncognitoEnabled -> Bool -> m ()
+    probeMatchingContactsAndMembers :: Contact -> IncognitoEnabled -> Bool -> CM ()
     probeMatchingContactsAndMembers ct connectedIncognito doProbeContacts = do
       gVar <- asks random
       contactMerge <- readTVarIO =<< asks contactMergeEnabled
@@ -4474,10 +4486,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           sendProbeHashes (cs <> ms) probe probeId
         else sendProbe . Probe =<< liftIO (encodedRandomBytes gVar 32)
       where
-        sendProbe :: Probe -> m ()
+        sendProbe :: Probe -> CM ()
         sendProbe probe = void . sendDirectContactMessage user ct $ XInfoProbe probe
 
-    probeMatchingMemberContact :: GroupMember -> IncognitoEnabled -> m ()
+    probeMatchingMemberContact :: GroupMember -> IncognitoEnabled -> CM ()
     probeMatchingMemberContact GroupMember {activeConn = Nothing} _ = pure ()
     probeMatchingMemberContact m@GroupMember {groupId, activeConn = Just conn} connectedIncognito = do
       gVar <- asks random
@@ -4490,15 +4502,15 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           sendProbeHashes cs probe probeId
         else sendProbe . Probe =<< liftIO (encodedRandomBytes gVar 32)
       where
-        sendProbe :: Probe -> m ()
+        sendProbe :: Probe -> CM ()
         sendProbe probe = void $ sendDirectMemberMessage conn (XInfoProbe probe) groupId
 
-    sendProbeHashes :: [ContactOrMember] -> Probe -> Int64 -> m ()
+    sendProbeHashes :: [ContactOrMember] -> Probe -> Int64 -> CM ()
     sendProbeHashes cgms probe probeId =
       forM_ cgms $ \cgm -> sendProbeHash cgm `catchChatError` \_ -> pure ()
       where
         probeHash = ProbeHash $ C.sha256Hash (unProbe probe)
-        sendProbeHash :: ContactOrMember -> m ()
+        sendProbeHash :: ContactOrMember -> CM ()
         sendProbeHash cgm@(COMContact c) = do
           void . sendDirectContactMessage user c $ XInfoProbeCheck probeHash
           withStore' $ \db -> createSentProbeHash db userId probeId cgm
@@ -4508,13 +4520,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             void $ sendDirectMemberMessage conn (XInfoProbeCheck probeHash) groupId
             withStore' $ \db -> createSentProbeHash db userId probeId cgm
 
-    messageWarning :: Text -> m ()
+    messageWarning :: Text -> CM ()
     messageWarning = toView . CRMessageError user "warning"
 
-    messageError :: Text -> m ()
+    messageError :: Text -> CM ()
     messageError = toView . CRMessageError user "error"
 
-    newContentMessage :: Contact -> MsgContainer -> RcvMessage -> MsgMeta -> m ()
+    newContentMessage :: Contact -> MsgContainer -> RcvMessage -> MsgMeta -> CM ()
     newContentMessage ct@Contact {contactUsed} mc msg@RcvMessage {sharedMsgId_} msgMeta = do
       unless contactUsed $ withStore' $ \db -> updateContactUsed db user ct
       let ExtMsgContent content fInv_ _ _ = mcExtMsgContent mc
@@ -4541,36 +4553,39 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           reactions <- maybe (pure []) (\sharedMsgId -> withStore' $ \db -> getDirectCIReactions db ct sharedMsgId) sharedMsgId_
           toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci {reactions})
 
-    autoAcceptFile :: Maybe (RcvFileTransfer, CIFile 'MDRcv) -> m ()
+    autoAcceptFile :: Maybe (RcvFileTransfer, CIFile 'MDRcv) -> CM ()
     autoAcceptFile = mapM_ $ \(ft, CIFile {fileSize}) -> do
       ChatConfig {autoAcceptFileSize = sz} <- asks config
       when (sz > fileSize) $ receiveFile' user ft Nothing Nothing >>= toView
 
-    messageFileDescription :: Contact -> SharedMsgId -> FileDescr -> m ()
-    messageFileDescription Contact {contactId} sharedMsgId fileDescr = do
+    messageFileDescription :: Contact -> SharedMsgId -> FileDescr -> CM ()
+    messageFileDescription ct@Contact {contactId} sharedMsgId fileDescr = do
       fileId <- withStore $ \db -> getFileIdBySharedMsgId db userId contactId sharedMsgId
-      processFDMessage fileId fileDescr
+      processFDMessage (CDDirectRcv ct) sharedMsgId fileId fileDescr
 
-    groupMessageFileDescription :: GroupInfo -> GroupMember -> SharedMsgId -> FileDescr -> m ()
-    groupMessageFileDescription GroupInfo {groupId} _m sharedMsgId fileDescr = do
+    groupMessageFileDescription :: GroupInfo -> GroupMember -> SharedMsgId -> FileDescr -> CM ()
+    groupMessageFileDescription g@GroupInfo {groupId} m sharedMsgId fileDescr = do
       fileId <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId
-      processFDMessage fileId fileDescr
+      processFDMessage (CDGroupRcv g m) sharedMsgId fileId fileDescr
 
-    processFDMessage :: FileTransferId -> FileDescr -> m ()
-    processFDMessage fileId fileDescr = do
+    processFDMessage :: ChatTypeQuotable c => ChatDirection c 'MDRcv -> SharedMsgId -> FileTransferId -> FileDescr -> CM ()
+    processFDMessage cd sharedMsgId fileId fileDescr = do
       ft <- withStore $ \db -> getRcvFileTransfer db user fileId
       unless (rcvFileCompleteOrCancelled ft) $ do
-        (rfd, RcvFileTransfer {fileStatus, xftpRcvFile, cryptoArgs}) <- withStore $ \db -> do
+        (rfd@RcvFileDescr {fileDescrComplete}, ft'@RcvFileTransfer {fileStatus, xftpRcvFile, cryptoArgs}) <- withStore $ \db -> do
           rfd <- appendRcvFD db userId fileId fileDescr
           -- reading second time in the same transaction as appending description
           -- to prevent race condition with accept
           ft' <- getRcvFileTransfer db user fileId
           pure (rfd, ft')
+        when fileDescrComplete $ do
+          ci <- withStore $ \db -> getAChatItemBySharedMsgId db user cd sharedMsgId
+          toView $ CRRcvFileDescrReady user ci ft' rfd
         case (fileStatus, xftpRcvFile) of
           (RFSAccepted _, Just XFTPRcvFile {}) -> receiveViaCompleteFD user fileId rfd cryptoArgs
           _ -> pure ()
 
-    processFileInvitation :: Maybe FileInvitation -> MsgContent -> (DB.Connection -> FileInvitation -> Maybe InlineFileMode -> Integer -> ExceptT StoreError IO RcvFileTransfer) -> m (Maybe (RcvFileTransfer, CIFile 'MDRcv))
+    processFileInvitation :: Maybe FileInvitation -> MsgContent -> (DB.Connection -> FileInvitation -> Maybe InlineFileMode -> Integer -> ExceptT StoreError IO RcvFileTransfer) -> CM (Maybe (RcvFileTransfer, CIFile 'MDRcv))
     processFileInvitation fInv_ mc createRcvFT = forM fInv_ $ \fInv@FileInvitation {fileName, fileSize} -> do
       ChatConfig {fileChunkSize} <- asks config
       inline <- receiveInlineMode fInv (Just mc) fileChunkSize
@@ -4588,7 +4603,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           fileSource = (`CryptoFile` cryptoArgs) <$> filePath
       pure (ft', CIFile {fileId, fileName, fileSize, fileSource, fileStatus, fileProtocol})
 
-    messageUpdate :: Contact -> SharedMsgId -> MsgContent -> RcvMessage -> MsgMeta -> Maybe Int -> Maybe Bool -> m ()
+    messageUpdate :: Contact -> SharedMsgId -> MsgContent -> RcvMessage -> MsgMeta -> Maybe Int -> Maybe Bool -> CM ()
     messageUpdate ct@Contact {contactId} sharedMsgId mc msg@RcvMessage {msgId} msgMeta ttl live_ = do
       updateRcvChatItem `catchCINotFound` \_ -> do
         -- This patches initial sharedMsgId into chat item when locally deleted chat item
@@ -4621,7 +4636,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 else toView $ CRChatItemNotChanged user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
             _ -> messageError "x.msg.update: contact attempted invalid message update"
 
-    messageDelete :: Contact -> SharedMsgId -> RcvMessage -> MsgMeta -> m ()
+    messageDelete :: Contact -> SharedMsgId -> RcvMessage -> MsgMeta -> CM ()
     messageDelete ct@Contact {contactId} sharedMsgId RcvMessage {msgId} msgMeta = do
       deleteRcvChatItem `catchCINotFound` (toView . CRChatItemDeletedNotFound user ct)
       where
@@ -4635,7 +4650,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 else markDirectCIDeleted user ct ci msgId False brokerTs >>= toView
             SMDSnd -> messageError "x.msg.del: contact attempted invalid message delete"
 
-    directMsgReaction :: Contact -> SharedMsgId -> MsgReaction -> Bool -> RcvMessage -> MsgMeta -> m ()
+    directMsgReaction :: Contact -> SharedMsgId -> MsgReaction -> Bool -> RcvMessage -> MsgMeta -> CM ()
     directMsgReaction ct sharedMsgId reaction add RcvMessage {msgId} MsgMeta {broker = (_, brokerTs)} = do
       when (featureAllowed SCFReactions forContact ct) $ do
         rs <- withStore' $ \db -> getDirectReactions db ct sharedMsgId False
@@ -4656,7 +4671,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               else pure Nothing
           mapM_ toView cr_
 
-    groupMsgReaction :: GroupInfo -> GroupMember -> SharedMsgId -> MemberId -> MsgReaction -> Bool -> RcvMessage -> UTCTime -> m ()
+    groupMsgReaction :: GroupInfo -> GroupMember -> SharedMsgId -> MemberId -> MsgReaction -> Bool -> RcvMessage -> UTCTime -> CM ()
     groupMsgReaction g@GroupInfo {groupId} m sharedMsgId itemMemberId reaction add RcvMessage {msgId} brokerTs = do
       when (groupFeatureAllowed SGFReactions g) $ do
         rs <- withStore' $ \db -> getGroupReactions db g m itemMemberId sharedMsgId False
@@ -4680,13 +4695,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     reactionAllowed :: Bool -> MsgReaction -> [MsgReaction] -> Bool
     reactionAllowed add reaction rs = (reaction `elem` rs) /= add && not (add && length rs >= maxMsgReactions)
 
-    catchCINotFound :: m a -> (SharedMsgId -> m a) -> m a
+    catchCINotFound :: CM a -> (SharedMsgId -> CM a) -> CM a
     catchCINotFound f handle =
       f `catchChatError` \case
         ChatErrorStore (SEChatItemSharedMsgIdNotFound sharedMsgId) -> handle sharedMsgId
         e -> throwError e
 
-    newGroupContentMessage :: GroupInfo -> GroupMember -> MsgContainer -> RcvMessage -> UTCTime -> Bool -> m ()
+    newGroupContentMessage :: GroupInfo -> GroupMember -> MsgContainer -> RcvMessage -> UTCTime -> Bool -> CM ()
     newGroupContentMessage gInfo m@GroupMember {memberId, memberRole} mc msg@RcvMessage {sharedMsgId_} brokerTs forwarded
       | blockedByAdmin m = createBlockedByAdmin
       | isVoice content && not (groupFeatureAllowed SGFVoice gInfo) = rejected GFVoice
@@ -4737,7 +4752,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           reactions <- maybe (pure []) (\sharedMsgId -> withStore' $ \db -> getGroupCIReactions db gInfo memberId sharedMsgId) sharedMsgId_
           groupMsgToView gInfo ci' {reactions}
 
-    groupMessageUpdate :: GroupInfo -> GroupMember -> SharedMsgId -> MsgContent -> RcvMessage -> UTCTime -> Maybe Int -> Maybe Bool -> m ()
+    groupMessageUpdate :: GroupInfo -> GroupMember -> SharedMsgId -> MsgContent -> RcvMessage -> UTCTime -> Maybe Int -> Maybe Bool -> CM ()
     groupMessageUpdate gInfo@GroupInfo {groupId} m@GroupMember {groupMemberId, memberId} sharedMsgId mc msg@RcvMessage {msgId} brokerTs ttl_ live_ =
       updateRcvChatItem `catchCINotFound` \_ -> do
         -- This patches initial sharedMsgId into chat item when locally deleted chat item
@@ -4773,7 +4788,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 else messageError "x.msg.update: group member attempted to update a message of another member"
             _ -> messageError "x.msg.update: group member attempted invalid message update"
 
-    groupMessageDelete :: GroupInfo -> GroupMember -> SharedMsgId -> Maybe MemberId -> RcvMessage -> UTCTime -> m ()
+    groupMessageDelete :: GroupInfo -> GroupMember -> SharedMsgId -> Maybe MemberId -> RcvMessage -> UTCTime -> CM ()
     groupMessageDelete gInfo@GroupInfo {groupId, membership} m@GroupMember {memberId, memberRole = senderRole} sharedMsgId sndMemberId_ RcvMessage {msgId} brokerTs = do
       let msgMemberId = fromMaybe memberId sndMemberId_
       withStore' (\db -> runExceptT $ getGroupMemberCIBySharedMsgId db user groupId msgMemberId sharedMsgId) >>= \case
@@ -4787,7 +4802,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | senderRole < GRAdmin -> messageError $ "x.msg.del: message not found, message of another member with insufficient member permissions, " <> tshow e
           | otherwise -> withStore' $ \db -> createCIModeration db gInfo m msgMemberId sharedMsgId msgId brokerTs
       where
-        deleteMsg :: MsgDirectionI d => GroupMember -> ChatItem 'CTGroup d -> m ()
+        deleteMsg :: MsgDirectionI d => GroupMember -> ChatItem 'CTGroup d -> CM ()
         deleteMsg mem ci = case sndMemberId_ of
           Just sndMemberId
             | sameMemberId sndMemberId mem -> checkRole mem $ delete ci (Just m) >>= toView
@@ -4797,13 +4812,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | senderRole < GRAdmin || senderRole < memberRole =
               messageError "x.msg.del: message of another member with insufficient member permissions"
           | otherwise = a
-        delete :: MsgDirectionI d => ChatItem 'CTGroup d -> Maybe GroupMember -> m ChatResponse
+        delete :: MsgDirectionI d => ChatItem 'CTGroup d -> Maybe GroupMember -> CM ChatResponse
         delete ci byGroupMember
           | groupFeatureAllowed SGFFullDelete gInfo = deleteGroupCI user gInfo ci False False byGroupMember brokerTs
           | otherwise = markGroupCIDeleted user gInfo ci msgId False byGroupMember brokerTs
 
     -- TODO remove once XFile is discontinued
-    processFileInvitation' :: Contact -> FileInvitation -> RcvMessage -> MsgMeta -> m ()
+    processFileInvitation' :: Contact -> FileInvitation -> RcvMessage -> MsgMeta -> CM ()
     processFileInvitation' ct fInv@FileInvitation {fileName, fileSize} msg@RcvMessage {sharedMsgId_} msgMeta = do
       ChatConfig {fileChunkSize} <- asks config
       inline <- receiveInlineMode fInv Nothing fileChunkSize
@@ -4816,7 +4831,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         brokerTs = metaBrokerTs msgMeta
 
     -- TODO remove once XFile is discontinued
-    processGroupFileInvitation' :: GroupInfo -> GroupMember -> FileInvitation -> RcvMessage -> UTCTime -> m ()
+    processGroupFileInvitation' :: GroupInfo -> GroupMember -> FileInvitation -> RcvMessage -> UTCTime -> CM ()
     processGroupFileInvitation' gInfo m fInv@FileInvitation {fileName, fileSize} msg@RcvMessage {sharedMsgId_} brokerTs = do
       ChatConfig {fileChunkSize} <- asks config
       inline <- receiveInlineMode fInv Nothing fileChunkSize
@@ -4832,7 +4847,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       | showMessages (memberSettings m) = pure ci
       | otherwise = blockedCI
 
-    receiveInlineMode :: FileInvitation -> Maybe MsgContent -> Integer -> m (Maybe InlineFileMode)
+    receiveInlineMode :: FileInvitation -> Maybe MsgContent -> Integer -> CM (Maybe InlineFileMode)
     receiveInlineMode FileInvitation {fileSize, fileInline, fileDescr} mc_ chSize = case (fileInline, fileDescr) of
       (Just mode, Nothing) -> do
         InlineFilesConfig {receiveChunks, receiveInstant} <- asks $ inlineFiles . config
@@ -4841,7 +4856,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           inline' receiveInstant = if mode == IFMOffer || (receiveInstant && maybe False isVoice mc_) then fileInline else Nothing
       _ -> pure Nothing
 
-    xFileCancel :: Contact -> SharedMsgId -> m ()
+    xFileCancel :: Contact -> SharedMsgId -> CM ()
     xFileCancel Contact {contactId} sharedMsgId = do
       fileId <- withStore $ \db -> getFileIdBySharedMsgId db userId contactId sharedMsgId
       ft <- withStore (\db -> getRcvFileTransfer db user fileId)
@@ -4850,7 +4865,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         ci <- withStore $ \db -> getChatItemByFileId db vr user fileId
         toView $ CRRcvFileSndCancelled user ci ft
 
-    xFileAcptInv :: Contact -> SharedMsgId -> Maybe ConnReqInvitation -> String -> m ()
+    xFileAcptInv :: Contact -> SharedMsgId -> Maybe ConnReqInvitation -> String -> CM ()
     xFileAcptInv ct sharedMsgId fileConnReq_ fName = do
       fileId <- withStore $ \db -> getDirectFileIdBySharedMsgId db user ct sharedMsgId
       (AChatItem _ _ _ ci) <- withStore $ \db -> getChatItemByFileId db vr user fileId
@@ -4878,7 +4893,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               (messageError "x.file.acpt.inv: fileSize is bigger than allowed to send inline")
         else messageError "x.file.acpt.inv: fileName is different from expected"
 
-    assertSMPAcceptNotProhibited :: ChatItem c d -> m ()
+    assertSMPAcceptNotProhibited :: ChatItem c d -> CM ()
     assertSMPAcceptNotProhibited ChatItem {file = Just CIFile {fileId, fileProtocol}, content}
       | fileProtocol == FPXFTP && not (imageOrVoice content) = throwChatError $ CEFallbackToSMPProhibited fileId
       | otherwise = pure ()
@@ -4889,7 +4904,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         imageOrVoice _ = False
     assertSMPAcceptNotProhibited _ = pure ()
 
-    checkSndInlineFTComplete :: Connection -> AgentMsgId -> m ()
+    checkSndInlineFTComplete :: Connection -> AgentMsgId -> CM ()
     checkSndInlineFTComplete conn agentMsgId = do
       sft_ <- withStore' $ \db -> getSndFTViaMsgDelivery db user conn agentMsgId
       forM_ sft_ $ \sft@SndFileTransfer {fileId} -> do
@@ -4903,24 +4918,24 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             toView $ CRSndFileCompleteXFTP user ci ft
           _ -> toView $ CRSndFileComplete user ci sft
 
-    allowSendInline :: Integer -> Maybe InlineFileMode -> m Bool
+    allowSendInline :: Integer -> Maybe InlineFileMode -> CM Bool
     allowSendInline fileSize = \case
       Just IFMOffer -> do
         ChatConfig {fileChunkSize, inlineFiles} <- asks config
         pure $ fileSize <= fileChunkSize * offerChunks inlineFiles
       _ -> pure False
 
-    bFileChunk :: Contact -> SharedMsgId -> FileChunk -> MsgMeta -> m ()
+    bFileChunk :: Contact -> SharedMsgId -> FileChunk -> MsgMeta -> CM ()
     bFileChunk ct sharedMsgId chunk meta = do
       ft <- withStore $ \db -> getDirectFileIdBySharedMsgId db user ct sharedMsgId >>= getRcvFileTransfer db user
       receiveInlineChunk ft chunk meta
 
-    bFileChunkGroup :: GroupInfo -> SharedMsgId -> FileChunk -> MsgMeta -> m ()
+    bFileChunkGroup :: GroupInfo -> SharedMsgId -> FileChunk -> MsgMeta -> CM ()
     bFileChunkGroup GroupInfo {groupId} sharedMsgId chunk meta = do
       ft <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId >>= getRcvFileTransfer db user
       receiveInlineChunk ft chunk meta
 
-    receiveInlineChunk :: RcvFileTransfer -> FileChunk -> MsgMeta -> m ()
+    receiveInlineChunk :: RcvFileTransfer -> FileChunk -> MsgMeta -> CM ()
     receiveInlineChunk RcvFileTransfer {fileId, fileStatus = RFSNew} FileChunk {chunkNo} _
       | chunkNo == 1 = throwChatError $ CEInlineFileProhibited fileId
       | otherwise = pure ()
@@ -4930,7 +4945,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         _ -> pure ()
       receiveFileChunk ft Nothing meta chunk
 
-    xFileCancelGroup :: GroupInfo -> GroupMember -> SharedMsgId -> m ()
+    xFileCancelGroup :: GroupInfo -> GroupMember -> SharedMsgId -> CM ()
     xFileCancelGroup GroupInfo {groupId} GroupMember {groupMemberId, memberId} sharedMsgId = do
       fileId <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId
       CChatItem msgDir ChatItem {chatDir} <- withStore $ \db -> getGroupChatItemBySharedMsgId db user groupId groupMemberId sharedMsgId
@@ -4946,7 +4961,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             else messageError "x.file.cancel: group member attempted to cancel file of another member" -- shouldn't happen now that query includes group member id
         (SMDSnd, _) -> messageError "x.file.cancel: group member attempted invalid file cancel"
 
-    xFileAcptInvGroup :: GroupInfo -> GroupMember -> SharedMsgId -> Maybe ConnReqInvitation -> String -> m ()
+    xFileAcptInvGroup :: GroupInfo -> GroupMember -> SharedMsgId -> Maybe ConnReqInvitation -> String -> CM ()
     xFileAcptInvGroup GroupInfo {groupId} m@GroupMember {activeConn} sharedMsgId fileConnReq_ fName = do
       fileId <- withStore $ \db -> getGroupFileIdBySharedMsgId db userId groupId sharedMsgId
       (AChatItem _ _ _ ci) <- withStore $ \db -> getChatItemByFileId db vr user fileId
@@ -4976,11 +4991,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           _ -> messageError "x.file.acpt.inv: member connection is not active"
         else messageError "x.file.acpt.inv: fileName is different from expected"
 
-    groupMsgToView :: GroupInfo -> ChatItem 'CTGroup 'MDRcv -> m ()
+    groupMsgToView :: GroupInfo -> ChatItem 'CTGroup 'MDRcv -> CM ()
     groupMsgToView gInfo ci =
       toView $ CRNewChatItem user (AChatItem SCTGroup SMDRcv (GroupChat gInfo) ci)
 
-    processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> m ()
+    processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> CM ()
     processGroupInvitation ct inv msg msgMeta = do
       let Contact {localDisplayName = c, activeConn} = ct
           GroupInvitation {fromMember = (MemberIdRole fromMemId fromRole), invitedMember = (MemberIdRole memId memRole), connRequest, groupLinkId} = inv
@@ -5013,15 +5028,15 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         sameGroupLinkId (Just gli) (Just gli') = gli == gli'
         sameGroupLinkId _ _ = False
 
-    checkIntegrityCreateItem :: forall c. ChatTypeI c => ChatDirection c 'MDRcv -> MsgMeta -> m ()
+    checkIntegrityCreateItem :: forall c. ChatTypeI c => ChatDirection c 'MDRcv -> MsgMeta -> CM ()
     checkIntegrityCreateItem cd MsgMeta {integrity, broker = (_, brokerTs)} = case integrity of
       MsgOk -> pure ()
       MsgError e -> createInternalChatItem user cd (CIRcvIntegrityError e) (Just brokerTs)
 
-    xInfo :: Contact -> Profile -> m ()
+    xInfo :: Contact -> Profile -> CM ()
     xInfo c p' = void $ processContactProfileUpdate c p' True
 
-    xDirectDel :: Contact -> RcvMessage -> MsgMeta -> m ()
+    xDirectDel :: Contact -> RcvMessage -> MsgMeta -> CM ()
     xDirectDel c msg msgMeta =
       if directOrUsed c
         then do
@@ -5041,7 +5056,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       where
         brokerTs = metaBrokerTs msgMeta
 
-    processContactProfileUpdate :: Contact -> Profile -> Bool -> m Contact
+    processContactProfileUpdate :: Contact -> Profile -> Bool -> CM Contact
     processContactProfileUpdate c@Contact {profile = lp} p' createItems
       | p /= p' = do
           c' <- withStore $ \db ->
@@ -5052,7 +5067,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                 updateContactProfile db user c' p'
           when (directOrUsed c' && createItems) $ do
             createProfileUpdatedItem c'
-            createRcvFeatureItems user c c'
+            lift $ createRcvFeatureItems user c c'
           toView $ CRContactUpdated user c c'
           pure c'
       | otherwise =
@@ -5082,10 +5097,10 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             Profile {displayName = n, fullName = fn, image = i, contactLink = cl} = p
             Profile {displayName = n', fullName = fn', image = i', contactLink = cl'} = p'
 
-    xInfoMember :: GroupInfo -> GroupMember -> Profile -> m ()
+    xInfoMember :: GroupInfo -> GroupMember -> Profile -> CM ()
     xInfoMember gInfo m p' = void $ processMemberProfileUpdate gInfo m p' True
 
-    xGrpLinkMem :: GroupInfo -> GroupMember -> Connection -> Profile -> m ()
+    xGrpLinkMem :: GroupInfo -> GroupMember -> Connection -> Profile -> CM ()
     xGrpLinkMem gInfo@GroupInfo {membership} m@GroupMember {groupMemberId, memberCategory} Connection {viaGroupLink} p' = do
       xGrpLinkMemReceived <- withStore $ \db -> getXGrpLinkMemReceived db groupMemberId
       if viaGroupLink && isNothing (memberContactId m) && memberCategory == GCHostMember && not xGrpLinkMemReceived
@@ -5096,7 +5111,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           probeMatchingMemberContact m' connectedIncognito
         else messageError "x.grp.link.mem error: invalid group link host profile update"
 
-    processMemberProfileUpdate :: GroupInfo -> GroupMember -> Profile -> Bool -> m GroupMember
+    processMemberProfileUpdate :: GroupInfo -> GroupMember -> Profile -> Bool -> CM GroupMember
     processMemberProfileUpdate gInfo m@GroupMember {memberProfile = p, memberContactId} p' createItems
       | redactedMemberProfile (fromLocalProfile p) /= redactedMemberProfile p' =
           case memberContactId of
@@ -5129,20 +5144,20 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             let ciContent = CIRcvGroupEvent $ RGEMemberProfileUpdated (fromLocalProfile p) p'
             createInternalChatItem user (CDGroupRcv gInfo m') ciContent Nothing
 
-    createFeatureEnabledItems :: Contact -> m ()
+    createFeatureEnabledItems :: Contact -> CM ()
     createFeatureEnabledItems ct@Contact {mergedPreferences} =
       forM_ allChatFeatures $ \(ACF f) -> do
         let state = featureState $ getContactUserPreference f mergedPreferences
         createInternalChatItem user (CDDirectRcv ct) (uncurry (CIRcvChatFeature $ chatFeature f) state) Nothing
 
-    createGroupFeatureItems :: GroupInfo -> GroupMember -> m ()
+    createGroupFeatureItems :: GroupInfo -> GroupMember -> CM ()
     createGroupFeatureItems g@GroupInfo {fullGroupPreferences} m =
       forM_ allGroupFeatures $ \(AGF f) -> do
         let p = getGroupPreference f fullGroupPreferences
             (_, param) = groupFeatureState p
         createInternalChatItem user (CDGroupRcv g m) (CIRcvGroupFeature (toGroupFeature f) (toGroupPreference p) param) Nothing
 
-    xInfoProbe :: ContactOrMember -> Probe -> m ()
+    xInfoProbe :: ContactOrMember -> Probe -> CM ()
     xInfoProbe cgm2 probe = do
       contactMerge <- readTVarIO =<< asks contactMergeEnabled
       -- [incognito] unless connected incognito
@@ -5151,14 +5166,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         let cgm1s' = filter (not . contactOrMemberIncognito) cgm1s
         probeMatches cgm1s' cgm2
       where
-        probeMatches :: [ContactOrMember] -> ContactOrMember -> m ()
+        probeMatches :: [ContactOrMember] -> ContactOrMember -> CM ()
         probeMatches [] _ = pure ()
         probeMatches (cgm1' : cgm1s') cgm2' = do
           cgm2''_ <- probeMatch cgm1' cgm2' probe `catchChatError` \_ -> pure (Just cgm2')
           let cgm2'' = fromMaybe cgm2' cgm2''_
           probeMatches cgm1s' cgm2''
 
-    xInfoProbeCheck :: ContactOrMember -> ProbeHash -> m ()
+    xInfoProbeCheck :: ContactOrMember -> ProbeHash -> CM ()
     xInfoProbeCheck cgm1 probeHash = do
       contactMerge <- readTVarIO =<< asks contactMergeEnabled
       -- [incognito] unless connected incognito
@@ -5168,7 +5183,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           unless (contactOrMemberIncognito cgm2) . void $
             probeMatch cgm1 cgm2 probe
 
-    probeMatch :: ContactOrMember -> ContactOrMember -> Probe -> m (Maybe ContactOrMember)
+    probeMatch :: ContactOrMember -> ContactOrMember -> Probe -> CM (Maybe ContactOrMember)
     probeMatch cgm1 cgm2 probe =
       case cgm1 of
         COMContact c1@Contact {contactId = cId1, profile = p1} ->
@@ -5193,7 +5208,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               | otherwise -> messageWarning "probeMatch ignored: profiles don't match or member already has contact or member not current" >> pure Nothing
             COMGroupMember _ -> messageWarning "probeMatch ignored: members are not matched with members" >> pure Nothing
 
-    xInfoProbeOk :: ContactOrMember -> Probe -> m ()
+    xInfoProbeOk :: ContactOrMember -> Probe -> CM ()
     xInfoProbeOk cgm1 probe = do
       cgm2 <- withStore' $ \db -> matchSentProbe db vr user cgm1 probe
       case cgm1 of
@@ -5215,7 +5230,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             _ -> pure ()
 
     -- to party accepting call
-    xCallInv :: Contact -> CallId -> CallInvitation -> RcvMessage -> MsgMeta -> m ()
+    xCallInv :: Contact -> CallId -> CallInvitation -> RcvMessage -> MsgMeta -> CM ()
     xCallInv ct@Contact {contactId} callId CallInvitation {callType, callDhPubKey} msg@RcvMessage {sharedMsgId_} msgMeta = do
       if featureAllowed SCFCalls forContact ct
         then do
@@ -5243,7 +5258,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
 
     -- to party initiating call
-    xCallOffer :: Contact -> CallId -> CallOffer -> RcvMessage -> m ()
+    xCallOffer :: Contact -> CallId -> CallOffer -> RcvMessage -> CM ()
     xCallOffer ct callId CallOffer {callType, rtcSession, callDhPubKey} msg = do
       msgCurrentCall ct callId "x.call.offer" msg $
         \call -> case callState call of
@@ -5258,7 +5273,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             pure (Just call, Nothing)
 
     -- to party accepting call
-    xCallAnswer :: Contact -> CallId -> CallAnswer -> RcvMessage -> m ()
+    xCallAnswer :: Contact -> CallId -> CallAnswer -> RcvMessage -> CM ()
     xCallAnswer ct callId CallAnswer {rtcSession} msg = do
       msgCurrentCall ct callId "x.call.answer" msg $
         \call -> case callState call of
@@ -5271,7 +5286,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             pure (Just call, Nothing)
 
     -- to any call party
-    xCallExtra :: Contact -> CallId -> CallExtraInfo -> RcvMessage -> m ()
+    xCallExtra :: Contact -> CallId -> CallExtraInfo -> RcvMessage -> CM ()
     xCallExtra ct callId CallExtraInfo {rtcExtraInfo} msg = do
       msgCurrentCall ct callId "x.call.extra" msg $
         \call -> case callState call of
@@ -5290,13 +5305,13 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             pure (Just call, Nothing)
 
     -- to any call party
-    xCallEnd :: Contact -> CallId -> RcvMessage -> m ()
+    xCallEnd :: Contact -> CallId -> RcvMessage -> CM ()
     xCallEnd ct callId msg =
       msgCurrentCall ct callId "x.call.end" msg $ \Call {chatItemId} -> do
         toView $ CRCallEnded user ct
         (Nothing,) <$> callStatusItemContent user ct chatItemId WCSDisconnected
 
-    msgCurrentCall :: Contact -> CallId -> Text -> RcvMessage -> (Call -> m (Maybe Call, Maybe ACIContent)) -> m ()
+    msgCurrentCall :: Contact -> CallId -> Text -> RcvMessage -> (Call -> CM (Maybe Call, Maybe ACIContent)) -> CM ()
     msgCurrentCall ct@Contact {contactId = ctId'} callId' eventName RcvMessage {msgId} action = do
       calls <- asks currentCalls
       atomically (TM.lookup ctId' calls) >>= \case
@@ -5315,11 +5330,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               forM_ aciContent_ $ \aciContent ->
                 updateDirectChatItemView user ct chatItemId aciContent False $ Just msgId
 
-    msgCallStateError :: Text -> Call -> m ()
+    msgCallStateError :: Text -> Call -> CM ()
     msgCallStateError eventName Call {callState} =
       messageError $ eventName <> ": wrong call state " <> T.pack (show $ callStateTag callState)
 
-    mergeContacts :: Contact -> Contact -> m (Maybe Contact)
+    mergeContacts :: Contact -> Contact -> CM (Maybe Contact)
     mergeContacts c1 c2 = do
       let Contact {localDisplayName = cLDN1, profile = LocalProfile {displayName}} = c1
           Contact {localDisplayName = cLDN2} = c2
@@ -5349,7 +5364,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   | otherwise -> pure ()
                 _ -> pure ()
 
-    associateMemberAndContact :: Contact -> GroupMember -> m (Maybe Contact)
+    associateMemberAndContact :: Contact -> GroupMember -> CM (Maybe Contact)
     associateMemberAndContact c m = do
       let Contact {localDisplayName = cLDN, profile = LocalProfile {displayName}} = c
           GroupMember {localDisplayName = mLDN} = m
@@ -5367,21 +5382,21 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           Just suffix -> readMaybe $ T.unpack suffix
           Nothing -> Nothing
 
-    associateMemberWithContact :: Contact -> GroupMember -> m Contact
+    associateMemberWithContact :: Contact -> GroupMember -> CM Contact
     associateMemberWithContact c1 m2@GroupMember {groupId} = do
       withStore' $ \db -> associateMemberWithContactRecord db user c1 m2
       g <- withStore $ \db -> getGroupInfo db vr user groupId
       toView $ CRContactAndMemberAssociated user c1 g m2 c1
       pure c1
 
-    associateContactWithMember :: GroupMember -> Contact -> m Contact
+    associateContactWithMember :: GroupMember -> Contact -> CM Contact
     associateContactWithMember m1@GroupMember {groupId} c2 = do
       c2' <- withStore $ \db -> associateContactWithMemberRecord db vr user m1 c2
       g <- withStore $ \db -> getGroupInfo db vr user groupId
       toView $ CRContactAndMemberAssociated user c2 g m1 c2'
       pure c2'
 
-    saveConnInfo :: Connection -> ConnInfo -> m Connection
+    saveConnInfo :: Connection -> ConnInfo -> CM Connection
     saveConnInfo activeConn connInfo = do
       ChatMessage {chatVRange, chatMsgEvent} <- parseChatMessage activeConn connInfo
       conn' <- updatePeerChatVRange activeConn chatVRange
@@ -5398,7 +5413,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         -- TODO show/log error, other events in SMP confirmation
         _ -> pure conn'
 
-    xGrpMemNew :: GroupInfo -> GroupMember -> MemberInfo -> RcvMessage -> UTCTime -> m ()
+    xGrpMemNew :: GroupInfo -> GroupMember -> MemberInfo -> RcvMessage -> UTCTime -> CM ()
     xGrpMemNew gInfo m memInfo@(MemberInfo memId memRole _ _) msg brokerTs = do
       checkHostRole m memRole
       unless (sameMemberId memId $ membership gInfo) $
@@ -5418,7 +5433,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           groupMsgToView gInfo ci
           toView $ CRJoinedGroupMemberConnecting user gInfo m announcedMember
 
-    xGrpMemIntro :: GroupInfo -> GroupMember -> MemberInfo -> Maybe MemberRestrictions -> m ()
+    xGrpMemIntro :: GroupInfo -> GroupMember -> MemberInfo -> Maybe MemberRestrictions -> CM ()
     xGrpMemIntro gInfo@GroupInfo {chatSettings} m@GroupMember {memberRole, localDisplayName = c} memInfo@(MemberInfo memId _ memChatVRange _) memRestrictions = do
       case memberCategory m of
         GCHostMember ->
@@ -5442,14 +5457,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       where
         createConn subMode = createAgentConnectionAsync user CFCreateConnGrpMemInv (chatHasNtfs chatSettings) SCMInvitation subMode
 
-    sendXGrpMemInv :: Int64 -> Maybe ConnReqInvitation -> XGrpMemIntroCont -> m ()
+    sendXGrpMemInv :: Int64 -> Maybe ConnReqInvitation -> XGrpMemIntroCont -> CM ()
     sendXGrpMemInv hostConnId directConnReq XGrpMemIntroCont {groupId, groupMemberId, memberId, groupConnReq} = do
       hostConn <- withStore $ \db -> getConnectionById db vr user hostConnId
       let msg = XGrpMemInv memberId IntroInvitation {groupConnReq, directConnReq}
       void $ sendDirectMemberMessage hostConn msg groupId
       withStore' $ \db -> updateGroupMemberStatusById db userId groupMemberId GSMemIntroInvited
 
-    xGrpMemInv :: GroupInfo -> GroupMember -> MemberId -> IntroInvitation -> m ()
+    xGrpMemInv :: GroupInfo -> GroupMember -> MemberId -> IntroInvitation -> CM ()
     xGrpMemInv gInfo@GroupInfo {groupId} m memId introInv = do
       case memberCategory m of
         GCInviteeMember ->
@@ -5462,7 +5477,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
                   \db -> updateIntroStatus db introId GMIntroInvForwarded
         _ -> messageError "x.grp.mem.inv can be only sent by invitee member"
 
-    xGrpMemFwd :: GroupInfo -> GroupMember -> MemberInfo -> IntroInvitation -> m ()
+    xGrpMemFwd :: GroupInfo -> GroupMember -> MemberInfo -> IntroInvitation -> CM ()
     xGrpMemFwd gInfo@GroupInfo {membership, chatSettings} m memInfo@(MemberInfo memId memRole memChatVRange _) introInv@IntroInvitation {groupConnReq, directConnReq} = do
       let GroupMember {memberId = membershipMemId} = membership
       checkHostRole m memRole
@@ -5487,7 +5502,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           chatV = vr PQSupportOff `peerConnChatVersion` mcvr
       withStore' $ \db -> createIntroToMemberContact db user m toMember chatV mcvr groupConnIds directConnIds customUserProfileId subMode
 
-    xGrpMemRole :: GroupInfo -> GroupMember -> MemberId -> GroupMemberRole -> RcvMessage -> UTCTime -> m ()
+    xGrpMemRole :: GroupInfo -> GroupMember -> MemberId -> GroupMemberRole -> RcvMessage -> UTCTime -> CM ()
     xGrpMemRole gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId memRole msg brokerTs
       | membershipMemId == memId =
           let gInfo' = gInfo {membership = membership {memberRole = memRole}}
@@ -5506,11 +5521,11 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               groupMsgToView gInfo ci
               toView CRMemberRole {user, groupInfo = gInfo', byMember = m, member = member {memberRole = memRole}, fromRole, toRole = memRole}
 
-    checkHostRole :: GroupMember -> GroupMemberRole -> m ()
+    checkHostRole :: GroupMember -> GroupMemberRole -> CM ()
     checkHostRole GroupMember {memberRole, localDisplayName} memRole =
       when (memberRole < GRAdmin || memberRole < memRole) $ throwChatError (CEGroupContactRole localDisplayName)
 
-    xGrpMemRestrict :: GroupInfo -> GroupMember -> MemberId -> MemberRestrictions -> RcvMessage -> UTCTime -> m ()
+    xGrpMemRestrict :: GroupInfo -> GroupMember -> MemberId -> MemberRestrictions -> RcvMessage -> UTCTime -> CM ()
     xGrpMemRestrict
       gInfo@GroupInfo {groupId, membership = GroupMember {memberId = membershipMemId}}
       m@GroupMember {memberRole = senderRole}
@@ -5544,7 +5559,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               getGroupMember db vr user groupId bmId
           blocked = mrsBlocked restriction
 
-    xGrpMemCon :: GroupInfo -> GroupMember -> MemberId -> m ()
+    xGrpMemCon :: GroupInfo -> GroupMember -> MemberId -> CM ()
     xGrpMemCon gInfo sendingMember memId = do
       refMember <- withStore $ \db -> getGroupMemberByMemberId db vr user gInfo memId
       case (memberCategory sendingMember, memberCategory refMember) of
@@ -5571,19 +5586,19 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         _ ->
           messageWarning "x.grp.mem.con: neither member is invitee"
       where
-        inviteeXGrpMemCon :: GroupMemberIntro -> m ()
+        inviteeXGrpMemCon :: GroupMemberIntro -> CM ()
         inviteeXGrpMemCon GroupMemberIntro {introId, introStatus}
           | introStatus == GMIntroReConnected = updateStatus introId GMIntroConnected
           | introStatus `elem` [GMIntroToConnected, GMIntroConnected] = pure ()
           | otherwise = updateStatus introId GMIntroToConnected
-        forwardMemberXGrpMemCon :: GroupMemberIntro -> m ()
+        forwardMemberXGrpMemCon :: GroupMemberIntro -> CM ()
         forwardMemberXGrpMemCon GroupMemberIntro {introId, introStatus}
           | introStatus == GMIntroToConnected = updateStatus introId GMIntroConnected
           | introStatus `elem` [GMIntroReConnected, GMIntroConnected] = pure ()
           | otherwise = updateStatus introId GMIntroReConnected
         updateStatus introId status = withStore' $ \db -> updateIntroStatus db introId status
 
-    xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> RcvMessage -> UTCTime -> m ()
+    xGrpMemDel :: GroupInfo -> GroupMember -> MemberId -> RcvMessage -> UTCTime -> CM ()
     xGrpMemDel gInfo@GroupInfo {membership} m@GroupMember {memberRole = senderRole} memId msg brokerTs = do
       let GroupMember {memberId = membershipMemId} = membership
       if membershipMemId == memId
@@ -5615,7 +5630,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           ci <- saveRcvChatItem user (CDGroupRcv gInfo m) msg brokerTs (CIRcvGroupEvent gEvent)
           groupMsgToView gInfo ci
 
-    xGrpLeave :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> m ()
+    xGrpLeave :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> CM ()
     xGrpLeave gInfo m msg brokerTs = do
       deleteMemberConnection user m
       -- member record is not deleted to allow creation of "member left" chat item
@@ -5624,7 +5639,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       groupMsgToView gInfo ci
       toView $ CRLeftMember user gInfo m {memberStatus = GSMemLeft}
 
-    xGrpDel :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> m ()
+    xGrpDel :: GroupInfo -> GroupMember -> RcvMessage -> UTCTime -> CM ()
     xGrpDel gInfo@GroupInfo {membership} m@GroupMember {memberRole} msg brokerTs = do
       when (memberRole /= GROwner) $ throwChatError $ CEGroupUserRole gInfo GROwner
       ms <- withStore' $ \db -> do
@@ -5637,7 +5652,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
       groupMsgToView gInfo ci
       toView $ CRGroupDeleted user gInfo {membership = membership {memberStatus = GSMemGroupDeleted}} m
 
-    xGrpInfo :: GroupInfo -> GroupMember -> GroupProfile -> RcvMessage -> UTCTime -> m ()
+    xGrpInfo :: GroupInfo -> GroupMember -> GroupProfile -> RcvMessage -> UTCTime -> CM ()
     xGrpInfo g@GroupInfo {groupProfile = p} m@GroupMember {memberRole} p' msg brokerTs
       | memberRole < GROwner = messageError "x.grp.info with insufficient member permissions"
       | otherwise = unless (p == p') $ do
@@ -5649,7 +5664,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             groupMsgToView g' ci
           createGroupFeatureChangedItems user cd CIRcvGroupFeature g g'
 
-    xGrpDirectInv :: GroupInfo -> GroupMember -> Connection -> ConnReqInvitation -> Maybe MsgContent -> RcvMessage -> UTCTime -> m ()
+    xGrpDirectInv :: GroupInfo -> GroupMember -> Connection -> ConnReqInvitation -> Maybe MsgContent -> RcvMessage -> UTCTime -> CM ()
     xGrpDirectInv g m mConn connReq mContent_ msg brokerTs = do
       unless (groupFeatureAllowed SGFDirectMessages g) $ messageError "x.grp.direct.inv: direct messages not allowed"
       let GroupMember {memberContactId} = m
@@ -5692,12 +5707,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             ci <- saveRcvChatItem user (CDDirectRcv mCt') msg brokerTs (CIRcvMsgContent mc)
             toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat mCt') ci)
 
-    securityCodeChanged :: Contact -> m ()
+    securityCodeChanged :: Contact -> CM ()
     securityCodeChanged ct = do
       toView $ CRContactVerificationReset user ct
       createInternalChatItem user (CDDirectRcv ct) (CIRcvConnEvent RCEVerificationCodeReset) Nothing
 
-    xGrpMsgForward :: GroupInfo -> GroupMember -> MemberId -> ChatMessage 'Json -> UTCTime -> m ()
+    xGrpMsgForward :: GroupInfo -> GroupMember -> MemberId -> ChatMessage 'Json -> UTCTime -> CM ()
     xGrpMsgForward gInfo@GroupInfo {groupId} m@GroupMember {memberRole, localDisplayName} memberId msg msgTs = do
       when (memberRole < GRAdmin) $ throwChatError (CEGroupContactRole localDisplayName)
       withStore' (\db -> runExceptT $ getGroupMemberByMemberId db vr user gInfo memberId) >>= \case
@@ -5709,7 +5724,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         Left e -> throwError $ ChatErrorStore e
       where
         -- Note: forwarded group events (see forwardedGroupMsg) should include msgId to be deduplicated
-        processForwardedMsg :: GroupMember -> ChatMessage 'Json -> m ()
+        processForwardedMsg :: GroupMember -> ChatMessage 'Json -> CM ()
         processForwardedMsg author chatMsg = do
           let body = LB.toStrict $ J.encode msg
           rcvMsg@RcvMessage {chatMsgEvent = ACME _ event} <- saveGroupFwdRcvMsg user groupId m author body chatMsg
@@ -5729,12 +5744,12 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
             XGrpInfo p' -> xGrpInfo gInfo author p' rcvMsg msgTs
             _ -> messageError $ "x.grp.msg.forward: unsupported forwarded event " <> T.pack (show $ toCMEventTag event)
 
-    createUnknownMember :: GroupInfo -> MemberId -> m GroupMember
+    createUnknownMember :: GroupInfo -> MemberId -> CM GroupMember
     createUnknownMember gInfo memberId = do
       let name = T.take 7 . safeDecodeUtf8 . B64.encode . unMemberId $ memberId
       withStore $ \db -> createNewUnknownGroupMember db vr user gInfo memberId name
 
-    directMsgReceived :: Contact -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> m ()
+    directMsgReceived :: Contact -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> CM ()
     directMsgReceived ct conn@Connection {connId} msgMeta msgRcpts = do
       checkIntegrityCreateItem (CDDirectRcv ct) msgMeta `catchChatError` \_ -> pure ()
       forM_ msgRcpts $ \MsgReceipt {agentMsgId, msgRcptStatus} -> do
@@ -5746,14 +5761,14 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
     -- - regular messages sent in batch would all be marked as delivered by a single receipt
     -- - repeat for directMsgReceived if same logic is applied to direct messages
     -- - getChatItemIdByAgentMsgId to return [ChatItemId]
-    groupMsgReceived :: GroupInfo -> GroupMember -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> m ()
+    groupMsgReceived :: GroupInfo -> GroupMember -> Connection -> MsgMeta -> NonEmpty MsgReceipt -> CM ()
     groupMsgReceived gInfo m conn@Connection {connId} msgMeta msgRcpts = do
       checkIntegrityCreateItem (CDGroupRcv gInfo m) msgMeta `catchChatError` \_ -> pure ()
       forM_ msgRcpts $ \MsgReceipt {agentMsgId, msgRcptStatus} -> do
         withStore' $ \db -> updateSndMsgDeliveryStatus db connId agentMsgId $ MDSSndRcvd msgRcptStatus
         updateGroupItemStatus gInfo m conn agentMsgId $ CISSndRcvd msgRcptStatus SSPComplete
 
-    updateDirectItemsStatus :: Contact -> Connection -> [AgentMsgId] -> CIStatus 'MDSnd -> m ()
+    updateDirectItemsStatus :: Contact -> Connection -> [AgentMsgId] -> CIStatus 'MDSnd -> CM ()
     updateDirectItemsStatus ct conn msgIds newStatus = do
       cis_ <- withStore' $ \db -> forM msgIds $ \msgId -> runExceptT $ updateDirectItemStatus' db ct conn msgId newStatus
       -- only send the last expired item event to view
@@ -5761,7 +5776,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
         ci : _ -> toView $ CRChatItemStatusUpdated user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
         _ -> pure ()
 
-    updateDirectItemStatus :: Contact -> Connection -> AgentMsgId -> CIStatus 'MDSnd -> m ()
+    updateDirectItemStatus :: Contact -> Connection -> AgentMsgId -> CIStatus 'MDSnd -> CM ()
     updateDirectItemStatus ct conn msgId newStatus = do
       ci_ <- withStore $ \db -> updateDirectItemStatus' db ct conn msgId newStatus
       forM_ ci_ $ \ci -> toView $ CRChatItemStatusUpdated user (AChatItem SCTDirect SMDSnd (DirectChat ct) ci)
@@ -5775,7 +5790,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | otherwise -> Just <$> updateDirectChatItemStatus db user ct itemId newStatus
         _ -> pure Nothing
 
-    updateGroupMemSndStatus :: ChatItemId -> GroupMemberId -> CIStatus 'MDSnd -> m Bool
+    updateGroupMemSndStatus :: ChatItemId -> GroupMemberId -> CIStatus 'MDSnd -> CM Bool
     updateGroupMemSndStatus itemId groupMemberId newStatus =
       withStore' $ \db -> updateGroupMemSndStatus' db itemId groupMemberId newStatus
 
@@ -5788,7 +5803,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
           | otherwise -> updateGroupSndStatus db itemId groupMemberId newStatus $> True
         _ -> pure False
 
-    updateGroupItemStatus :: GroupInfo -> GroupMember -> Connection -> AgentMsgId -> CIStatus 'MDSnd -> m ()
+    updateGroupItemStatus :: GroupInfo -> GroupMember -> Connection -> AgentMsgId -> CIStatus 'MDSnd -> CM ()
     updateGroupItemStatus gInfo@GroupInfo {groupId} GroupMember {groupMemberId} Connection {connId} msgId newMemStatus =
       withStore' (\db -> getGroupChatItemByAgentMsgId db user groupId connId msgId) >>= \case
         Just (CChatItem SMDSnd ChatItem {meta = CIMeta {itemStatus = CISSndRcvd _ SSPComplete}}) -> pure ()
@@ -5802,7 +5817,7 @@ processAgentMessageConn vr user@User {userId} corrId agentConnId agentMessage =
               toView $ CRChatItemStatusUpdated user (AChatItem SCTGroup SMDSnd (GroupChat gInfo) chatItem)
         _ -> pure ()
 
-createContactPQSndItem :: ChatMonad m => User -> Contact -> Connection -> PQEncryption -> m (Contact, Connection)
+createContactPQSndItem :: User -> Contact -> Connection -> PQEncryption -> CM (Contact, Connection)
 createContactPQSndItem user ct conn@Connection {pqSndEnabled} pqSndEnabled' =
   flip catchChatError (const $ pure (ct, conn)) $ case (pqSndEnabled, pqSndEnabled') of
     (Just b, b') | b' /= b -> createPQItem $ CISndConnEvent (SCEPqEnabled pqSndEnabled')
@@ -5817,7 +5832,7 @@ createContactPQSndItem user ct conn@Connection {pqSndEnabled} pqSndEnabled' =
         toView $ CRContactPQEnabled user ct' pqSndEnabled'
       pure (ct', conn')
 
-updateContactPQRcv :: ChatMonad m => User -> Contact -> Connection -> PQEncryption -> m (Contact, Connection)
+updateContactPQRcv :: User -> Contact -> Connection -> PQEncryption -> CM (Contact, Connection)
 updateContactPQRcv user ct conn@Connection {connId, pqRcvEnabled} pqRcvEnabled' =
   flip catchChatError (const $ pure (ct, conn)) $ case (pqRcvEnabled, pqRcvEnabled') of
     (Just b, b') | b' /= b -> updatePQ $ CIRcvConnEvent (RCEPqEnabled pqRcvEnabled')
@@ -5840,18 +5855,18 @@ sameMemberId :: MemberId -> GroupMember -> Bool
 sameMemberId memId GroupMember {memberId} = memId == memberId
 
 -- TODO v5.7 for contacts only version upgrade should trigger enabling PQ support/encryption
-updatePeerChatVRange :: ChatMonad m => Connection -> VersionRangeChat -> m Connection
+updatePeerChatVRange :: Connection -> VersionRangeChat -> CM Connection
 updatePeerChatVRange conn@Connection {connId, connChatVersion = v, peerChatVRange, pqSupport} msgVRange = do
-  v' <- upgradedConnVersion pqSupport v msgVRange
+  v' <- lift $ upgradedConnVersion pqSupport v msgVRange
   if msgVRange /= peerChatVRange || v' /= v
     then do
       withStore' $ \db -> setPeerChatVRange db connId v' msgVRange
       pure conn {connChatVersion = v', peerChatVRange = msgVRange}
     else pure conn
 
-updateMemberChatVRange :: ChatMonad m => GroupMember -> Connection -> VersionRangeChat -> m (GroupMember, Connection)
+updateMemberChatVRange :: GroupMember -> Connection -> VersionRangeChat -> CM (GroupMember, Connection)
 updateMemberChatVRange mem@GroupMember {groupMemberId} conn@Connection {connId, connChatVersion = v, peerChatVRange} msgVRange = do
-  v' <- upgradedConnVersion PQSupportOff v msgVRange
+  v' <- lift $ upgradedConnVersion PQSupportOff v msgVRange
   if msgVRange /= peerChatVRange || v' /= v
     then do
       withStore' $ \db -> do
@@ -5861,31 +5876,31 @@ updateMemberChatVRange mem@GroupMember {groupMemberId} conn@Connection {connId,
       pure (mem {memberChatVRange = msgVRange, activeConn = Just conn'}, conn')
     else pure (mem, conn)
 
-upgradedConnVersion :: ChatMonad' m => PQSupport -> VersionChat -> VersionRangeChat -> m VersionChat
+upgradedConnVersion :: PQSupport -> VersionChat -> VersionRangeChat -> CM' VersionChat
 upgradedConnVersion pqSup v peerVR = do
-  vr <- chatVersionRange
+  vr <- chatVersionRange'
   -- don't allow reducing agreed connection version
   pure $ maybe v (\(Compatible v') -> max v v') $ vr pqSup `compatibleVersion` peerVR
 
-parseFileDescription :: (ChatMonad m, FilePartyI p) => Text -> m (ValidFileDescription p)
+parseFileDescription :: FilePartyI p => Text -> CM (ValidFileDescription p)
 parseFileDescription =
   liftEither . first (ChatError . CEInvalidFileDescription) . (strDecode . encodeUtf8)
 
-sendDirectFileInline :: ChatMonad m => User -> Contact -> FileTransferMeta -> SharedMsgId -> m ()
+sendDirectFileInline :: User -> Contact -> FileTransferMeta -> SharedMsgId -> CM ()
 sendDirectFileInline user ct ft sharedMsgId = do
   msgDeliveryId <- sendFileInline_ ft sharedMsgId $ sendDirectContactMessage user ct
   withStore $ \db -> updateSndDirectFTDelivery db ct ft msgDeliveryId
 
-sendMemberFileInline :: ChatMonad m => GroupMember -> Connection -> FileTransferMeta -> SharedMsgId -> m ()
+sendMemberFileInline :: GroupMember -> Connection -> FileTransferMeta -> SharedMsgId -> CM ()
 sendMemberFileInline m@GroupMember {groupId} conn ft sharedMsgId = do
   msgDeliveryId <- sendFileInline_ ft sharedMsgId $ \msg -> do
     (sndMsg, msgDeliveryId, _) <- sendDirectMemberMessage conn msg groupId
     pure (sndMsg, msgDeliveryId)
   withStore' $ \db -> updateSndGroupFTDelivery db m conn ft msgDeliveryId
 
-sendFileInline_ :: ChatMonad m => FileTransferMeta -> SharedMsgId -> (ChatMsgEvent 'Binary -> m (SndMessage, Int64)) -> m Int64
+sendFileInline_ :: FileTransferMeta -> SharedMsgId -> (ChatMsgEvent 'Binary -> CM (SndMessage, Int64)) -> CM Int64
 sendFileInline_ FileTransferMeta {filePath, chunkSize} sharedMsgId sendMsg =
-  sendChunks 1 =<< liftIO . B.readFile =<< toFSFilePath filePath
+  sendChunks 1 =<< liftIO . B.readFile =<< lift (toFSFilePath filePath)
   where
     sendChunks chunkNo bytes = do
       let (chunk, rest) = B.splitAt chSize bytes
@@ -5895,7 +5910,7 @@ sendFileInline_ FileTransferMeta {filePath, chunkSize} sharedMsgId sendMsg =
         else sendChunks (chunkNo + 1) rest
     chSize = fromIntegral chunkSize
 
-parseChatMessage :: ChatMonad m => Connection -> ByteString -> m (ChatMessage 'Json)
+parseChatMessage :: Connection -> ByteString -> CM (ChatMessage 'Json)
 parseChatMessage conn s = do
   case parseChatMessages s of
     [msg] -> liftEither . first (ChatError . errType) $ (\(ACMsg _ m) -> checkEncoding m) =<< msg
@@ -5904,7 +5919,7 @@ parseChatMessage conn s = do
     errType = CEInvalidChatMessage conn Nothing (safeDecodeUtf8 s)
 {-# INLINE parseChatMessage #-}
 
-sendFileChunk :: ChatMonad m => User -> SndFileTransfer -> m ()
+sendFileChunk :: User -> SndFileTransfer -> CM ()
 sendFileChunk user ft@SndFileTransfer {fileId, fileStatus, agentConnId = AgentConnId acId} =
   unless (fileStatus == FSComplete || fileStatus == FSCancelled) $ do
     vr <- chatVersionRange
@@ -5916,18 +5931,18 @@ sendFileChunk user ft@SndFileTransfer {fileId, fileStatus, agentConnId = AgentCo
           liftIO $ deleteSndFileChunks db ft
           updateDirectCIFileStatus db vr user fileId CIFSSndComplete
         toView $ CRSndFileComplete user ci ft
-        closeFileHandle fileId sndFiles
+        lift $ closeFileHandle fileId sndFiles
         deleteAgentConnectionAsync user acId
 
-sendFileChunkNo :: ChatMonad m => SndFileTransfer -> Integer -> m ()
+sendFileChunkNo :: SndFileTransfer -> Integer -> CM ()
 sendFileChunkNo ft@SndFileTransfer {agentConnId = AgentConnId acId} chunkNo = do
   chunkBytes <- readFileChunk ft chunkNo
   (msgId, _) <- withAgent $ \a -> sendMessage a acId PQEncOff SMP.noMsgFlags $ smpEncode FileChunk {chunkNo, chunkBytes}
   withStore' $ \db -> updateSndFileChunkMsg db ft chunkNo msgId
 
-readFileChunk :: ChatMonad m => SndFileTransfer -> Integer -> m ByteString
+readFileChunk :: SndFileTransfer -> Integer -> CM ByteString
 readFileChunk SndFileTransfer {fileId, filePath, chunkSize} chunkNo = do
-  fsFilePath <- toFSFilePath filePath
+  fsFilePath <- lift $ toFSFilePath filePath
   read_ fsFilePath `catchThrow` (ChatError . CEFileRead filePath . show)
   where
     read_ fsFilePath = do
@@ -5937,10 +5952,10 @@ readFileChunk SndFileTransfer {fileId, filePath, chunkSize} chunkNo = do
       when (pos /= pos') $ hSeek h AbsoluteSeek pos'
       liftIO . B.hGet h $ fromInteger chunkSize
 
-parseFileChunk :: ChatMonad m => ByteString -> m FileChunk
+parseFileChunk :: ByteString -> CM FileChunk
 parseFileChunk = liftEither . first (ChatError . CEFileRcvChunk) . smpDecode
 
-appendFileChunk :: forall m. ChatMonad m => RcvFileTransfer -> Integer -> ByteString -> Bool -> m ()
+appendFileChunk :: RcvFileTransfer -> Integer -> ByteString -> Bool -> CM ()
 appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs, fileInvitation = FileInvitation {fileName}} chunkNo chunk final =
   case fileStatus of
     RFSConnected RcvFileInfo {filePath} -> append_ filePath
@@ -5950,16 +5965,16 @@ appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs, fileInvitati
     RFSCancelled _ -> pure ()
     _ -> throwChatError $ CEFileInternal "receiving file transfer not in progress"
   where
-    append_ :: FilePath -> m ()
+    append_ :: FilePath -> CM ()
     append_ filePath = do
-      fsFilePath <- toFSFilePath filePath
+      fsFilePath <- lift $ toFSFilePath filePath
       h <- getFileHandle fileId fsFilePath rcvFiles AppendMode
       liftIO (B.hPut h chunk >> hFlush h) `catchThrow` (fileErr . show)
       withStore' $ \db -> updatedRcvFileChunkStored db ft chunkNo
       when final $ do
-        closeFileHandle fileId rcvFiles
+        lift $ closeFileHandle fileId rcvFiles
         forM_ cryptoArgs $ \cfArgs -> do
-          tmpFile <- getChatTempDirectory >>= (`uniqueCombine` fileName)
+          tmpFile <- lift getChatTempDirectory >>= liftIO . (`uniqueCombine` fileName)
           tryChatError (liftError encryptErr $ encryptFile fsFilePath tmpFile cfArgs) >>= \case
             Right () -> do
               removeFile fsFilePath `catchChatError` \_ -> pure ()
@@ -5972,7 +5987,7 @@ appendFileChunk ft@RcvFileTransfer {fileId, fileStatus, cryptoArgs, fileInvitati
         encryptErr e = fileErr $ e <> ", received file not encrypted"
         fileErr = ChatError . CEFileWrite filePath
 
-getFileHandle :: ChatMonad m => Int64 -> FilePath -> (ChatController -> TVar (Map Int64 Handle)) -> IOMode -> m Handle
+getFileHandle :: Int64 -> FilePath -> (ChatController -> TVar (Map Int64 Handle)) -> IOMode -> CM Handle
 getFileHandle fileId filePath files ioMode = do
   fs <- asks files
   h_ <- M.lookup fileId <$> readTVarIO fs
@@ -5983,17 +5998,17 @@ getFileHandle fileId filePath files ioMode = do
       atomically . modifyTVar fs $ M.insert fileId h
       pure h
 
-isFileActive :: ChatMonad m => Int64 -> (ChatController -> TVar (Map Int64 Handle)) -> m Bool
+isFileActive :: Int64 -> (ChatController -> TVar (Map Int64 Handle)) -> CM Bool
 isFileActive fileId files = do
   fs <- asks files
   isJust . M.lookup fileId <$> readTVarIO fs
 
-cancelRcvFileTransfer :: ChatMonad m => User -> RcvFileTransfer -> m (Maybe ConnId)
+cancelRcvFileTransfer :: User -> RcvFileTransfer -> CM (Maybe ConnId)
 cancelRcvFileTransfer user ft@RcvFileTransfer {fileId, xftpRcvFile, rcvFileInline} =
   cancel' `catchChatError` (\e -> toView (CRChatError (Just user) e) $> fileConnId)
   where
     cancel' = do
-      closeFileHandle fileId rcvFiles
+      lift $ closeFileHandle fileId rcvFiles
       withStore' $ \db -> do
         updateFileCancelled db user fileId CIFSRcvCancelled
         updateRcvFileStatus db fileId FSCancelled
@@ -6005,7 +6020,7 @@ cancelRcvFileTransfer user ft@RcvFileTransfer {fileId, xftpRcvFile, rcvFileInlin
       pure fileConnId
     fileConnId = if isNothing xftpRcvFile && isNothing rcvFileInline then liveRcvFileTransferConnId ft else Nothing
 
-cancelSndFile :: ChatMonad m => User -> FileTransferMeta -> [SndFileTransfer] -> Bool -> m [ConnId]
+cancelSndFile :: User -> FileTransferMeta -> [SndFileTransfer] -> Bool -> CM [ConnId]
 cancelSndFile user FileTransferMeta {fileId, xftpSndFile} fts sendCancel = do
   withStore' (\db -> updateFileCancelled db user fileId CIFSSndCancelled)
     `catchChatError` (toView . CRChatError (Just user))
@@ -6014,11 +6029,11 @@ cancelSndFile user FileTransferMeta {fileId, xftpSndFile} fts sendCancel = do
       catMaybes <$> forM fts (\ft -> cancelSndFileTransfer user ft sendCancel)
     Just xsf -> do
       forM_ fts (\ft -> cancelSndFileTransfer user ft False)
-      agentXFTPDeleteSndFileRemote user xsf fileId `catchChatError` (toView . CRChatError (Just user))
+      lift (agentXFTPDeleteSndFileRemote user xsf fileId) `catchChatError` (toView . CRChatError (Just user))
       pure []
 
 -- TODO v6.0 remove
-cancelSndFileTransfer :: ChatMonad m => User -> SndFileTransfer -> Bool -> m (Maybe ConnId)
+cancelSndFileTransfer :: User -> SndFileTransfer -> Bool -> CM (Maybe ConnId)
 cancelSndFileTransfer user@User {userId} ft@SndFileTransfer {fileId, connId, agentConnId = AgentConnId acId, fileStatus, fileInline} sendCancel =
   if fileStatus == FSCancelled || fileStatus == FSComplete
     then pure Nothing
@@ -6037,40 +6052,40 @@ cancelSndFileTransfer user@User {userId} ft@SndFileTransfer {fileId, connId, age
       pure fileConnId
     fileConnId = if isNothing fileInline then Just acId else Nothing
 
-closeFileHandle :: ChatMonad m => Int64 -> (ChatController -> TVar (Map Int64 Handle)) -> m ()
+closeFileHandle :: Int64 -> (ChatController -> TVar (Map Int64 Handle)) -> CM' ()
 closeFileHandle fileId files = do
   fs <- asks files
   h_ <- atomically . stateTVar fs $ \m -> (M.lookup fileId m, M.delete fileId m)
   liftIO $ mapM_ hClose h_ `catchAll_` pure ()
 
-deleteMembersConnections :: ChatMonad m => User -> [GroupMember] -> m ()
+deleteMembersConnections :: User -> [GroupMember] -> CM ()
 deleteMembersConnections user members = deleteMembersConnections' user members False
 
-deleteMembersConnections' :: ChatMonad m => User -> [GroupMember] -> Bool -> m ()
+deleteMembersConnections' :: User -> [GroupMember] -> Bool -> CM ()
 deleteMembersConnections' user members waitDelivery = do
   let memberConns =
         filter (\Connection {connStatus} -> connStatus /= ConnDeleted) $
           mapMaybe (\GroupMember {activeConn} -> activeConn) members
   deleteAgentConnectionsAsync' user (map aConnId memberConns) waitDelivery
-  void . withStoreBatch' $ \db -> map (\conn -> updateConnectionStatus db conn ConnDeleted) memberConns
+  lift . void . withStoreBatch' $ \db -> map (\conn -> updateConnectionStatus db conn ConnDeleted) memberConns
 
-deleteMemberConnection :: ChatMonad m => User -> GroupMember -> m ()
+deleteMemberConnection :: User -> GroupMember -> CM ()
 deleteMemberConnection user mem = deleteMemberConnection' user mem False
 
-deleteMemberConnection' :: ChatMonad m => User -> GroupMember -> Bool -> m ()
+deleteMemberConnection' :: User -> GroupMember -> Bool -> CM ()
 deleteMemberConnection' user GroupMember {activeConn} waitDelivery = do
   forM_ activeConn $ \conn -> do
     deleteAgentConnectionAsync' user (aConnId conn) waitDelivery
     withStore' $ \db -> updateConnectionStatus db conn ConnDeleted
 
-deleteOrUpdateMemberRecord :: ChatMonad m => User -> GroupMember -> m ()
+deleteOrUpdateMemberRecord :: User -> GroupMember -> CM ()
 deleteOrUpdateMemberRecord user@User {userId} member =
   withStore' $ \db ->
     checkGroupMemberHasItems db user member >>= \case
       Just _ -> updateGroupMemberStatus db userId member GSMemRemoved
       Nothing -> deleteGroupMember db user member
 
-sendDirectContactMessage :: (MsgEncodingI e, ChatMonad m) => User -> Contact -> ChatMsgEvent e -> m (SndMessage, Int64)
+sendDirectContactMessage :: MsgEncodingI e => User -> Contact -> ChatMsgEvent e -> CM (SndMessage, Int64)
 sendDirectContactMessage user ct chatMsgEvent = do
   conn@Connection {connId, pqSupport} <- liftEither $ contactSendConn_ ct
   r <- sendDirectMessage_ conn pqSupport chatMsgEvent (ConnectionId connId)
@@ -6091,10 +6106,10 @@ contactSendConn_ ct@Contact {activeConn} = case activeConn of
 
 -- unlike sendGroupMemberMessage, this function will not store message as pending
 -- TODO v5.8 we could remove pending messages once all clients support forwarding
-sendDirectMemberMessage :: (MsgEncodingI e, ChatMonad m) => Connection -> ChatMsgEvent e -> GroupId -> m (SndMessage, Int64, PQEncryption)
+sendDirectMemberMessage :: MsgEncodingI e => Connection -> ChatMsgEvent e -> GroupId -> CM (SndMessage, Int64, PQEncryption)
 sendDirectMemberMessage conn chatMsgEvent groupId = sendDirectMessage_ conn PQSupportOff chatMsgEvent (GroupId groupId)
 
-sendDirectMessage_ :: (MsgEncodingI e, ChatMonad m) => Connection -> PQSupport -> ChatMsgEvent e -> ConnOrGroupId -> m (SndMessage, Int64, PQEncryption)
+sendDirectMessage_ :: MsgEncodingI e => Connection -> PQSupport -> ChatMsgEvent e -> ConnOrGroupId -> CM (SndMessage, Int64, PQEncryption)
 sendDirectMessage_ conn pqSup chatMsgEvent connOrGroupId = do
   when (connDisabled conn) $ throwChatError (CEConnectionDisabled conn)
   msg@SndMessage {msgId, msgBody} <- createSndMessage chatMsgEvent connOrGroupId pqSup
@@ -6102,14 +6117,14 @@ sendDirectMessage_ conn pqSup chatMsgEvent connOrGroupId = do
   (msgDeliveryId, pqEnc') <- deliverMessage conn (toCMEventTag chatMsgEvent) msgBody msgId
   pure (msg, msgDeliveryId, pqEnc')
 
-createSndMessage :: (MsgEncodingI e, ChatMonad m) => ChatMsgEvent e -> ConnOrGroupId -> PQSupport -> m SndMessage
+createSndMessage :: MsgEncodingI e => ChatMsgEvent e -> ConnOrGroupId -> PQSupport -> CM SndMessage
 createSndMessage chatMsgEvent connOrGroupId pqSup =
-  liftEither . runIdentity =<< createSndMessages (Identity (connOrGroupId, pqSup, chatMsgEvent))
+  liftEither . runIdentity =<< lift (createSndMessages $ Identity (connOrGroupId, pqSup, chatMsgEvent))
 
-createSndMessages :: forall e m t. (MsgEncodingI e, ChatMonad' m, Traversable t) => t (ConnOrGroupId, PQSupport, ChatMsgEvent e) -> m (t (Either ChatError SndMessage))
+createSndMessages :: forall e t. (MsgEncodingI e, Traversable t) => t (ConnOrGroupId, PQSupport, ChatMsgEvent e) -> CM' (t (Either ChatError SndMessage))
 createSndMessages idsEvents = do
   g <- asks random
-  vr <- chatVersionRange
+  vr <- chatVersionRange'
   withStoreBatch $ \db -> fmap (createMsg db g vr) idsEvents
   where
     createMsg :: DB.Connection -> TVar ChaChaDRG -> (PQSupport -> VersionRangeChat) -> (ConnOrGroupId, PQSupport, ChatMsgEvent e) -> IO (Either ChatError SndMessage)
@@ -6119,11 +6134,11 @@ createSndMessages idsEvents = do
         encodeMessage sharedMsgId =
           encodeChatMessage maxEncodedMsgLength ChatMessage {chatVRange = vr pqSup, msgId = Just sharedMsgId, chatMsgEvent = evnt}
 
-sendGroupMemberMessages :: forall e m. (MsgEncodingI e, ChatMonad m) => User -> Connection -> NonEmpty (ChatMsgEvent e) -> GroupId -> m ()
+sendGroupMemberMessages :: forall e. MsgEncodingI e => User -> Connection -> NonEmpty (ChatMsgEvent e) -> GroupId -> CM ()
 sendGroupMemberMessages user conn events groupId = do
   when (connDisabled conn) $ throwChatError (CEConnectionDisabled conn)
   let idsEvts = L.map (GroupId groupId,PQSupportOff,) events
-  (errs, msgs) <- partitionEithers . L.toList <$> createSndMessages idsEvts
+  (errs, msgs) <- lift $ partitionEithers . L.toList <$> createSndMessages idsEvts
   unless (null errs) $ toView $ CRChatErrors (Just user) errs
   forM_ (L.nonEmpty msgs) $ \msgs' -> do
     -- TODO v5.7 based on version (?)
@@ -6136,11 +6151,11 @@ sendGroupMemberMessages user conn events groupId = do
     forM_ msgBatches $ \batch ->
       processSndMessageBatch conn batch `catchChatError` (toView . CRChatError (Just user))
 
-processSndMessageBatch :: ChatMonad m => Connection -> MsgBatch -> m ()
+processSndMessageBatch :: Connection -> MsgBatch -> CM ()
 processSndMessageBatch conn@Connection {connId} (MsgBatch batchBody sndMsgs) = do
   (agentMsgId, _pqEnc) <- withAgent $ \a -> sendMessage a (aConnId conn) PQEncOff MsgFlags {notification = True} batchBody
   let sndMsgDelivery = SndMsgDelivery {connId, agentMsgId}
-  void . withStoreBatch' $ \db -> map (\SndMessage {msgId} -> createSndMsgDelivery db sndMsgDelivery msgId) sndMsgs
+  lift . void . withStoreBatch' $ \db -> map (\SndMessage {msgId} -> createSndMsgDelivery db sndMsgDelivery msgId) sndMsgs
 
 -- TODO v5.7 update batching for groups
 batchSndMessagesJSON :: NonEmpty SndMessage -> [Either ChatError MsgBatch]
@@ -6155,12 +6170,12 @@ batchSndMessagesJSON = batchMessages maxEncodedMsgLength . L.toList
 --       SMP.TBError tbe SndMessage {msgId} -> Left . ChatError $ CEInternalError (show tbe <> " " <> show msgId)
 --       SMP.TBTransmission {} -> Left . ChatError $ CEInternalError "batchTransmissions_ didn't produce a batch"
 
-encodeConnInfo :: (MsgEncodingI e, ChatMonad m) => ChatMsgEvent e -> m ByteString
+encodeConnInfo :: MsgEncodingI e => ChatMsgEvent e -> CM ByteString
 encodeConnInfo chatMsgEvent = do
   vr <- chatVersionRange
   encodeConnInfoPQ PQSupportOff (maxVersion $ vr PQSupportOff) chatMsgEvent
 
-encodeConnInfoPQ :: (MsgEncodingI e, ChatMonad m) => PQSupport -> VersionChat -> ChatMsgEvent e -> m ByteString
+encodeConnInfoPQ :: MsgEncodingI e => PQSupport -> VersionChat -> ChatMsgEvent e -> CM ByteString
 encodeConnInfoPQ pqSup v chatMsgEvent = do
   vr <- chatVersionRange
   let info = ChatMessage {chatVRange = vr pqSup, msgId = Nothing, chatMsgEvent}
@@ -6173,23 +6188,23 @@ encodeConnInfoPQ pqSup v chatMsgEvent = do
       _ -> pure connInfo
     ECMLarge -> throwChatError $ CEException "large info"
 
-deliverMessage :: ChatMonad m => Connection -> CMEventTag e -> MsgBody -> MessageId -> m (Int64, PQEncryption)
+deliverMessage :: Connection -> CMEventTag e -> MsgBody -> MessageId -> CM (Int64, PQEncryption)
 deliverMessage conn cmEventTag msgBody msgId = do
   let msgFlags = MsgFlags {notification = hasNotification cmEventTag}
   deliverMessage' conn msgFlags msgBody msgId
 
-deliverMessage' :: ChatMonad m => Connection -> MsgFlags -> MsgBody -> MessageId -> m (Int64, PQEncryption)
+deliverMessage' :: Connection -> MsgFlags -> MsgBody -> MessageId -> CM (Int64, PQEncryption)
 deliverMessage' conn msgFlags msgBody msgId =
-  deliverMessages ((conn, msgFlags, msgBody, msgId) :| []) >>= \case
+  lift (deliverMessages ((conn, msgFlags, msgBody, msgId) :| [])) >>= \case
     r :| [] -> liftEither r
     rs -> throwChatError $ CEInternalError $ "deliverMessage: expected 1 result, got " <> show (length rs)
 
 type MsgReq = (Connection, MsgFlags, MsgBody, MessageId)
 
-deliverMessages :: ChatMonad' m => NonEmpty MsgReq -> m (NonEmpty (Either ChatError (Int64, PQEncryption)))
+deliverMessages :: NonEmpty MsgReq -> CM' (NonEmpty (Either ChatError (Int64, PQEncryption)))
 deliverMessages msgs = deliverMessagesB $ L.map Right msgs
 
-deliverMessagesB :: forall m. ChatMonad' m => NonEmpty (Either ChatError MsgReq) -> m (NonEmpty (Either ChatError (Int64, PQEncryption)))
+deliverMessagesB :: NonEmpty (Either ChatError MsgReq) -> CM' (NonEmpty (Either ChatError (Int64, PQEncryption)))
 deliverMessagesB msgReqs = do
   msgReqs' <- liftIO compressBodies
   sent <- L.zipWith prepareBatch msgReqs' <$> withAgent' (`sendMessagesB` L.map toAgent msgReqs')
@@ -6226,7 +6241,7 @@ deliverMessagesB msgReqs = do
       where
         updatePQ = updateConnPQSndEnabled db connId pqSndEnabled'
 
-sendGroupMessage :: (MsgEncodingI e, ChatMonad m) => User -> GroupInfo -> [GroupMember] -> ChatMsgEvent e -> m (SndMessage, [GroupMember])
+sendGroupMessage :: MsgEncodingI e => User -> GroupInfo -> [GroupMember] -> ChatMsgEvent e -> CM (SndMessage, [GroupMember])
 sendGroupMessage user gInfo members chatMsgEvent = do
   when shouldSendProfileUpdate $
     sendProfileUpdate `catchChatError` (\e -> toView (CRChatError (Just user) e))
@@ -6248,7 +6263,7 @@ sendGroupMessage user gInfo members chatMsgEvent = do
       currentTs <- liftIO getCurrentTime
       withStore' $ \db -> updateUserMemberProfileSentAt db user gInfo currentTs
 
-sendGroupMessage' :: (MsgEncodingI e, ChatMonad m) => User -> GroupInfo -> [GroupMember] -> ChatMsgEvent e -> m (SndMessage, [GroupMember])
+sendGroupMessage' :: MsgEncodingI e => User -> GroupInfo -> [GroupMember] -> ChatMsgEvent e -> CM (SndMessage, [GroupMember])
 sendGroupMessage' user GroupInfo {groupId} members chatMsgEvent = do
   msg@SndMessage {msgId, msgBody} <- createSndMessage chatMsgEvent (GroupId groupId) PQSupportOff
   recipientMembers <- liftIO $ shuffleMembers (filter memberCurrent members)
@@ -6256,10 +6271,10 @@ sendGroupMessage' user GroupInfo {groupId} members chatMsgEvent = do
       (toSend, pending) = foldr addMember ([], []) recipientMembers
       -- TODO PQ either somehow ensure that group members connections cannot have pqSupport/pqEncryption or pass Off's here
       msgReqs = map (\(_, conn) -> (conn, msgFlags, msgBody, msgId)) toSend
-  delivered <- maybe (pure []) (fmap L.toList . deliverMessages) $ L.nonEmpty msgReqs
+  delivered <- maybe (pure []) (fmap L.toList . lift . deliverMessages) $ L.nonEmpty msgReqs
   let errors = lefts delivered
   unless (null errors) $ toView $ CRChatErrors (Just user) errors
-  stored <- withStoreBatch' $ \db -> map (\m -> createPendingGroupMessage db (groupMemberId' m) msgId Nothing) pending
+  stored <- lift . withStoreBatch' $ \db -> map (\m -> createPendingGroupMessage db (groupMemberId' m) msgId Nothing) pending
   let sentToMembers = filterSent delivered toSend fst <> filterSent stored pending id
   pure (msg, sentToMembers)
   where
@@ -6303,17 +6318,17 @@ memberSendAction chatMsgEvent members m@GroupMember {invitedByGroupMemberId} = c
           XGrpMsgForward {} -> True
           _ -> False
 
-sendGroupMemberMessage :: forall e m. (MsgEncodingI e, ChatMonad m) => User -> GroupMember -> ChatMsgEvent e -> Int64 -> Maybe Int64 -> m () -> m ()
+sendGroupMemberMessage :: MsgEncodingI e => User -> GroupMember -> ChatMsgEvent e -> Int64 -> Maybe Int64 -> CM () -> CM ()
 sendGroupMemberMessage user m@GroupMember {groupMemberId} chatMsgEvent groupId introId_ postDeliver = do
   msg <- createSndMessage chatMsgEvent (GroupId groupId) PQSupportOff
   messageMember msg `catchChatError` (\e -> toView (CRChatError (Just user) e))
   where
-    messageMember :: SndMessage -> m ()
+    messageMember :: SndMessage -> CM ()
     messageMember SndMessage {msgId, msgBody} = forM_ (memberSendAction chatMsgEvent [m] m) $ \case
       MSASend conn -> deliverMessage conn (toCMEventTag chatMsgEvent) msgBody msgId >> postDeliver
       MSAPending -> withStore' $ \db -> createPendingGroupMessage db groupMemberId msgId introId_
 
-sendPendingGroupMessages :: ChatMonad m => User -> GroupMember -> Connection -> m ()
+sendPendingGroupMessages :: User -> GroupMember -> Connection -> CM ()
 sendPendingGroupMessages user GroupMember {groupMemberId, localDisplayName} conn = do
   pendingMessages <- withStore' $ \db -> getPendingGroupMessages db groupMemberId
   -- TODO ensure order - pending messages interleave with user input messages
@@ -6330,25 +6345,25 @@ sendPendingGroupMessages user GroupMember {groupMemberId, localDisplayName} conn
         _ -> pure ()
 
 -- TODO [batch send] refactor direct message processing same as groups (e.g. checkIntegrity before processing)
-saveDirectRcvMSG :: ChatMonad m => Connection -> MsgMeta -> CommandId -> MsgBody -> m (Connection, RcvMessage)
-saveDirectRcvMSG conn@Connection {connId} agentMsgMeta agentAckCmdId msgBody =
+saveDirectRcvMSG :: Connection -> MsgMeta -> MsgBody -> CM (Connection, RcvMessage)
+saveDirectRcvMSG conn@Connection {connId} agentMsgMeta msgBody =
   case parseChatMessages msgBody of
     [Right (ACMsg _ ChatMessage {chatVRange, msgId = sharedMsgId_, chatMsgEvent})] -> do
       conn' <- updatePeerChatVRange conn chatVRange
       let agentMsgId = fst $ recipient agentMsgMeta
           newMsg = NewRcvMessage {chatMsgEvent, msgBody}
-          rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId}
+          rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta}
       msg <- withStore $ \db -> createNewMessageAndRcvMsgDelivery db (ConnectionId connId) newMsg sharedMsgId_ rcvMsgDelivery Nothing
       pure (conn', msg)
     [Left e] -> error $ "saveDirectRcvMSG: error parsing chat message: " <> e
     _ -> error "saveDirectRcvMSG: batching not supported"
 
-saveGroupRcvMsg :: (MsgEncodingI e, ChatMonad m) => User -> GroupId -> GroupMember -> Connection -> MsgMeta -> CommandId -> MsgBody -> ChatMessage e -> m (GroupMember, Connection, RcvMessage)
-saveGroupRcvMsg user groupId authorMember conn@Connection {connId} agentMsgMeta agentAckCmdId msgBody ChatMessage {chatVRange, msgId = sharedMsgId_, chatMsgEvent} = do
+saveGroupRcvMsg :: MsgEncodingI e => User -> GroupId -> GroupMember -> Connection -> MsgMeta -> MsgBody -> ChatMessage e -> CM (GroupMember, Connection, RcvMessage)
+saveGroupRcvMsg user groupId authorMember conn@Connection {connId} agentMsgMeta msgBody ChatMessage {chatVRange, msgId = sharedMsgId_, chatMsgEvent} = do
   (am'@GroupMember {memberId = amMemId, groupMemberId = amGroupMemId}, conn') <- updateMemberChatVRange authorMember conn chatVRange
   let agentMsgId = fst $ recipient agentMsgMeta
       newMsg = NewRcvMessage {chatMsgEvent, msgBody}
-      rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId}
+      rcvMsgDelivery = RcvMsgDelivery {connId, agentMsgId, agentMsgMeta}
   msg <-
     withStore (\db -> createNewMessageAndRcvMsgDelivery db (GroupId groupId) newMsg sharedMsgId_ rcvMsgDelivery $ Just amGroupMemId)
       `catchChatError` \e -> case e of
@@ -6361,7 +6376,7 @@ saveGroupRcvMsg user groupId authorMember conn@Connection {connId} agentMsgMeta
         _ -> throwError e
   pure (am', conn', msg)
 
-saveGroupFwdRcvMsg :: (MsgEncodingI e, ChatMonad m) => User -> GroupId -> GroupMember -> GroupMember -> MsgBody -> ChatMessage e -> m RcvMessage
+saveGroupFwdRcvMsg :: MsgEncodingI e => User -> GroupId -> GroupMember -> GroupMember -> MsgBody -> ChatMessage e -> CM RcvMessage
 saveGroupFwdRcvMsg user groupId forwardingMember refAuthorMember@GroupMember {memberId = refMemberId} msgBody ChatMessage {msgId = sharedMsgId_, chatMsgEvent} = do
   let newMsg = NewRcvMessage {chatMsgEvent, msgBody}
       fwdMemberId = Just $ groupMemberId' forwardingMember
@@ -6378,10 +6393,10 @@ saveGroupFwdRcvMsg user groupId forwardingMember refAuthorMember@GroupMember {me
         throwError e
       _ -> throwError e
 
-saveSndChatItem :: (ChatMonad m, ChatTypeI c) => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> m (ChatItem c 'MDSnd)
+saveSndChatItem :: ChatTypeI c => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> CM (ChatItem c 'MDSnd)
 saveSndChatItem user cd msg content = saveSndChatItem' user cd msg content Nothing Nothing Nothing False
 
-saveSndChatItem' :: (ChatMonad m, ChatTypeI c) => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> Maybe (CIFile 'MDSnd) -> Maybe (CIQuote c) -> Maybe CITimed -> Bool -> m (ChatItem c 'MDSnd)
+saveSndChatItem' :: ChatTypeI c => User -> ChatDirection c 'MDSnd -> SndMessage -> CIContent 'MDSnd -> Maybe (CIFile 'MDSnd) -> Maybe (CIQuote c) -> Maybe CITimed -> Bool -> CM (ChatItem c 'MDSnd)
 saveSndChatItem' user cd msg@SndMessage {sharedMsgId} content ciFile quotedItem itemTimed live = do
   createdAt <- liftIO getCurrentTime
   ciId <- withStore' $ \db -> do
@@ -6391,11 +6406,11 @@ saveSndChatItem' user cd msg@SndMessage {sharedMsgId} content ciFile quotedItem
     pure ciId
   pure $ mkChatItem cd ciId content ciFile quotedItem (Just sharedMsgId) itemTimed live createdAt Nothing createdAt
 
-saveRcvChatItem :: (ChatMonad m, ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> UTCTime -> CIContent 'MDRcv -> m (ChatItem c 'MDRcv)
+saveRcvChatItem :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> UTCTime -> CIContent 'MDRcv -> CM (ChatItem c 'MDRcv)
 saveRcvChatItem user cd msg@RcvMessage {sharedMsgId_} brokerTs content =
   saveRcvChatItem' user cd msg sharedMsgId_ brokerTs content Nothing Nothing False
 
-saveRcvChatItem' :: (ChatMonad m, ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> UTCTime -> CIContent 'MDRcv -> Maybe (CIFile 'MDRcv) -> Maybe CITimed -> Bool -> m (ChatItem c 'MDRcv)
+saveRcvChatItem' :: (ChatTypeI c, ChatTypeQuotable c) => User -> ChatDirection c 'MDRcv -> RcvMessage -> Maybe SharedMsgId -> UTCTime -> CIContent 'MDRcv -> Maybe (CIFile 'MDRcv) -> Maybe CITimed -> Bool -> CM (ChatItem c 'MDRcv)
 saveRcvChatItem' user cd msg@RcvMessage {forwardedByMember} sharedMsgId_ brokerTs content ciFile itemTimed live = do
   createdAt <- liftIO getCurrentTime
   (ciId, quotedItem) <- withStore' $ \db -> do
@@ -6405,20 +6420,20 @@ saveRcvChatItem' user cd msg@RcvMessage {forwardedByMember} sharedMsgId_ brokerT
     pure (ciId, quotedItem)
   pure $ mkChatItem cd ciId content ciFile quotedItem sharedMsgId_ itemTimed live brokerTs forwardedByMember createdAt
 
-mkChatItem :: forall c d. (ChatTypeI c, MsgDirectionI d) => ChatDirection c d -> ChatItemId -> CIContent d -> Maybe (CIFile d) -> Maybe (CIQuote c) -> Maybe SharedMsgId -> Maybe CITimed -> Bool -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> ChatItem c d
+mkChatItem :: (ChatTypeI c, MsgDirectionI d) => ChatDirection c d -> ChatItemId -> CIContent d -> Maybe (CIFile d) -> Maybe (CIQuote c) -> Maybe SharedMsgId -> Maybe CITimed -> Bool -> ChatItemTs -> Maybe GroupMemberId -> UTCTime -> ChatItem c d
 mkChatItem cd ciId content file quotedItem sharedMsgId itemTimed live itemTs forwardedByMember currentTs =
   let itemText = ciContentToText content
       itemStatus = ciCreateStatus content
       meta = mkCIMeta ciId content itemText itemStatus sharedMsgId Nothing False itemTimed (justTrue live) currentTs itemTs forwardedByMember currentTs currentTs
    in ChatItem {chatDir = toCIDirection cd, meta, content, formattedText = parseMaybeMarkdownList itemText, quotedItem, reactions = [], file}
 
-deleteDirectCI :: (ChatMonad m, MsgDirectionI d) => User -> Contact -> ChatItem 'CTDirect d -> Bool -> Bool -> m ChatResponse
+deleteDirectCI :: MsgDirectionI d => User -> Contact -> ChatItem 'CTDirect d -> Bool -> Bool -> CM ChatResponse
 deleteDirectCI user ct ci@ChatItem {file} byUser timed = do
   deleteCIFile user file
   withStore' $ \db -> deleteDirectChatItem db user ct ci
   pure $ CRChatItemDeleted user (AChatItem SCTDirect msgDirection (DirectChat ct) ci) Nothing byUser timed
 
-deleteGroupCI :: (ChatMonad m, MsgDirectionI d) => User -> GroupInfo -> ChatItem 'CTGroup d -> Bool -> Bool -> Maybe GroupMember -> UTCTime -> m ChatResponse
+deleteGroupCI :: MsgDirectionI d => User -> GroupInfo -> ChatItem 'CTGroup d -> Bool -> Bool -> Maybe GroupMember -> UTCTime -> CM ChatResponse
 deleteGroupCI user gInfo ci@ChatItem {file} byUser timed byGroupMember_ deletedTs = do
   deleteCIFile user file
   toCi <- withStore' $ \db ->
@@ -6429,7 +6444,7 @@ deleteGroupCI user gInfo ci@ChatItem {file} byUser timed byGroupMember_ deletedT
   where
     gItem = AChatItem SCTGroup msgDirection (GroupChat gInfo)
 
-deleteLocalCI :: (ChatMonad m, MsgDirectionI d) => User -> NoteFolder -> ChatItem 'CTLocal d -> Bool -> Bool -> m ChatResponse
+deleteLocalCI :: MsgDirectionI d => User -> NoteFolder -> ChatItem 'CTLocal d -> Bool -> Bool -> CM ChatResponse
 deleteLocalCI user nf ci@ChatItem {file = file_} byUser timed = do
   forM_ file_ $ \file -> do
     let filesInfo = [mkCIFileInfo file]
@@ -6437,14 +6452,14 @@ deleteLocalCI user nf ci@ChatItem {file = file_} byUser timed = do
   withStore' $ \db -> deleteLocalChatItem db user nf ci
   pure $ CRChatItemDeleted user (AChatItem SCTLocal msgDirection (LocalChat nf) ci) Nothing byUser timed
 
-deleteCIFile :: (ChatMonad m, MsgDirectionI d) => User -> Maybe (CIFile d) -> m ()
+deleteCIFile :: MsgDirectionI d => User -> Maybe (CIFile d) -> CM ()
 deleteCIFile user file_ =
   forM_ file_ $ \file -> do
     let filesInfo = [mkCIFileInfo file]
     cancelFilesInProgress user filesInfo
     deleteFilesLocally filesInfo
 
-markDirectCIDeleted :: (ChatMonad m, MsgDirectionI d) => User -> Contact -> ChatItem 'CTDirect d -> MessageId -> Bool -> UTCTime -> m ChatResponse
+markDirectCIDeleted :: MsgDirectionI d => User -> Contact -> ChatItem 'CTDirect d -> MessageId -> Bool -> UTCTime -> CM ChatResponse
 markDirectCIDeleted user ct ci@ChatItem {file} msgId byUser deletedTs = do
   cancelCIFile user file
   ci' <- withStore' $ \db -> markDirectChatItemDeleted db user ct ci msgId deletedTs
@@ -6452,7 +6467,7 @@ markDirectCIDeleted user ct ci@ChatItem {file} msgId byUser deletedTs = do
   where
     ctItem = AChatItem SCTDirect msgDirection (DirectChat ct)
 
-markGroupCIDeleted :: (ChatMonad m, MsgDirectionI d) => User -> GroupInfo -> ChatItem 'CTGroup d -> MessageId -> Bool -> Maybe GroupMember -> UTCTime -> m ChatResponse
+markGroupCIDeleted :: MsgDirectionI d => User -> GroupInfo -> ChatItem 'CTGroup d -> MessageId -> Bool -> Maybe GroupMember -> UTCTime -> CM ChatResponse
 markGroupCIDeleted user gInfo ci@ChatItem {file} msgId byUser byGroupMember_ deletedTs = do
   cancelCIFile user file
   ci' <- withStore' $ \db -> markGroupChatItemDeleted db user gInfo ci msgId byGroupMember_ deletedTs
@@ -6460,74 +6475,74 @@ markGroupCIDeleted user gInfo ci@ChatItem {file} msgId byUser byGroupMember_ del
   where
     gItem = AChatItem SCTGroup msgDirection (GroupChat gInfo)
 
-cancelCIFile :: (ChatMonad m, MsgDirectionI d) => User -> Maybe (CIFile d) -> m ()
+cancelCIFile :: MsgDirectionI d => User -> Maybe (CIFile d) -> CM ()
 cancelCIFile user file_ =
   forM_ file_ $ \file -> do
     let filesInfo = [mkCIFileInfo file]
     cancelFilesInProgress user filesInfo
 
-createAgentConnectionAsync :: forall m c. (ChatMonad m, ConnectionModeI c) => User -> CommandFunction -> Bool -> SConnectionMode c -> SubscriptionMode -> m (CommandId, ConnId)
+createAgentConnectionAsync :: ConnectionModeI c => User -> CommandFunction -> Bool -> SConnectionMode c -> SubscriptionMode -> CM (CommandId, ConnId)
 createAgentConnectionAsync user cmdFunction enableNtfs cMode subMode = do
   cmdId <- withStore' $ \db -> createCommand db user Nothing cmdFunction
   connId <- withAgent $ \a -> createConnectionAsync a (aUserId user) (aCorrId cmdId) enableNtfs cMode IKPQOff subMode
   pure (cmdId, connId)
 
-joinAgentConnectionAsync :: ChatMonad m => User -> Bool -> ConnectionRequestUri c -> ConnInfo -> SubscriptionMode -> m (CommandId, ConnId)
+joinAgentConnectionAsync :: User -> Bool -> ConnectionRequestUri c -> ConnInfo -> SubscriptionMode -> CM (CommandId, ConnId)
 joinAgentConnectionAsync user enableNtfs cReqUri cInfo subMode = do
   cmdId <- withStore' $ \db -> createCommand db user Nothing CFJoinConn
   connId <- withAgent $ \a -> joinConnectionAsync a (aUserId user) (aCorrId cmdId) enableNtfs cReqUri cInfo PQSupportOff subMode
   pure (cmdId, connId)
 
-allowAgentConnectionAsync :: (MsgEncodingI e, ChatMonad m) => User -> Connection -> ConfirmationId -> ChatMsgEvent e -> m ()
+allowAgentConnectionAsync :: MsgEncodingI e => User -> Connection -> ConfirmationId -> ChatMsgEvent e -> CM ()
 allowAgentConnectionAsync user conn@Connection {connId, pqSupport, connChatVersion} confId msg = do
   cmdId <- withStore' $ \db -> createCommand db user (Just connId) CFAllowConn
   dm <- encodeConnInfoPQ pqSupport connChatVersion msg
   withAgent $ \a -> allowConnectionAsync a (aCorrId cmdId) (aConnId conn) confId dm
   withStore' $ \db -> updateConnectionStatus db conn ConnAccepted
 
-agentAcceptContactAsync :: (MsgEncodingI e, ChatMonad m) => User -> Bool -> InvitationId -> ChatMsgEvent e -> SubscriptionMode -> PQSupport -> VersionChat -> m (CommandId, ConnId)
+agentAcceptContactAsync :: MsgEncodingI e => User -> Bool -> InvitationId -> ChatMsgEvent e -> SubscriptionMode -> PQSupport -> VersionChat -> CM (CommandId, ConnId)
 agentAcceptContactAsync user enableNtfs invId msg subMode pqSup chatV = do
   cmdId <- withStore' $ \db -> createCommand db user Nothing CFAcceptContact
   dm <- encodeConnInfoPQ pqSup chatV msg
   connId <- withAgent $ \a -> acceptContactAsync a (aCorrId cmdId) enableNtfs invId dm pqSup subMode
   pure (cmdId, connId)
 
-deleteAgentConnectionAsync :: ChatMonad m => User -> ConnId -> m ()
+deleteAgentConnectionAsync :: User -> ConnId -> CM ()
 deleteAgentConnectionAsync user acId = deleteAgentConnectionAsync' user acId False
 
-deleteAgentConnectionAsync' :: ChatMonad m => User -> ConnId -> Bool -> m ()
+deleteAgentConnectionAsync' :: User -> ConnId -> Bool -> CM ()
 deleteAgentConnectionAsync' user acId waitDelivery = do
   withAgent (\a -> deleteConnectionAsync a waitDelivery acId) `catchChatError` (toView . CRChatError (Just user))
 
-deleteAgentConnectionsAsync :: ChatMonad m => User -> [ConnId] -> m ()
+deleteAgentConnectionsAsync :: User -> [ConnId] -> CM ()
 deleteAgentConnectionsAsync user acIds = deleteAgentConnectionsAsync' user acIds False
 
-deleteAgentConnectionsAsync' :: ChatMonad m => User -> [ConnId] -> Bool -> m ()
+deleteAgentConnectionsAsync' :: User -> [ConnId] -> Bool -> CM ()
 deleteAgentConnectionsAsync' _ [] _ = pure ()
 deleteAgentConnectionsAsync' user acIds waitDelivery = do
   withAgent (\a -> deleteConnectionsAsync a waitDelivery acIds) `catchChatError` (toView . CRChatError (Just user))
 
-agentXFTPDeleteRcvFile :: ChatMonad m => RcvFileId -> FileTransferId -> m ()
+agentXFTPDeleteRcvFile :: RcvFileId -> FileTransferId -> CM ()
 agentXFTPDeleteRcvFile aFileId fileId = do
-  withAgent (`xftpDeleteRcvFile` aFileId)
+  lift $ withAgent' (`xftpDeleteRcvFile` aFileId)
   withStore' $ \db -> setRcvFTAgentDeleted db fileId
 
-agentXFTPDeleteRcvFiles :: ChatMonad m => [(XFTPRcvFile, FileTransferId)] -> m ()
+agentXFTPDeleteRcvFiles :: [(XFTPRcvFile, FileTransferId)] -> CM' ()
 agentXFTPDeleteRcvFiles rcvFiles = do
   let rcvFiles' = filter (not . agentRcvFileDeleted . fst) rcvFiles
       rfIds = mapMaybe fileIds rcvFiles'
-  withAgent $ \a -> xftpDeleteRcvFiles a (map fst rfIds)
+  withAgent' $ \a -> xftpDeleteRcvFiles a (map fst rfIds)
   void . withStoreBatch' $ \db -> map (setRcvFTAgentDeleted db . snd) rfIds
   where
     fileIds :: (XFTPRcvFile, FileTransferId) -> Maybe (RcvFileId, FileTransferId)
     fileIds (XFTPRcvFile {agentRcvFileId = Just (AgentRcvFileId aFileId)}, fileId) = Just (aFileId, fileId)
     fileIds _ = Nothing
 
-agentXFTPDeleteSndFileRemote :: ChatMonad m => User -> XFTPSndFile -> FileTransferId -> m ()
+agentXFTPDeleteSndFileRemote :: User -> XFTPSndFile -> FileTransferId -> CM' ()
 agentXFTPDeleteSndFileRemote user xsf fileId =
   agentXFTPDeleteSndFilesRemote user [(xsf, fileId)]
 
-agentXFTPDeleteSndFilesRemote :: forall m. ChatMonad m => User -> [(XFTPSndFile, FileTransferId)] -> m ()
+agentXFTPDeleteSndFilesRemote :: User -> [(XFTPSndFile, FileTransferId)] -> CM' ()
 agentXFTPDeleteSndFilesRemote user sndFiles = do
   (_errs, redirects) <- partitionEithers <$> withStoreBatch' (\db -> map (lookupFileTransferRedirectMeta db user . snd) sndFiles)
   let redirects' = mapMaybe mapRedirectMeta $ concat redirects
@@ -6535,18 +6550,18 @@ agentXFTPDeleteSndFilesRemote user sndFiles = do
       sndFilesAll' = filter (not . agentSndFileDeleted . fst) sndFilesAll
   sndFilesAll'' <- catMaybes <$> mapM sndFileDescr sndFilesAll'
   let sfs = map (\(XFTPSndFile {agentSndFileId = AgentSndFileId aFileId}, sfd, _) -> (aFileId, sfd)) sndFilesAll''
-  withAgent $ \a -> xftpDeleteSndFilesRemote a (aUserId user) sfs
+  withAgent' $ \a -> xftpDeleteSndFilesRemote a (aUserId user) sfs
   void . withStoreBatch' $ \db -> map (setSndFTAgentDeleted db user . (\(_, _, fId) -> fId)) sndFilesAll''
   where
     mapRedirectMeta :: FileTransferMeta -> Maybe (XFTPSndFile, FileTransferId)
     mapRedirectMeta FileTransferMeta {fileId = fileId, xftpSndFile = Just sndFileRedirect} = Just (sndFileRedirect, fileId)
     mapRedirectMeta _ = Nothing
-    sndFileDescr :: (XFTPSndFile, FileTransferId) -> m (Maybe (XFTPSndFile, ValidFileDescription 'FSender, FileTransferId))
+    sndFileDescr :: (XFTPSndFile, FileTransferId) -> CM' (Maybe (XFTPSndFile, ValidFileDescription 'FSender, FileTransferId))
     sndFileDescr (xsf@XFTPSndFile {privateSndFileDescr}, fileId) =
       join <$> forM privateSndFileDescr parseSndDescr
       where
         parseSndDescr sfdText =
-          tryChatError (parseFileDescription sfdText) >>= \case
+          tryChatError' (parseFileDescription sfdText) >>= \case
             Left _ -> pure Nothing
             Right sd -> pure $ Just (xsf, sd, fileId)
 
@@ -6559,11 +6574,11 @@ userProfileToSend user@User {profile = p} incognitoProfile ct inGroup = do
       let userPrefs = maybe (preferences' user) (const Nothing) incognitoProfile
        in (p' :: Profile) {preferences = Just . toChatPrefs $ mergePreferences (userPreferences <$> ct) userPrefs}
 
-createRcvFeatureItems :: forall m. ChatMonad m => User -> Contact -> Contact -> m ()
+createRcvFeatureItems :: User -> Contact -> Contact -> CM' ()
 createRcvFeatureItems user ct ct' =
   createFeatureItems user ct ct' CDDirectRcv CIRcvChatFeature CIRcvChatPreference contactPreference
 
-createSndFeatureItems :: forall m. ChatMonad m => User -> Contact -> Contact -> m ()
+createSndFeatureItems :: User -> Contact -> Contact -> CM' ()
 createSndFeatureItems user ct ct' =
   createFeatureItems user ct ct' CDDirectSnd CISndChatFeature CISndChatPreference getPref
   where
@@ -6571,7 +6586,7 @@ createSndFeatureItems user ct ct' =
       CUPContact {preference} -> preference
       CUPUser {preference} -> preference
 
-createContactsSndFeatureItems :: forall m. ChatMonad m => User -> [ChangedProfileContact] -> m ()
+createContactsSndFeatureItems :: User -> [ChangedProfileContact] -> CM' ()
 createContactsSndFeatureItems user cts =
   createContactsFeatureItems user cts' CDDirectSnd CISndChatFeature CISndChatPreference getPref
   where
@@ -6583,8 +6598,7 @@ createContactsSndFeatureItems user cts =
 type FeatureContent a d = ChatFeature -> a -> Maybe Int -> CIContent d
 
 createFeatureItems ::
-  forall d m.
-  (MsgDirectionI d, ChatMonad m) =>
+  MsgDirectionI d =>
   User ->
   Contact ->
   Contact ->
@@ -6592,24 +6606,24 @@ createFeatureItems ::
   FeatureContent PrefEnabled d ->
   FeatureContent FeatureAllowed d ->
   (forall f. ContactUserPreference (FeaturePreference f) -> FeaturePreference f) ->
-  m ()
+  CM' ()
 createFeatureItems user ct ct' = createContactsFeatureItems user [(ct, ct')]
 
 createContactsFeatureItems ::
-  forall d m.
-  (MsgDirectionI d, ChatMonad m) =>
+  forall d.
+  MsgDirectionI d =>
   User ->
   [(Contact, Contact)] ->
   (Contact -> ChatDirection 'CTDirect d) ->
   FeatureContent PrefEnabled d ->
   FeatureContent FeatureAllowed d ->
   (forall f. ContactUserPreference (FeaturePreference f) -> FeaturePreference f) ->
-  m ()
+  CM' ()
 createContactsFeatureItems user cts chatDir ciFeature ciOffer getPref = do
   let dirsCIContents = map contactChangedFeatures cts
   (errs, acis) <- partitionEithers <$> createInternalItemsForChats user Nothing dirsCIContents
-  unless (null errs) $ toView $ CRChatErrors (Just user) errs
-  forM_ acis $ \aci -> toView $ CRNewChatItem user aci
+  unless (null errs) $ toView' $ CRChatErrors (Just user) errs
+  forM_ acis $ \aci -> toView' $ CRNewChatItem user aci
   where
     contactChangedFeatures :: (Contact, Contact) -> (ChatDirection 'CTDirect d, [CIContent d])
     contactChangedFeatures (Contact {mergedPreferences = cups}, ct'@Contact {mergedPreferences = cups'}) = do
@@ -6632,7 +6646,7 @@ createContactsFeatureItems user cts chatDir ciFeature ciOffer getPref = do
             cup = getContactUserPreference f cups
             cup' = getContactUserPreference f cups'
 
-createGroupFeatureChangedItems :: (MsgDirectionI d, ChatMonad m) => User -> ChatDirection 'CTGroup d -> (GroupFeature -> GroupPreference -> Maybe Int -> CIContent d) -> GroupInfo -> GroupInfo -> m ()
+createGroupFeatureChangedItems :: MsgDirectionI d => User -> ChatDirection 'CTGroup d -> (GroupFeature -> GroupPreference -> Maybe Int -> CIContent d) -> GroupInfo -> GroupInfo -> CM ()
 createGroupFeatureChangedItems user cd ciContent GroupInfo {fullGroupPreferences = gps} GroupInfo {fullGroupPreferences = gps'} =
   forM_ allGroupFeatures $ \(AGF f) -> do
     let state = groupFeatureState $ getGroupPreference f gps
@@ -6644,20 +6658,20 @@ createGroupFeatureChangedItems user cd ciContent GroupInfo {fullGroupPreferences
 sameGroupProfileInfo :: GroupProfile -> GroupProfile -> Bool
 sameGroupProfileInfo p p' = p {groupPreferences = Nothing} == p' {groupPreferences = Nothing}
 
-createInternalChatItem :: (ChatTypeI c, MsgDirectionI d, ChatMonad m) => User -> ChatDirection c d -> CIContent d -> Maybe UTCTime -> m ()
+createInternalChatItem :: (ChatTypeI c, MsgDirectionI d) => User -> ChatDirection c d -> CIContent d -> Maybe UTCTime -> CM ()
 createInternalChatItem user cd content itemTs_ =
-  createInternalItemsForChats user itemTs_ [(cd, [content])] >>= \case
+  lift (createInternalItemsForChats user itemTs_ [(cd, [content])]) >>= \case
     [Right aci] -> toView $ CRNewChatItem user aci
     [Left e] -> throwError e
     rs -> throwChatError $ CEInternalError $ "createInternalChatItem: expected 1 result, got " <> show (length rs)
 
 createInternalItemsForChats ::
-  forall c d m.
-  (ChatTypeI c, MsgDirectionI d, ChatMonad' m) =>
+  forall c d.
+  (ChatTypeI c, MsgDirectionI d) =>
   User ->
   Maybe UTCTime ->
   [(ChatDirection c d, [CIContent d])] ->
-  m [Either ChatError AChatItem]
+  CM' [Either ChatError AChatItem]
 createInternalItemsForChats user itemTs_ dirsCIContents = do
   createdAt <- liftIO getCurrentTime
   let itemTs = fromMaybe createdAt itemTs_
@@ -6674,7 +6688,7 @@ createInternalItemsForChats user itemTs_ dirsCIContents = do
       let ci = mkChatItem cd ciId content Nothing Nothing Nothing Nothing False itemTs Nothing createdAt
       pure $ AChatItem (chatTypeI @c) (msgDirection @d) (toChatInfo cd) ci
 
-createLocalChatItem :: (MsgDirectionI d, ChatMonad m) => User -> ChatDirection 'CTLocal d -> CIContent d -> UTCTime -> m ChatItemId
+createLocalChatItem :: MsgDirectionI d => User -> ChatDirection 'CTLocal d -> CIContent d -> UTCTime -> CM ChatItemId
 createLocalChatItem user cd content createdAt = do
   gVar <- asks random
   withStore $ \db -> do
@@ -6683,7 +6697,7 @@ createLocalChatItem user cd content createdAt = do
       let smi_ = Just (SharedMsgId sharedMsgId)
        in createNewChatItem_ db user cd Nothing smi_ content (Nothing, Nothing, Nothing, Nothing, Nothing) Nothing False createdAt Nothing createdAt
 
-withUser' :: ChatMonad m => (User -> m ChatResponse) -> m ChatResponse
+withUser' :: (User -> CM ChatResponse) -> CM ChatResponse
 withUser' action =
   asks currentUser
     >>= readTVarIO
@@ -6691,30 +6705,30 @@ withUser' action =
   where
     run u = action u `catchChatError` (pure . CRChatCmdError (Just u))
 
-withUser :: ChatMonad m => (User -> m ChatResponse) -> m ChatResponse
+withUser :: (User -> CM ChatResponse) -> CM ChatResponse
 withUser action = withUser' $ \user ->
-  ifM chatStarted (action user) (throwChatError CEChatNotStarted)
+  ifM (lift chatStarted) (action user) (throwChatError CEChatNotStarted)
 
-withUser_ :: ChatMonad m => m ChatResponse -> m ChatResponse
+withUser_ :: CM ChatResponse -> CM ChatResponse
 withUser_ = withUser . const
 
-withUserId' :: ChatMonad m => UserId -> (User -> m ChatResponse) -> m ChatResponse
+withUserId' :: UserId -> (User -> CM ChatResponse) -> CM ChatResponse
 withUserId' userId action = withUser' $ \user -> do
   checkSameUser userId user
   action user
 
-withUserId :: ChatMonad m => UserId -> (User -> m ChatResponse) -> m ChatResponse
+withUserId :: UserId -> (User -> CM ChatResponse) -> CM ChatResponse
 withUserId userId action = withUser $ \user -> do
   checkSameUser userId user
   action user
 
-checkSameUser :: ChatMonad m => UserId -> User -> m ()
+checkSameUser :: UserId -> User -> CM ()
 checkSameUser userId User {userId = activeUserId} = when (userId /= activeUserId) $ throwChatError (CEDifferentActiveUser userId activeUserId)
 
-chatStarted :: ChatMonad m => m Bool
+chatStarted :: CM' Bool
 chatStarted = fmap isJust . readTVarIO =<< asks agentAsync
 
-waitChatStartedAndActivated :: ChatMonad m => m ()
+waitChatStartedAndActivated :: CM' ()
 waitChatStartedAndActivated = do
   agentStarted <- asks agentAsync
   chatActivated <- asks chatActivated
@@ -6723,11 +6737,15 @@ waitChatStartedAndActivated = do
     activated <- readTVar chatActivated
     unless (isJust started && activated) retry
 
-chatVersionRange :: ChatMonad' m => m (PQSupport -> VersionRangeChat)
-chatVersionRange = do
+chatVersionRange :: CM (PQSupport -> VersionRangeChat)
+chatVersionRange = lift chatVersionRange'
+{-# INLINE chatVersionRange #-}
+
+chatVersionRange' :: CM' (PQSupport -> VersionRangeChat)
+chatVersionRange' = do
   ChatConfig {chatVRange} <- asks config
   pure chatVRange
-{-# INLINE chatVersionRange #-}
+{-# INLINE chatVersionRange' #-}
 
 chatCommandP :: Parser ChatCommand
 chatCommandP =
@@ -7034,7 +7052,8 @@ chatCommandP =
       "/get subs" $> GetAgentSubs,
       "/get subs details" $> GetAgentSubsDetails,
       "/get workers" $> GetAgentWorkers,
-      "/get workers details" $> GetAgentWorkersDetails
+      "/get workers details" $> GetAgentWorkersDetails,
+      "//" *> (CustomChatCommand <$> A.takeByteString)
     ]
   where
     choice = A.choice . map (\p -> p <* A.takeWhile (== ' ') <* A.endOfInput)
@@ -7178,13 +7197,13 @@ simplexContactProfile =
       preferences = Nothing
     }
 
-timeItToView :: ChatMonad' m => String -> m a -> m a
+timeItToView :: String -> CM' a -> CM' a
 timeItToView s action = do
   t1 <- liftIO getCurrentTime
   a <- action
   t2 <- liftIO getCurrentTime
   let diff = diffToMilliseconds $ diffUTCTime t2 t1
-  toView $ CRTimedAction s diff
+  toView' $ CRTimedAction s diff
   pure a
 
 mkValidName :: String -> String
@@ -7206,11 +7225,11 @@ mkValidName = reverse . dropWhile isSpace . fst3 . foldl' addChar ("", '\NUL', 0
           | otherwise = validFirstChar || isSpace c || isMark c || isPunctuation c
         validFirstChar = isLetter c || isNumber c || isSymbol c
 
-xftpSndFileTransfer_ :: ChatMonad m => User -> CryptoFile -> Integer -> Int -> Maybe ContactOrGroup -> m (FileInvitation, CIFile 'MDSnd, FileTransferMeta)
+xftpSndFileTransfer_ :: User -> CryptoFile -> Integer -> Int -> Maybe ContactOrGroup -> CM (FileInvitation, CIFile 'MDSnd, FileTransferMeta)
 xftpSndFileTransfer_ user file@(CryptoFile filePath cfArgs) fileSize n contactOrGroup_ = do
   let fileName = takeFileName filePath
       fInv = xftpFileInvitation fileName fileSize dummyFileDescr
-  fsFilePath <- toFSFilePath filePath
+  fsFilePath <- lift $ toFSFilePath filePath
   let srcFile = CryptoFile fsFilePath cfArgs
   aFileId <- withAgent $ \a -> xftpSendFile a (aUserId user) srcFile (roundedFDCount n)
   -- TODO CRSndFileStart event for XFTP
@@ -7220,7 +7239,7 @@ xftpSndFileTransfer_ user file@(CryptoFile filePath cfArgs) fileSize n contactOr
       ciFile = CIFile {fileId, fileName, fileSize, fileSource, fileStatus = CIFSSndStored, fileProtocol = FPXFTP}
   pure (fInv, ciFile, ft)
 
-xftpSndFileRedirect :: ChatMonad m => User -> FileTransferId -> ValidFileDescription 'FRecipient -> m FileTransferMeta
+xftpSndFileRedirect :: User -> FileTransferId -> ValidFileDescription 'FRecipient -> CM FileTransferMeta
 xftpSndFileRedirect user ftId vfd = do
   let fileName = "redirect.yaml"
       file = CryptoFile fileName Nothing
diff --git a/src/Simplex/Chat/Archive.hs b/src/Simplex/Chat/Archive.hs
index 4644299598..d51f60f5f1 100644
--- a/src/Simplex/Chat/Archive.hs
+++ b/src/Simplex/Chat/Archive.hs
@@ -44,7 +44,7 @@ archiveChatDbFile = "simplex_v1_chat.db"
 archiveFilesFolder :: String
 archiveFilesFolder = "simplex_v1_files"
 
-exportArchive :: ChatMonad m => ArchiveConfig -> m ()
+exportArchive :: ArchiveConfig -> CM' ()
 exportArchive cfg@ArchiveConfig {archivePath, disableCompression} =
   withTempDir cfg "simplex-chat." $ \dir -> do
     StorageFiles {chatStore, agentStore, filesPath} <- storageFiles
@@ -55,7 +55,7 @@ exportArchive cfg@ArchiveConfig {archivePath, disableCompression} =
     let method = if disableCompression == Just True then Z.Store else Z.Deflate
     Z.createArchive archivePath $ Z.packDirRecur method Z.mkEntrySelector dir
 
-importArchive :: ChatMonad m => ArchiveConfig -> m [ArchiveError]
+importArchive :: ArchiveConfig -> CM' [ArchiveError]
 importArchive cfg@ArchiveConfig {archivePath} =
   withTempDir cfg "simplex-chat." $ \dir -> do
     Z.withArchive archivePath $ Z.unpackInto dir
@@ -78,12 +78,12 @@ importArchive cfg@ArchiveConfig {archivePath} =
             (pure [])
         _ -> pure []
 
-withTempDir :: ChatMonad m => ArchiveConfig -> (String -> (FilePath -> m a) -> m a)
+withTempDir :: ArchiveConfig -> (String -> (FilePath -> CM' a) -> CM' a)
 withTempDir cfg = case parentTempDirectory (cfg :: ArchiveConfig) of
   Just tmpDir -> withTempDirectory tmpDir
   _ -> withSystemTempDirectory
 
-copyDirectoryFiles :: ChatMonad m => FilePath -> FilePath -> m [ArchiveError]
+copyDirectoryFiles :: FilePath -> FilePath -> CM' [ArchiveError]
 copyDirectoryFiles fromDir toDir = do
   createDirectoryIfMissing False toDir
   fs <- listDirectory fromDir
@@ -97,9 +97,9 @@ copyDirectoryFiles fromDir toDir = do
           f' = fromDir </> fn
       whenM (doesFileExist f') $ copyFile f' $ toDir </> fn
 
-deleteStorage :: ChatMonad m => m ()
+deleteStorage :: CM ()
 deleteStorage = do
-  fs <- storageFiles
+  fs <- lift storageFiles
   liftIO $ closeSQLiteStore `withStores` fs
   remove `withDBs` fs
   mapM_ removeDir $ filesPath fs
@@ -114,17 +114,17 @@ data StorageFiles = StorageFiles
     filesPath :: Maybe FilePath
   }
 
-storageFiles :: ChatMonad m => m StorageFiles
+storageFiles :: CM' StorageFiles
 storageFiles = do
   ChatController {chatStore, filesFolder, smpAgent} <- ask
   let agentStore = agentClientStore smpAgent
   filesPath <- readTVarIO filesFolder
   pure StorageFiles {chatStore, agentStore, filesPath}
 
-sqlCipherExport :: forall m. ChatMonad m => DBEncryptionConfig -> m ()
+sqlCipherExport :: DBEncryptionConfig -> CM ()
 sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = DBEncryptionKey key', keepKey} =
   when (key /= key') $ do
-    fs <- storageFiles
+    fs <- lift storageFiles
     checkFile `withDBs` fs
     backup `withDBs` fs
     checkEncryption `withStores` fs
@@ -159,7 +159,7 @@ sqlCipherExport DBEncryptionConfig {currentKey = DBEncryptionKey key, newKey = D
                    "DETACH DATABASE exported;"
                  ]
 
-withDB :: forall a m. ChatMonad m => FilePath -> (SQL.Database -> IO a) -> (SQLiteError -> DatabaseError) -> m ()
+withDB :: FilePath -> (SQL.Database -> IO a) -> (SQLiteError -> DatabaseError) -> CM ()
 withDB f' a err =
   liftIO (bracket (SQL.open $ T.pack f') SQL.close a $> Nothing)
     `catch` checkSQLError
@@ -169,7 +169,7 @@ withDB f' a err =
     checkSQLError e = case SQL.sqlError e of
       SQL.ErrorNotADatabase -> pure $ Just SQLiteErrorNotADatabase
       _ -> sqliteError' e
-    sqliteError' :: Show e => e -> m (Maybe SQLiteError)
+    sqliteError' :: Show e => e -> CM (Maybe SQLiteError)
     sqliteError' = pure . Just . SQLiteError . show
 
 testSQL :: BA.ScrubbedBytes -> Text
@@ -184,9 +184,9 @@ testSQL k =
 keySQL :: BA.ScrubbedBytes -> [Text]
 keySQL k = ["PRAGMA key = " <> keyString k <> ";" | not (BA.null k)]
 
-sqlCipherTestKey :: forall m. ChatMonad m => DBEncryptionKey -> m ()
+sqlCipherTestKey :: DBEncryptionKey -> CM ()
 sqlCipherTestKey (DBEncryptionKey key) = do
-  fs <- storageFiles
+  fs <- lift storageFiles
   testKey `withDBs` fs
   where
     testKey f = withDB f (`SQL.exec` testSQL key) DBErrorOpen
diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs
index 4ca9da094f..0291793843 100644
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -62,6 +62,7 @@ import Simplex.Chat.Remote.Types
 import Simplex.Chat.Store (AutoAccept, StoreError (..), UserContactLink, UserMsgReceiptSettings)
 import Simplex.Chat.Types
 import Simplex.Chat.Types.Preferences
+import Simplex.Chat.Util (liftIOEither)
 import Simplex.FileTransfer.Description (FileDescriptionURI)
 import Simplex.Messaging.Agent (AgentClient, SubscriptionsInfo)
 import Simplex.Messaging.Agent.Client (AgentLocks, AgentWorkersDetails (..), AgentWorkersSummary (..), ProtocolTestFailure)
@@ -82,7 +83,7 @@ import Simplex.Messaging.Protocol (AProtoServerWithAuth, AProtocolType (..), Cor
 import Simplex.Messaging.TMap (TMap)
 import Simplex.Messaging.Transport (TLS, simplexMQVersion)
 import Simplex.Messaging.Transport.Client (TransportHost)
-import Simplex.Messaging.Util (allFinally, catchAllErrors, liftIOEither, tryAllErrors, (<$$>))
+import Simplex.Messaging.Util (allFinally, catchAllErrors, catchAllErrors', tryAllErrors, tryAllErrors', (<$$>))
 import Simplex.RemoteControl.Client
 import Simplex.RemoteControl.Invitation (RCSignedInvitation, RCVerifiedInvitation)
 import Simplex.RemoteControl.Types
@@ -144,9 +145,28 @@ data ChatConfig = ChatConfig
     ciExpirationInterval :: Int64, -- microseconds
     coreApi :: Bool,
     highlyAvailable :: Bool,
-    deviceNameForRemote :: Text
+    deviceNameForRemote :: Text,
+    chatHooks :: ChatHooks
   }
 
+-- The hooks can be used to extend or customize chat core in mobile or CLI clients.
+data ChatHooks = ChatHooks
+  { -- preCmdHook can be used to process or modify the commands before they are processed.
+    -- This hook should be used to process CustomChatCommand.
+    -- if this hook returns ChatResponse, the command processing will be skipped.
+    preCmdHook :: ChatController -> ChatCommand -> IO (Either ChatResponse ChatCommand),
+    -- eventHook can be used to additionally process or modify events,
+    -- it is called before the event is sent to the user (or to the UI).
+    eventHook :: ChatController -> ChatResponse -> IO ChatResponse
+  }
+
+defaultChatHooks :: ChatHooks
+defaultChatHooks =
+  ChatHooks
+    { preCmdHook = \_ -> pure . Right,
+      eventHook = \_ -> pure
+    }      
+
 data DefaultAgentServers = DefaultAgentServers
   { smp :: NonEmpty SMPServerWithAuth,
     ntf :: [NtfServer],
@@ -471,6 +491,9 @@ data ChatCommand
   | GetAgentSubsDetails
   | GetAgentWorkers
   | GetAgentWorkersDetails
+  -- The parser will return this command for strings that start from "//".
+  -- This command should be processed in preCmdHook
+  | CustomChatCommand ByteString
   deriving (Show)
 
 allowRemoteCommand :: ChatCommand -> Bool -- XXX: consider using Relay/Block/ForceLocal
@@ -597,10 +620,9 @@ data ChatResponse
   | CRContactRequestAlreadyAccepted {user :: User, contact :: Contact}
   | CRLeftMemberUser {user :: User, groupInfo :: GroupInfo}
   | CRGroupDeletedUser {user :: User, groupInfo :: GroupInfo}
-  | CRRcvFileDescrReady {user :: User, chatItem :: AChatItem}
+  | CRRcvFileDescrReady {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer, rcvFileDescr :: RcvFileDescr}
   | CRRcvFileAccepted {user :: User, chatItem :: AChatItem}
   | CRRcvFileAcceptedSndCancelled {user :: User, rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileDescrNotReady {user :: User, chatItem :: AChatItem}
   | CRStandaloneFileInfo {fileMeta :: Maybe J.Value}
   | CRRcvStandaloneFileCreated {user :: User, rcvFileTransfer :: RcvFileTransfer} -- returned by _download
   | CRRcvFileStart {user :: User, chatItem :: AChatItem} -- sent by chats
@@ -726,6 +748,7 @@ data ChatResponse
   | CRArchiveImported {archiveErrors :: [ArchiveError]}
   | CRAppSettings {appSettings :: AppSettings}
   | CRTimedAction {action :: String, durationMilliseconds :: Int64}
+  | CRCustomChatResponse {user_ :: Maybe User, response :: Text}
   deriving (Show)
 
 -- some of these can only be used as command responses
@@ -1118,7 +1141,7 @@ data DatabaseError
 data SQLiteError = SQLiteErrorNotADatabase | SQLiteError String
   deriving (Show, Exception)
 
-throwDBError :: ChatMonad m => DatabaseError -> m ()
+throwDBError :: DatabaseError -> CM ()
 throwDBError = throwError . ChatErrorDatabase
 
 -- TODO review errors, some of it can be covered by HTTP2 errors
@@ -1222,39 +1245,59 @@ data RemoteCtrlInfo = RemoteCtrlInfo
   }
   deriving (Show)
 
-type ChatMonad' m = (MonadUnliftIO m, MonadReader ChatController m)
+type CM' a = ReaderT ChatController IO a
 
-type ChatMonad m = (ChatMonad' m, MonadError ChatError m)
+type CM a = ExceptT ChatError (ReaderT ChatController IO) a
 
-chatReadVar :: ChatMonad' m => (ChatController -> TVar a) -> m a
-chatReadVar f = asks f >>= readTVarIO
+chatReadVar :: (ChatController -> TVar a) -> CM a
+chatReadVar = lift . chatReadVar'
 {-# INLINE chatReadVar #-}
 
-chatWriteVar :: ChatMonad' m => (ChatController -> TVar a) -> a -> m ()
-chatWriteVar f value = asks f >>= atomically . (`writeTVar` value)
+chatReadVar' :: (ChatController -> TVar a) -> CM' a
+chatReadVar' f = asks f >>= readTVarIO
+{-# INLINE chatReadVar' #-}
+
+chatWriteVar :: (ChatController -> TVar a) -> a -> CM ()
+chatWriteVar f = lift . chatWriteVar' f
 {-# INLINE chatWriteVar #-}
 
-chatModifyVar :: ChatMonad' m => (ChatController -> TVar a) -> (a -> a) -> m ()
-chatModifyVar f newValue = asks f >>= atomically . (`modifyTVar'` newValue)
+chatWriteVar' :: (ChatController -> TVar a) -> a -> CM' ()
+chatWriteVar' f value = asks f >>= atomically . (`writeTVar` value)
+{-# INLINE chatWriteVar' #-}
+
+chatModifyVar :: (ChatController -> TVar a) -> (a -> a) -> CM ()
+chatModifyVar f = lift . chatModifyVar' f
 {-# INLINE chatModifyVar #-}
 
-setContactNetworkStatus :: ChatMonad' m => Contact -> NetworkStatus -> m ()
-setContactNetworkStatus Contact {activeConn = Nothing} _ = pure ()
-setContactNetworkStatus Contact {activeConn = Just Connection {agentConnId}} status = chatModifyVar connNetworkStatuses $ M.insert agentConnId status
+chatModifyVar' :: (ChatController -> TVar a) -> (a -> a) -> CM' ()
+chatModifyVar' f newValue = asks f >>= atomically . (`modifyTVar'` newValue)
+{-# INLINE chatModifyVar' #-}
 
-tryChatError :: ChatMonad m => m a -> m (Either ChatError a)
+setContactNetworkStatus :: Contact -> NetworkStatus -> CM' ()
+setContactNetworkStatus Contact {activeConn = Nothing} _ = pure ()
+setContactNetworkStatus Contact {activeConn = Just Connection {agentConnId}} status = chatModifyVar' connNetworkStatuses $ M.insert agentConnId status
+
+tryChatError :: CM a -> CM (Either ChatError a)
 tryChatError = tryAllErrors mkChatError
 {-# INLINE tryChatError #-}
 
-catchChatError :: ChatMonad m => m a -> (ChatError -> m a) -> m a
+tryChatError' :: CM a -> CM' (Either ChatError a)
+tryChatError' = tryAllErrors' mkChatError
+{-# INLINE tryChatError' #-}
+
+catchChatError :: CM a -> (ChatError -> CM a) -> CM a
 catchChatError = catchAllErrors mkChatError
 {-# INLINE catchChatError #-}
 
-chatFinally :: ChatMonad m => m a -> m b -> m a
+catchChatError' :: CM a -> (ChatError -> CM' a) -> CM' a
+catchChatError' = catchAllErrors' mkChatError
+{-# INLINE catchChatError' #-}
+
+chatFinally :: CM a -> CM b -> CM a
 chatFinally = allFinally mkChatError
 {-# INLINE chatFinally #-}
 
-onChatError :: ChatMonad m => m a -> m b -> m a
+onChatError :: CM a -> CM b -> CM a
 a `onChatError` onErr = a `catchChatError` \e -> onErr >> throwError e
 {-# INLINE onChatError #-}
 
@@ -1273,14 +1316,18 @@ mkStoreError = SEInternalError . show
 chatCmdError :: Maybe User -> String -> ChatResponse
 chatCmdError user = CRChatCmdError user . ChatError . CECommandError
 
-throwChatError :: ChatMonad m => ChatErrorType -> m a
+throwChatError :: ChatErrorType -> CM a
 throwChatError = throwError . ChatError
 
 -- | Emit local events.
-toView :: ChatMonad' m => ChatResponse -> m ()
-toView event = do
-  localQ <- asks outputQ
-  session <- asks remoteCtrlSession
+toView :: ChatResponse -> CM ()
+toView = lift . toView'
+{-# INLINE toView #-}
+
+toView' :: ChatResponse -> CM' ()
+toView' ev = do
+  cc@ChatController {outputQ = localQ, remoteCtrlSession = session, config = ChatConfig {chatHooks}} <- ask
+  event <- liftIO $ eventHook chatHooks cc ev
   atomically $
     readTVar session >>= \case
       Just (_, RCSessionConnected {remoteOutputQ})
@@ -1288,15 +1335,15 @@ toView event = do
       -- TODO potentially, it should hold some events while connecting
       _ -> writeTBQueue localQ (Nothing, Nothing, event)
 
-withStore' :: ChatMonad m => (DB.Connection -> IO a) -> m a
+withStore' :: (DB.Connection -> IO a) -> CM a
 withStore' action = withStore $ liftIO . action
 
-withStore :: ChatMonad m => (DB.Connection -> ExceptT StoreError IO a) -> m a
+withStore :: (DB.Connection -> ExceptT StoreError IO a) -> CM a
 withStore action = do
   ChatController {chatStore} <- ask
   liftIOEither $ withTransaction chatStore (runExceptT . withExceptT ChatErrorStore . action) `E.catches` handleDBErrors
 
-withStoreBatch :: (ChatMonad' m, Traversable t) => (DB.Connection -> t (IO (Either ChatError a))) -> m (t (Either ChatError a))
+withStoreBatch :: Traversable t => (DB.Connection -> t (IO (Either ChatError a))) -> CM' (t (Either ChatError a))
 withStoreBatch actions = do
   ChatController {chatStore} <- ask
   liftIO $ withTransaction chatStore $ mapM (`E.catches` handleDBErrors) . actions
@@ -1310,17 +1357,17 @@ handleDBErrors =
     E.Handler $ \(E.SomeException e) -> pure . Left . ChatErrorStore . SEDBException $ show e
   ]
 
-withStoreBatch' :: (ChatMonad' m, Traversable t) => (DB.Connection -> t (IO a)) -> m (t (Either ChatError a))
+withStoreBatch' :: Traversable t => (DB.Connection -> t (IO a)) -> CM' (t (Either ChatError a))
 withStoreBatch' actions = withStoreBatch $ fmap (fmap Right) . actions
 
-withAgent :: ChatMonad m => (AgentClient -> ExceptT AgentErrorType m a) -> m a
+withAgent :: (AgentClient -> ExceptT AgentErrorType IO a) -> CM a
 withAgent action =
   asks smpAgent
-    >>= runExceptT . action
+    >>= liftIO . runExceptT . action
     >>= liftEither . first (`ChatErrorAgent` Nothing)
 
-withAgent' :: ChatMonad' m => (AgentClient -> m a) -> m a
-withAgent' action = asks smpAgent >>= action
+withAgent' :: (AgentClient -> IO a) -> CM' a
+withAgent' action = asks smpAgent >>= liftIO . action
 
 $(JQ.deriveJSON (enumJSON $ dropPrefix "HS") ''HelpSection)
 
diff --git a/src/Simplex/Chat/Files.hs b/src/Simplex/Chat/Files.hs
index 9c6d731dd7..0c04b22e28 100644
--- a/src/Simplex/Chat/Files.hs
+++ b/src/Simplex/Chat/Files.hs
@@ -3,13 +3,12 @@
 
 module Simplex.Chat.Files where
 
-import Control.Monad.IO.Class
 import Simplex.Chat.Controller
 import Simplex.Messaging.Util (ifM)
 import System.FilePath (combine, splitExtensions)
 import UnliftIO.Directory (doesDirectoryExist, doesFileExist, getHomeDirectory, getTemporaryDirectory)
 
-uniqueCombine :: MonadIO m => FilePath -> String -> m FilePath
+uniqueCombine :: FilePath -> String -> IO FilePath
 uniqueCombine fPath fName = tryCombine (0 :: Int)
   where
     tryCombine n =
@@ -18,10 +17,10 @@ uniqueCombine fPath fName = tryCombine (0 :: Int)
           f = fPath `combine` (name <> suffix <> ext)
        in ifM (doesFileExist f) (tryCombine $ n + 1) (pure f)
 
-getChatTempDirectory :: ChatMonad m => m FilePath
-getChatTempDirectory = chatReadVar tempDirectory >>= maybe getTemporaryDirectory pure
+getChatTempDirectory :: CM' FilePath
+getChatTempDirectory = chatReadVar' tempDirectory >>= maybe getTemporaryDirectory pure
 
-getDefaultFilesFolder :: ChatMonad m => m FilePath
+getDefaultFilesFolder :: CM' FilePath
 getDefaultFilesFolder = do
   dir <- (`combine` "Downloads") <$> getHomeDirectory
   ifM (doesDirectoryExist dir) (pure dir) getChatTempDirectory
diff --git a/src/Simplex/Chat/Messages.hs b/src/Simplex/Chat/Messages.hs
index 4312cfa858..b29543cf74 100644
--- a/src/Simplex/Chat/Messages.hs
+++ b/src/Simplex/Chat/Messages.hs
@@ -871,8 +871,7 @@ data SndMsgDelivery = SndMsgDelivery
 data RcvMsgDelivery = RcvMsgDelivery
   { connId :: Int64,
     agentMsgId :: AgentMsgId,
-    agentMsgMeta :: MsgMeta,
-    agentAckCmdId :: CommandId
+    agentMsgMeta :: MsgMeta
   }
   deriving (Show)
 
@@ -899,7 +898,7 @@ msgMetaToJson MsgMeta {integrity, recipient = (rcvId, rcvTs), broker = (serverId
 
 data MsgDeliveryStatus (d :: MsgDirection) where
   MDSRcvAgent :: MsgDeliveryStatus 'MDRcv
-  MDSRcvAcknowledged :: MsgDeliveryStatus 'MDRcv
+  MDSRcvAcknowledged :: MsgDeliveryStatus 'MDRcv -- not used
   MDSSndPending :: MsgDeliveryStatus 'MDSnd
   MDSSndAgent :: MsgDeliveryStatus 'MDSnd
   MDSSndSent :: MsgDeliveryStatus 'MDSnd
diff --git a/src/Simplex/Chat/Migrations/M20240313_drop_agent_ack_cmd_id.hs b/src/Simplex/Chat/Migrations/M20240313_drop_agent_ack_cmd_id.hs
new file mode 100644
index 0000000000..c14f08447e
--- /dev/null
+++ b/src/Simplex/Chat/Migrations/M20240313_drop_agent_ack_cmd_id.hs
@@ -0,0 +1,22 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20240313_drop_agent_ack_cmd_id where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20240313_drop_agent_ack_cmd_id :: Query
+m20240313_drop_agent_ack_cmd_id =
+  [sql|
+DROP INDEX idx_msg_deliveries_agent_ack_cmd_id;
+
+ALTER TABLE msg_deliveries DROP COLUMN agent_ack_cmd_id;
+|]
+
+down_m20240313_drop_agent_ack_cmd_id :: Query
+down_m20240313_drop_agent_ack_cmd_id =
+  [sql|
+ALTER TABLE msg_deliveries ADD COLUMN agent_ack_cmd_id INTEGER;
+
+CREATE INDEX idx_msg_deliveries_agent_ack_cmd_id ON msg_deliveries(connection_id, agent_ack_cmd_id);
+|]
diff --git a/src/Simplex/Chat/Migrations/M20240324_custom_data.hs b/src/Simplex/Chat/Migrations/M20240324_custom_data.hs
new file mode 100644
index 0000000000..bc1c4807eb
--- /dev/null
+++ b/src/Simplex/Chat/Migrations/M20240324_custom_data.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20240324_custom_data where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20240324_custom_data :: Query
+m20240324_custom_data =
+  [sql|
+ALTER TABLE contacts ADD COLUMN custom_data BLOB;
+ALTER TABLE groups ADD COLUMN custom_data BLOB;
+|]
+
+down_m20240324_custom_data :: Query
+down_m20240324_custom_data =
+  [sql|
+ALTER TABLE contacts DROP COLUMN custom_data;
+ALTER TABLE groups DROP COLUMN custom_data;
+|]
diff --git a/src/Simplex/Chat/Migrations/chat_schema.sql b/src/Simplex/Chat/Migrations/chat_schema.sql
index 19c6ba24d0..11cbd8ae89 100644
--- a/src/Simplex/Chat/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Migrations/chat_schema.sql
@@ -73,6 +73,7 @@ CREATE TABLE contacts(
   REFERENCES group_members(group_member_id) ON DELETE SET NULL,
   contact_grp_inv_sent INTEGER NOT NULL DEFAULT 0,
   contact_status TEXT NOT NULL DEFAULT 'active',
+  custom_data BLOB,
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -120,7 +121,8 @@ CREATE TABLE groups(
   favorite INTEGER NOT NULL DEFAULT 0,
   send_rcpts INTEGER,
   via_group_link_uri_hash BLOB,
-  user_member_profile_sent_at TEXT, -- received
+  user_member_profile_sent_at TEXT,
+  custom_data BLOB, -- received
   FOREIGN KEY(user_id, local_display_name)
   REFERENCES display_names(user_id, local_display_name)
   ON DELETE CASCADE
@@ -556,7 +558,6 @@ CREATE TABLE IF NOT EXISTS "msg_deliveries"(
   chat_ts TEXT NOT NULL DEFAULT(datetime('now')),
   created_at TEXT CHECK(created_at NOT NULL),
   updated_at TEXT CHECK(updated_at NOT NULL),
-  agent_ack_cmd_id INTEGER, -- broker_ts for received, created_at for sent
   delivery_status TEXT -- MsgDeliveryStatus
 );
 CREATE TABLE note_folders(
@@ -826,10 +827,6 @@ CREATE INDEX idx_contact_requests_updated_at ON contact_requests(
 );
 CREATE INDEX idx_connections_updated_at ON connections(user_id, updated_at);
 CREATE INDEX idx_msg_deliveries_message_id ON "msg_deliveries"(message_id);
-CREATE INDEX idx_msg_deliveries_agent_ack_cmd_id ON "msg_deliveries"(
-  connection_id,
-  agent_ack_cmd_id
-);
 CREATE INDEX idx_msg_deliveries_agent_msg_id ON "msg_deliveries"(
   connection_id,
   agent_msg_id
diff --git a/src/Simplex/Chat/Remote.hs b/src/Simplex/Chat/Remote.hs
index 857198a109..819c1cd670 100644
--- a/src/Simplex/Chat/Remote.hs
+++ b/src/Simplex/Chat/Remote.hs
@@ -50,7 +50,7 @@ import Simplex.Chat.Store.Files
 import Simplex.Chat.Store.Remote
 import Simplex.Chat.Store.Shared
 import Simplex.Chat.Types
-import Simplex.Chat.Util (encryptFile)
+import Simplex.Chat.Util (liftIOEither, encryptFile)
 import Simplex.FileTransfer.Description (FileDigest (..))
 import Simplex.Messaging.Agent
 import Simplex.Messaging.Agent.Protocol (AgentErrorType (RCP))
@@ -95,7 +95,7 @@ discoveryTimeout = 60000000
 
 -- * Desktop side
 
-getRemoteHostClient :: ChatMonad m => RemoteHostId -> m RemoteHostClient
+getRemoteHostClient :: RemoteHostId -> CM RemoteHostClient
 getRemoteHostClient rhId = do
   sessions <- asks remoteHostSessions
   liftIOEither . atomically $
@@ -106,7 +106,7 @@ getRemoteHostClient rhId = do
   where
     rhKey = RHId rhId
 
-withRemoteHostSession :: ChatMonad m => RHKey -> SessionSeq -> (RemoteHostSession -> Either ChatError (a, RemoteHostSession)) -> m a
+withRemoteHostSession :: RHKey -> SessionSeq -> (RemoteHostSession -> Either ChatError (a, RemoteHostSession)) -> CM a
 withRemoteHostSession rhKey sseq f = do
   sessions <- asks remoteHostSessions
   r <-
@@ -121,7 +121,7 @@ withRemoteHostSession rhKey sseq f = do
   liftEither r
 
 -- | Transition session state with a 'RHNew' ID to an assigned 'RemoteHostId'
-setNewRemoteHostId :: ChatMonad m => SessionSeq -> RemoteHostId -> m ()
+setNewRemoteHostId :: SessionSeq -> RemoteHostId -> CM ()
 setNewRemoteHostId sseq rhId = do
   sessions <- asks remoteHostSessions
   liftIOEither . atomically $ do
@@ -136,13 +136,13 @@ setNewRemoteHostId sseq rhId = do
   where
     err = pure . Left . ChatErrorRemoteHost RHNew
 
-startRemoteHost :: ChatMonad m => Maybe (RemoteHostId, Bool) -> Maybe RCCtrlAddress -> Maybe Word16 -> m (NonEmpty RCCtrlAddress, Maybe RemoteHostInfo, RCSignedInvitation)
+startRemoteHost :: Maybe (RemoteHostId, Bool) -> Maybe RCCtrlAddress -> Maybe Word16 -> CM (NonEmpty RCCtrlAddress, Maybe RemoteHostInfo, RCSignedInvitation)
 startRemoteHost rh_ rcAddrPrefs_ port_ = do
   (rhKey, multicast, remoteHost_, pairing) <- case rh_ of
     Just (rhId, multicast) -> do
       rh@RemoteHost {hostPairing} <- withStore $ \db -> getRemoteHost db rhId
       pure (RHId rhId, multicast, Just $ remoteHostInfo rh $ Just RHSStarting, hostPairing) -- get from the database, start multicast if requested
-    Nothing -> withAgent $ \a -> (RHNew,False,Nothing,) <$> rcNewHostPairing a
+    Nothing -> lift . withAgent' $ \a -> (RHNew,False,Nothing,) <$> rcNewHostPairing a
   sseq <- startRemoteHostSession rhKey
   ctrlAppInfo <- mkCtrlAppInfo
   (localAddrs, invitation, rchClient, vars) <- handleConnectError rhKey sseq . withAgent $ \a -> rcConnectHost a pairing (J.toJSON ctrlAppInfo) multicast rcAddrPrefs_ port_
@@ -170,18 +170,18 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
       unless (isAppCompatible appVersion ctrlAppVersionRange) $ throwError $ RHEBadVersion appVersion
       when (encoding == PEKotlin && localEncoding == PESwift) $ throwError $ RHEProtocolError RPEIncompatibleEncoding
       pure hostInfo
-    handleConnectError :: ChatMonad m => RHKey -> SessionSeq -> m a -> m a
+    handleConnectError :: RHKey -> SessionSeq -> CM a -> CM a
     handleConnectError rhKey sessSeq action =
       action `catchChatError` \err -> do
         logError $ "startRemoteHost.rcConnectHost crashed: " <> tshow err
         cancelRemoteHostSession (Just (sessSeq, RHSRConnectionFailed err)) rhKey
         throwError err
-    handleHostError :: ChatMonad m => SessionSeq -> TVar RHKey -> m () -> m ()
+    handleHostError :: SessionSeq -> TVar RHKey -> CM () -> CM ()
     handleHostError sessSeq rhKeyVar action =
       action `catchChatError` \err -> do
         logError $ "startRemoteHost.waitForHostSession crashed: " <> tshow err
         readTVarIO rhKeyVar >>= cancelRemoteHostSession (Just (sessSeq, RHSRCrashed err))
-    waitForHostSession :: ChatMonad m => Maybe RemoteHostInfo -> RHKey -> SessionSeq -> Maybe RCCtrlAddress -> TVar RHKey -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> m ()
+    waitForHostSession :: Maybe RemoteHostInfo -> RHKey -> SessionSeq -> Maybe RCCtrlAddress -> TVar RHKey -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCHostSession, RCHostHello, RCHostPairing)) -> CM ()
     waitForHostSession remoteHost_ rhKey sseq rcAddr_ rhKeyVar vars = do
       (sessId, tls, vars') <- timeoutThrow (ChatErrorRemoteHost rhKey RHETimeout) 60000000 $ takeRCStep vars
       let sessionCode = verificationCode sessId
@@ -203,7 +203,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         toView $ CRNewRemoteHost rhi
       -- set up HTTP transport and remote profile protocol
       disconnected <- toIO $ onDisconnected rhKey' sseq
-      httpClient <- liftEitherError (httpError remoteHostId) $ attachRevHTTP2Client disconnected tls
+      httpClient <- liftError' (httpError remoteHostId) $ attachRevHTTP2Client disconnected tls
       rhClient <- mkRemoteHostClient httpClient sessionKeys sessId storePath hostInfo
       pollAction <- async $ pollEvents remoteHostId rhClient
       withRemoteHostSession rhKey' sseq $ \case
@@ -211,7 +211,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         _ -> Left $ ChatErrorRemoteHost rhKey RHEBadState
       chatWriteVar currentRemoteHost $ Just remoteHostId -- this is required for commands to be passed to remote host
       toView $ CRRemoteHostConnected rhi {sessionState = Just RHSConnected {sessionCode}}
-    upsertRemoteHost :: ChatMonad m => RCHostPairing -> Maybe RemoteHostInfo -> Maybe RCCtrlAddress -> Text -> SessionSeq -> RemoteHostSessionState -> m RemoteHostInfo
+    upsertRemoteHost :: RCHostPairing -> Maybe RemoteHostInfo -> Maybe RCCtrlAddress -> Text -> SessionSeq -> RemoteHostSessionState -> CM RemoteHostInfo
     upsertRemoteHost pairing'@RCHostPairing {knownHost = kh_} rhi_ rcAddr_ hostDeviceName sseq state = do
       KnownHostPairing {hostDhPubKey = hostDhPubKey'} <- maybe (throwError . ChatError $ CEInternalError "KnownHost is known after verification") pure kh_
       case rhi_ of
@@ -223,11 +223,11 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
         Just rhi@RemoteHostInfo {remoteHostId} -> do
           withStore' $ \db -> updateHostPairing db remoteHostId hostDeviceName hostDhPubKey' rcAddr_ port_
           pure (rhi :: RemoteHostInfo) {sessionState = Just state}
-    onDisconnected :: ChatMonad m => RHKey -> SessionSeq -> m ()
+    onDisconnected :: RHKey -> SessionSeq -> CM ()
     onDisconnected rhKey sseq = do
       logDebug $ "HTTP2 client disconnected: " <> tshow (rhKey, sseq)
       cancelRemoteHostSession (Just (sseq, RHSRDisconnected)) rhKey
-    pollEvents :: ChatMonad m => RemoteHostId -> RemoteHostClient -> m ()
+    pollEvents :: RemoteHostId -> RemoteHostClient -> CM ()
     pollEvents rhId rhClient = do
       oq <- asks outputQ
       forever $ do
@@ -236,7 +236,7 @@ startRemoteHost rh_ rcAddrPrefs_ port_ = do
     httpError :: RemoteHostId -> HTTP2ClientError -> ChatError
     httpError rhId = ChatErrorRemoteHost (RHId rhId) . RHEProtocolError . RPEHTTP2 . tshow
 
-startRemoteHostSession :: ChatMonad m => RHKey -> m SessionSeq
+startRemoteHostSession :: RHKey -> CM SessionSeq
 startRemoteHostSession rhKey = do
   sessions <- asks remoteHostSessions
   nextSessionSeq <- asks remoteSessionSeq
@@ -247,12 +247,12 @@ startRemoteHostSession rhKey = do
         sessionSeq <- stateTVar nextSessionSeq $ \s -> (s, s + 1)
         Right sessionSeq <$ TM.insert rhKey (sessionSeq, RHSessionStarting) sessions
 
-closeRemoteHost :: ChatMonad m => RHKey -> m ()
+closeRemoteHost :: RHKey -> CM ()
 closeRemoteHost rhKey = do
   logNote $ "Closing remote host session for " <> tshow rhKey
   cancelRemoteHostSession Nothing rhKey
 
-cancelRemoteHostSession :: ChatMonad m => Maybe (SessionSeq, RemoteHostStopReason) -> RHKey -> m ()
+cancelRemoteHostSession :: Maybe (SessionSeq, RemoteHostStopReason) -> RHKey -> CM ()
 cancelRemoteHostSession handlerInfo_ rhKey = do
   sessions <- asks remoteHostSessions
   crh <- asks currentRemoteHost
@@ -299,7 +299,7 @@ cancelRemoteHost handlingError = \case
 randomStorePath :: IO FilePath
 randomStorePath = B.unpack . B64U.encode <$> getRandomBytes 12
 
-listRemoteHosts :: ChatMonad m => m [RemoteHostInfo]
+listRemoteHosts :: CM [RemoteHostInfo]
 listRemoteHosts = do
   sessions <- chatReadVar remoteHostSessions
   map (rhInfo sessions) <$> withStore' getRemoteHosts
@@ -307,7 +307,7 @@ listRemoteHosts = do
     rhInfo sessions rh@RemoteHost {remoteHostId} =
       remoteHostInfo rh $ rhsSessionState . snd <$> M.lookup (RHId remoteHostId) sessions
 
-switchRemoteHost :: ChatMonad m => Maybe RemoteHostId -> m (Maybe RemoteHostInfo)
+switchRemoteHost :: Maybe RemoteHostId -> CM (Maybe RemoteHostInfo)
 switchRemoteHost rhId_ = do
   rhi_ <- forM rhId_ $ \rhId -> do
     let rhKey = RHId rhId
@@ -322,7 +322,7 @@ remoteHostInfo :: RemoteHost -> Maybe RemoteHostSessionState -> RemoteHostInfo
 remoteHostInfo RemoteHost {remoteHostId, storePath, hostDeviceName, bindAddress_, bindPort_} sessionState =
   RemoteHostInfo {remoteHostId, storePath, hostDeviceName, bindAddress_, bindPort_, sessionState}
 
-deleteRemoteHost :: ChatMonad m => RemoteHostId -> m ()
+deleteRemoteHost :: RemoteHostId -> CM ()
 deleteRemoteHost rhId = do
   RemoteHost {storePath} <- withStore (`getRemoteHost` rhId)
   chatReadVar remoteHostsFolder >>= \case
@@ -333,7 +333,7 @@ deleteRemoteHost rhId = do
     Nothing -> logWarn "Local file store not available while deleting remote host"
   withStore' (`deleteRemoteHostRecord` rhId)
 
-storeRemoteFile :: forall m. ChatMonad m => RemoteHostId -> Maybe Bool -> FilePath -> m CryptoFile
+storeRemoteFile :: RemoteHostId -> Maybe Bool -> FilePath -> CM CryptoFile
 storeRemoteFile rhId encrypted_ localPath = do
   c@RemoteHostClient {encryptHostFiles, storePath} <- getRemoteHostClient rhId
   let encrypt = fromMaybe encryptHostFiles encrypted_
@@ -347,23 +347,23 @@ storeRemoteFile rhId encrypted_ localPath = do
     (if encrypt then renameFile else copyFile) filePath hPath
   pure (cf :: CryptoFile) {filePath = filePath'}
   where
-    encryptLocalFile :: m CryptoFile
+    encryptLocalFile :: CM CryptoFile
     encryptLocalFile = do
-      tmpDir <- getChatTempDirectory
+      tmpDir <- lift getChatTempDirectory
       createDirectoryIfMissing True tmpDir
-      tmpFile <- tmpDir `uniqueCombine` takeFileName localPath
+      tmpFile <- liftIO $ tmpDir `uniqueCombine` takeFileName localPath
       cfArgs <- atomically . CF.randomArgs =<< asks random
       liftError (ChatError . CEFileWrite tmpFile) $ encryptFile localPath tmpFile cfArgs
       pure $ CryptoFile tmpFile $ Just cfArgs
 
-getRemoteFile :: ChatMonad m => RemoteHostId -> RemoteFile -> m ()
+getRemoteFile :: RemoteHostId -> RemoteFile -> CM ()
 getRemoteFile rhId rf = do
   c@RemoteHostClient {storePath} <- getRemoteHostClient rhId
-  dir <- (</> storePath </> archiveFilesFolder) <$> (maybe getDefaultFilesFolder pure =<< chatReadVar remoteHostsFolder)
+  dir <- lift $ (</> storePath </> archiveFilesFolder) <$> (maybe getDefaultFilesFolder pure =<< chatReadVar' remoteHostsFolder)
   createDirectoryIfMissing True dir
   liftRH rhId $ remoteGetFile c dir rf
 
-processRemoteCommand :: ChatMonad m => RemoteHostId -> RemoteHostClient -> ChatCommand -> ByteString -> m ChatResponse
+processRemoteCommand :: RemoteHostId -> RemoteHostClient -> ChatCommand -> ByteString -> CM ChatResponse
 processRemoteCommand remoteHostId c cmd s = case cmd of
   SendFile chatName f -> sendFile "/f" chatName f
   SendImage chatName f -> sendFile "/img" chatName f
@@ -378,7 +378,7 @@ processRemoteCommand remoteHostId c cmd s = case cmd of
       maybe "" (\(CFArgs key nonce) -> "key=" <> strEncode key <> " nonce=" <> strEncode nonce <> " ") cryptoArgs
         <> encodeUtf8 (T.pack filePath)
 
-liftRH :: ChatMonad m => RemoteHostId -> ExceptT RemoteProtocolError IO a -> m a
+liftRH :: RemoteHostId -> ExceptT RemoteProtocolError IO a -> CM a
 liftRH rhId = liftError (ChatErrorRemoteHost (RHId rhId) . RHEProtocolError)
 
 -- * Mobile side
@@ -386,7 +386,7 @@ liftRH rhId = liftError (ChatErrorRemoteHost (RHId rhId) . RHEProtocolError)
 -- ** QR/link
 
 -- | Use provided OOB link as an annouce
-connectRemoteCtrlURI :: ChatMonad m => RCSignedInvitation -> m (Maybe RemoteCtrlInfo, CtrlAppInfo)
+connectRemoteCtrlURI :: RCSignedInvitation -> CM (Maybe RemoteCtrlInfo, CtrlAppInfo)
 connectRemoteCtrlURI signedInv = do
   verifiedInv <- maybe (throwError $ ChatErrorRemoteCtrl RCEBadInvitation) pure $ verifySignedInvitation signedInv
   sseq <- startRemoteCtrlSession
@@ -394,7 +394,7 @@ connectRemoteCtrlURI signedInv = do
 
 -- ** Multicast
 
-findKnownRemoteCtrl :: ChatMonad m => m ()
+findKnownRemoteCtrl :: CM ()
 findKnownRemoteCtrl = do
   knownCtrls <- withStore' getRemoteCtrls
   pairings <- case nonEmpty knownCtrls of
@@ -420,7 +420,7 @@ findKnownRemoteCtrl = do
     _ -> Left $ ChatErrorRemoteCtrl RCEBadState
   atomically $ putTMVar cmdOk ()
 
-confirmRemoteCtrl :: ChatMonad m => RemoteCtrlId -> m (RemoteCtrlInfo, CtrlAppInfo)
+confirmRemoteCtrl :: RemoteCtrlId -> CM (RemoteCtrlInfo, CtrlAppInfo)
 confirmRemoteCtrl rcId = do
   session <- asks remoteCtrlSession
   (sseq, listener, found) <- liftIOEither $ atomically $ do
@@ -438,7 +438,7 @@ confirmRemoteCtrl rcId = do
 
 -- ** Common
 
-startRemoteCtrlSession :: ChatMonad m => m SessionSeq
+startRemoteCtrlSession :: CM SessionSeq
 startRemoteCtrlSession = do
   session <- asks remoteCtrlSession
   nextSessionSeq <- asks remoteSessionSeq
@@ -449,7 +449,7 @@ startRemoteCtrlSession = do
         sseq <- stateTVar nextSessionSeq $ \s -> (s, s + 1)
         Right sseq <$ writeTVar session (Just (sseq, RCSessionStarting))
 
-connectRemoteCtrl :: ChatMonad m => RCVerifiedInvitation -> SessionSeq -> m (Maybe RemoteCtrlInfo, CtrlAppInfo)
+connectRemoteCtrl :: RCVerifiedInvitation -> SessionSeq -> CM (Maybe RemoteCtrlInfo, CtrlAppInfo)
 connectRemoteCtrl verifiedInv@(RCVerifiedInvitation inv@RCInvitation {ca, app}) sseq = handleCtrlError sseq RCSRConnectionFailed "connectRemoteCtrl" $ do
   ctrlInfo@CtrlAppInfo {deviceName = ctrlDeviceName} <- parseCtrlAppInfo app
   v <- checkAppVersion ctrlInfo
@@ -470,7 +470,7 @@ connectRemoteCtrl verifiedInv@(RCVerifiedInvitation inv@RCInvitation {ca, app})
   where
     validateRemoteCtrl RCInvitation {idkey} RemoteCtrl {ctrlPairing = RCCtrlPairing {idPubKey}} =
       unless (idkey == idPubKey) $ throwError $ ChatErrorRemoteCtrl $ RCEProtocolError $ PRERemoteControl RCEIdentity
-    waitForCtrlSession :: ChatMonad m => Maybe RemoteCtrl -> Text -> RCCtrlClient -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCCtrlSession, RCCtrlPairing)) -> m ()
+    waitForCtrlSession :: Maybe RemoteCtrl -> Text -> RCCtrlClient -> RCStepTMVar (ByteString, TLS, RCStepTMVar (RCCtrlSession, RCCtrlPairing)) -> CM ()
     waitForCtrlSession rc_ ctrlName rcsClient vars = do
       (uniq, tls, rcsWaitConfirmation) <- timeoutThrow (ChatErrorRemoteCtrl RCETimeout) networkIOTimeout $ takeRCStep vars
       let sessionCode = verificationCode uniq
@@ -489,18 +489,18 @@ connectRemoteCtrl verifiedInv@(RCVerifiedInvitation inv@RCInvitation {ca, app})
       encryptFiles <- chatReadVar encryptLocalFiles
       pure HostAppInfo {appVersion, deviceName = hostDeviceName, encoding = localEncoding, encryptFiles}
 
-parseCtrlAppInfo :: ChatMonad m => JT.Value -> m CtrlAppInfo
+parseCtrlAppInfo :: JT.Value -> CM CtrlAppInfo
 parseCtrlAppInfo ctrlAppInfo = do
   liftEitherWith (const $ ChatErrorRemoteCtrl RCEBadInvitation) $ JT.parseEither J.parseJSON ctrlAppInfo
 
-handleRemoteCommand :: forall m. ChatMonad m => (ByteString -> m ChatResponse) -> RemoteCrypto -> TBQueue ChatResponse -> HTTP2Request -> m ()
+handleRemoteCommand :: (ByteString -> CM' ChatResponse) -> RemoteCrypto -> TBQueue ChatResponse -> HTTP2Request -> CM' ()
 handleRemoteCommand execChatCommand encryption remoteOutputQ HTTP2Request {request, reqBody, sendResponse} = do
   logDebug "handleRemoteCommand"
-  liftRC (tryRemoteError parseRequest) >>= \case
+  liftIO (tryRemoteError' parseRequest) >>= \case
     Right (getNext, rc) -> do
-      chatReadVar currentUser >>= \case
+      chatReadVar' currentUser >>= \case
         Nothing -> replyError $ ChatError CENoActiveUser
-        Just user -> processCommand user getNext rc `catchChatError` replyError
+        Just user -> processCommand user getNext rc `catchChatError'` replyError
     Left e -> reply $ RRProtocolError e
   where
     parseRequest :: ExceptT RemoteProtocolError IO (GetChunk, RemoteCommand)
@@ -508,67 +508,72 @@ handleRemoteCommand execChatCommand encryption remoteOutputQ HTTP2Request {reque
       (header, getNext) <- parseDecryptHTTP2Body encryption request reqBody
       (getNext,) <$> liftEitherWith RPEInvalidJSON (J.eitherDecode header)
     replyError = reply . RRChatResponse . CRChatCmdError Nothing
-    processCommand :: User -> GetChunk -> RemoteCommand -> m ()
+    processCommand :: User -> GetChunk -> RemoteCommand -> CM ()
     processCommand user getNext = \case
-      RCSend {command} -> handleSend execChatCommand command >>= reply
-      RCRecv {wait = time} -> handleRecv time remoteOutputQ >>= reply
-      RCStoreFile {fileName, fileSize, fileDigest} -> handleStoreFile encryption fileName fileSize fileDigest getNext >>= reply
+      RCSend {command} -> lift $ handleSend execChatCommand command >>= reply
+      RCRecv {wait = time} -> lift $ liftIO (handleRecv time remoteOutputQ) >>= reply
+      RCStoreFile {fileName, fileSize, fileDigest} -> lift $ handleStoreFile encryption fileName fileSize fileDigest getNext >>= reply
       RCGetFile {file} -> handleGetFile encryption user file replyWith
-    reply :: RemoteResponse -> m ()
+    reply :: RemoteResponse -> CM' ()
     reply = (`replyWith` \_ -> pure ())
-    replyWith :: Respond m
-    replyWith rr attach = do
-      resp <- liftRC $ encryptEncodeHTTP2Body encryption $ J.encode rr
-      liftIO . sendResponse . responseStreaming N.status200 [] $ \send flush -> do
-        send resp
-        attach send
-        flush
+    replyWith :: Respond
+    replyWith rr attach =
+      liftIO (tryRemoteError' . encryptEncodeHTTP2Body encryption $ J.encode rr) >>= \case
+        Right resp -> liftIO . sendResponse . responseStreaming N.status200 [] $ \send flush -> do
+          send resp
+          attach send
+          flush
+        Left e -> toView' . CRChatError Nothing . ChatErrorRemoteCtrl $ RCEProtocolError e
 
-takeRCStep :: ChatMonad m => RCStepTMVar a -> m a
-takeRCStep = liftEitherError (\e -> ChatErrorAgent {agentError = RCP e, connectionEntity_ = Nothing}) . atomically . takeTMVar
+takeRCStep :: RCStepTMVar a -> CM a
+takeRCStep = liftError' (\e -> ChatErrorAgent {agentError = RCP e, connectionEntity_ = Nothing}) . atomically . takeTMVar
 
 type GetChunk = Int -> IO ByteString
 
 type SendChunk = Builder -> IO ()
 
-type Respond m = RemoteResponse -> (SendChunk -> IO ()) -> m ()
+type Respond = RemoteResponse -> (SendChunk -> IO ()) -> CM' ()
 
-liftRC :: ChatMonad m => ExceptT RemoteProtocolError IO a -> m a
+liftRC :: ExceptT RemoteProtocolError IO a -> CM a
 liftRC = liftError (ChatErrorRemoteCtrl . RCEProtocolError)
 
 tryRemoteError :: ExceptT RemoteProtocolError IO a -> ExceptT RemoteProtocolError IO (Either RemoteProtocolError a)
 tryRemoteError = tryAllErrors (RPEException . tshow)
 {-# INLINE tryRemoteError #-}
 
-handleSend :: ChatMonad m => (ByteString -> m ChatResponse) -> Text -> m RemoteResponse
+tryRemoteError' :: ExceptT RemoteProtocolError IO a -> IO (Either RemoteProtocolError a)
+tryRemoteError' = tryAllErrors' (RPEException . tshow)
+{-# INLINE tryRemoteError' #-}
+
+handleSend :: (ByteString -> CM' ChatResponse) -> Text -> CM' RemoteResponse
 handleSend execChatCommand command = do
   logDebug $ "Send: " <> tshow command
   -- execChatCommand checks for remote-allowed commands
-  -- convert errors thrown in ChatMonad into error responses to prevent aborting the protocol wrapper
-  RRChatResponse <$> execChatCommand (encodeUtf8 command) `catchError` (pure . CRChatError Nothing)
+  -- convert errors thrown in execChatCommand into error responses to prevent aborting the protocol wrapper
+  RRChatResponse <$> execChatCommand (encodeUtf8 command)
 
-handleRecv :: MonadUnliftIO m => Int -> TBQueue ChatResponse -> m RemoteResponse
+handleRecv :: Int -> TBQueue ChatResponse -> IO RemoteResponse
 handleRecv time events = do
   logDebug $ "Recv: " <> tshow time
   RRChatEvent <$> (timeout time . atomically $ readTBQueue events)
 
 -- TODO this command could remember stored files and return IDs to allow removing files that are not needed.
 -- Also, there should be some process removing unused files uploaded to remote host (possibly, all unused files).
-handleStoreFile :: forall m. ChatMonad m => RemoteCrypto -> FilePath -> Word32 -> FileDigest -> GetChunk -> m RemoteResponse
+handleStoreFile :: RemoteCrypto -> FilePath -> Word32 -> FileDigest -> GetChunk -> CM' RemoteResponse
 handleStoreFile encryption fileName fileSize fileDigest getChunk =
-  either RRProtocolError RRFileStored <$> (chatReadVar filesFolder >>= storeFile)
+  either RRProtocolError RRFileStored <$> (chatReadVar' filesFolder >>= storeFile)
   where
-    storeFile :: Maybe FilePath -> m (Either RemoteProtocolError FilePath)
+    storeFile :: Maybe FilePath -> CM' (Either RemoteProtocolError FilePath)
     storeFile = \case
       Just ff -> takeFileName <$$> storeFileTo ff
       Nothing -> storeFileTo =<< getDefaultFilesFolder
-    storeFileTo :: FilePath -> m (Either RemoteProtocolError FilePath)
-    storeFileTo dir = liftRC . tryRemoteError $ do
-      filePath <- dir `uniqueCombine` fileName
+    storeFileTo :: FilePath -> CM' (Either RemoteProtocolError FilePath)
+    storeFileTo dir = liftIO . tryRemoteError' $ do
+      filePath <- liftIO $ dir `uniqueCombine` fileName
       receiveEncryptedFile encryption getChunk fileSize fileDigest filePath
       pure filePath
 
-handleGetFile :: ChatMonad m => RemoteCrypto -> User -> RemoteFile -> Respond m -> m ()
+handleGetFile :: RemoteCrypto -> User -> RemoteFile -> Respond -> CM ()
 handleGetFile encryption User {userId} RemoteFile {userId = commandUserId, fileId, sent, fileSource = cf'@CryptoFile {filePath}} reply = do
   logDebug $ "GetFile: " <> tshow filePath
   unless (userId == commandUserId) $ throwChatError $ CEDifferentActiveUser {commandUserId, activeUserId = userId}
@@ -577,13 +582,13 @@ handleGetFile encryption User {userId} RemoteFile {userId = commandUserId, fileI
     cf <- getLocalCryptoFile db commandUserId fileId sent
     unless (cf == cf') $ throwError $ SEFileNotFound fileId
   liftRC (tryRemoteError $ getFileInfo path) >>= \case
-    Left e -> reply (RRProtocolError e) $ \_ -> pure ()
+    Left e -> lift $ reply (RRProtocolError e) $ \_ -> pure ()
     Right (fileSize, fileDigest) ->
-      withFile path ReadMode $ \h -> do
+      ExceptT . withFile path ReadMode $ \h -> runExceptT $ do
         encFile <- liftRC $ prepareEncryptedFile encryption (h, fileSize)
-        reply RRFile {fileSize, fileDigest} $ sendEncryptedFile encFile
+        lift $ reply RRFile {fileSize, fileDigest} $ sendEncryptedFile encFile
 
-listRemoteCtrls :: ChatMonad m => m [RemoteCtrlInfo]
+listRemoteCtrls :: CM [RemoteCtrlInfo]
 listRemoteCtrls = do
   session <- snd <$$> chatReadVar remoteCtrlSession
   let rcId = sessionRcId =<< session
@@ -604,7 +609,7 @@ remoteCtrlInfo RemoteCtrl {remoteCtrlId, ctrlDeviceName} sessionState =
   RemoteCtrlInfo {remoteCtrlId, ctrlDeviceName, sessionState}
 
 -- | Take a look at emoji of tlsunique, commit pairing, and start session server
-verifyRemoteCtrlSession :: ChatMonad m => (ByteString -> m ChatResponse) -> Text -> m RemoteCtrlInfo
+verifyRemoteCtrlSession :: (ByteString -> CM' ChatResponse) -> Text -> CM RemoteCtrlInfo
 verifyRemoteCtrlSession execChatCommand sessCode' = do
   (sseq, client, ctrlName, sessionCode, vars) <-
     chatReadVar remoteCtrlSession >>= \case
@@ -619,14 +624,15 @@ verifyRemoteCtrlSession execChatCommand sessCode' = do
     rc@RemoteCtrl {remoteCtrlId} <- upsertRemoteCtrl ctrlName rcCtrlPairing
     remoteOutputQ <- asks (tbqSize . config) >>= newTBQueueIO
     encryption <- mkCtrlRemoteCrypto sessionKeys $ tlsUniq tls
-    http2Server <- async $ attachHTTP2Server tls $ handleRemoteCommand execChatCommand encryption remoteOutputQ
+    cc <- ask
+    http2Server <- liftIO . async $ attachHTTP2Server tls $ \req -> handleRemoteCommand execChatCommand encryption remoteOutputQ req `runReaderT` cc
     void . forkIO $ monitor sseq http2Server
     updateRemoteCtrlSession sseq $ \case
       RCSessionPendingConfirmation {} -> Right RCSessionConnected {remoteCtrlId, rcsClient = client, rcsSession, tls, http2Server, remoteOutputQ}
       _ -> Left $ ChatErrorRemoteCtrl RCEBadState
     pure $ remoteCtrlInfo rc $ Just RCSConnected {sessionCode = tlsSessionCode tls}
   where
-    upsertRemoteCtrl :: ChatMonad m => Text -> RCCtrlPairing -> m RemoteCtrl
+    upsertRemoteCtrl :: Text -> RCCtrlPairing -> CM RemoteCtrl
     upsertRemoteCtrl ctrlName rcCtrlPairing = withStore $ \db -> do
       rc_ <- liftIO $ getRemoteCtrlByFingerprint db (ctrlFingerprint rcCtrlPairing)
       case rc_ of
@@ -635,16 +641,16 @@ verifyRemoteCtrlSession execChatCommand sessCode' = do
           let dhPrivKey' = dhPrivKey rcCtrlPairing
           liftIO $ updateRemoteCtrl db rc ctrlName dhPrivKey'
           pure rc {ctrlDeviceName = ctrlName, ctrlPairing = ctrlPairing {dhPrivKey = dhPrivKey'}}
-    monitor :: ChatMonad m => SessionSeq -> Async () -> m ()
+    monitor :: SessionSeq -> Async () -> CM ()
     monitor sseq server = do
       res <- waitCatch server
       logInfo $ "HTTP2 server stopped: " <> tshow res
       cancelActiveRemoteCtrl $ Just (sseq, RCSRDisconnected)
 
-stopRemoteCtrl :: ChatMonad m => m ()
+stopRemoteCtrl :: CM ()
 stopRemoteCtrl = cancelActiveRemoteCtrl Nothing
 
-handleCtrlError :: ChatMonad m => SessionSeq -> (ChatError -> RemoteCtrlStopReason) -> Text -> m a -> m a
+handleCtrlError :: SessionSeq -> (ChatError -> RemoteCtrlStopReason) -> Text -> CM a -> CM a
 handleCtrlError sseq mkReason name action =
   action `catchChatError` \e -> do
     logError $ name <> " remote ctrl error: " <> tshow e
@@ -652,7 +658,7 @@ handleCtrlError sseq mkReason name action =
     throwError e
 
 -- | Stop session controller, unless session update key is present but stale
-cancelActiveRemoteCtrl :: ChatMonad m => Maybe (SessionSeq, RemoteCtrlStopReason) -> m ()
+cancelActiveRemoteCtrl :: Maybe (SessionSeq, RemoteCtrlStopReason) -> CM ()
 cancelActiveRemoteCtrl handlerInfo_ = handleAny (logError . tshow) $ do
   var <- asks remoteCtrlSession
   session_ <-
@@ -685,18 +691,18 @@ cancelRemoteCtrl handlingError = \case
     cancelCtrlClient rcsClient
     closeConnection tls
 
-deleteRemoteCtrl :: ChatMonad m => RemoteCtrlId -> m ()
+deleteRemoteCtrl :: RemoteCtrlId -> CM ()
 deleteRemoteCtrl rcId = do
   checkNoRemoteCtrlSession
   -- TODO check it exists
   withStore' (`deleteRemoteCtrlRecord` rcId)
 
-checkNoRemoteCtrlSession :: ChatMonad m => m ()
+checkNoRemoteCtrlSession :: CM ()
 checkNoRemoteCtrlSession =
   chatReadVar remoteCtrlSession >>= maybe (pure ()) (\_ -> throwError $ ChatErrorRemoteCtrl RCEBusy)
 
 -- | Transition controller to a new state, unless session update key is stale
-updateRemoteCtrlSession :: ChatMonad m => SessionSeq -> (RemoteCtrlSession -> Either ChatError RemoteCtrlSession) -> m ()
+updateRemoteCtrlSession :: SessionSeq -> (RemoteCtrlSession -> Either ChatError RemoteCtrlSession) -> CM ()
 updateRemoteCtrlSession sseq state = do
   session <- asks remoteCtrlSession
   r <- atomically $ do
diff --git a/src/Simplex/Chat/Remote/Protocol.hs b/src/Simplex/Chat/Remote/Protocol.hs
index 7b3d70ff97..fe07a940ae 100644
--- a/src/Simplex/Chat/Remote/Protocol.hs
+++ b/src/Simplex/Chat/Remote/Protocol.hs
@@ -46,7 +46,7 @@ import Simplex.Messaging.Parsers (dropPrefix, taggedObjectJSON, pattern SingleFi
 import Simplex.Messaging.Transport.Buffer (getBuffered)
 import Simplex.Messaging.Transport.HTTP2 (HTTP2Body (..), HTTP2BodyChunk, getBodyChunk)
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client, HTTP2Response (..), closeHTTP2Client, sendRequestDirect)
-import Simplex.Messaging.Util (liftEitherError, liftEitherWith, liftError, tshow)
+import Simplex.Messaging.Util (liftError', liftEitherWith, liftError, tshow)
 import Simplex.RemoteControl.Client (xrcpBlockSize)
 import qualified Simplex.RemoteControl.Client as RC
 import Simplex.RemoteControl.Types (CtrlSessKeys (..), HostSessKeys (..), RCErrorType (..), SessionCode)
@@ -75,7 +75,7 @@ $(deriveJSON (taggedObjectJSON $ dropPrefix "RR") ''RemoteResponse)
 
 -- * Client side / desktop
 
-mkRemoteHostClient :: ChatMonad m => HTTP2Client -> HostSessKeys -> SessionCode -> FilePath -> HostAppInfo -> m RemoteHostClient
+mkRemoteHostClient :: HTTP2Client -> HostSessKeys -> SessionCode -> FilePath -> HostAppInfo -> CM RemoteHostClient
 mkRemoteHostClient httpClient sessionKeys sessionCode storePath HostAppInfo {encoding, deviceName, encryptFiles} = do
   drg <- asks random
   counter <- newTVarIO 1
@@ -92,15 +92,15 @@ mkRemoteHostClient httpClient sessionKeys sessionCode storePath HostAppInfo {enc
         storePath
       }
 
-mkCtrlRemoteCrypto :: ChatMonad m => CtrlSessKeys -> SessionCode -> m RemoteCrypto
+mkCtrlRemoteCrypto :: CtrlSessKeys -> SessionCode -> CM RemoteCrypto
 mkCtrlRemoteCrypto CtrlSessKeys {hybridKey, idPubKey, sessPubKey} sessionCode = do
   drg <- asks random
   counter <- newTVarIO 1
   let signatures = RSVerify {idPubKey, sessPubKey}
   pure RemoteCrypto {drg, counter, sessionCode, hybridKey, signatures}
 
-closeRemoteHostClient :: MonadIO m => RemoteHostClient -> m ()
-closeRemoteHostClient RemoteHostClient {httpClient} = liftIO $ closeHTTP2Client httpClient
+closeRemoteHostClient :: RemoteHostClient -> IO ()
+closeRemoteHostClient RemoteHostClient {httpClient} = closeHTTP2Client httpClient
 
 -- ** Commands
 
@@ -141,7 +141,7 @@ sendRemoteCommand :: RemoteHostClient -> Maybe (Handle, Word32) -> RemoteCommand
 sendRemoteCommand RemoteHostClient {httpClient, hostEncoding, encryption} file_ cmd = do
   encFile_ <- mapM (prepareEncryptedFile encryption) file_
   req <- httpRequest encFile_ <$> encryptEncodeHTTP2Body encryption (J.encode cmd)
-  HTTP2Response {response, respBody} <- liftEitherError (RPEHTTP2 . tshow) $ sendRequestDirect httpClient req Nothing
+  HTTP2Response {response, respBody} <- liftError' (RPEHTTP2 . tshow) $ sendRequestDirect httpClient req Nothing
   (header, getNext) <- parseDecryptHTTP2Body encryption response respBody
   rr <- liftEitherWith (RPEInvalidJSON . fromString) $ J.eitherDecode header >>= JT.parseEither J.parseJSON . convertJSON hostEncoding localEncoding
   pure (getNext, rr)
@@ -271,7 +271,7 @@ parseDecryptHTTP2Body RemoteCrypto {hybridKey, sessionCode, signatures} hr HTTP2
       where
         getSig = do
           len <- liftIO $ B.head <$> getNext 1
-          liftEitherError RPEInvalidBody $ C.decodeSignature <$> getNext (fromIntegral len)
+          liftError' RPEInvalidBody $ C.decodeSignature <$> getNext (fromIntegral len)
         verifySig key sig hc' = do
           let signed = BA.convert $ CH.hashFinalize hc'
           unless (C.verify' key sig signed) $ throwError $ PRERemoteControl RCECtrlAuth
diff --git a/src/Simplex/Chat/Remote/RevHTTP.hs b/src/Simplex/Chat/Remote/RevHTTP.hs
index a37d77e20a..44f3e50b0d 100644
--- a/src/Simplex/Chat/Remote/RevHTTP.hs
+++ b/src/Simplex/Chat/Remote/RevHTTP.hs
@@ -13,19 +13,17 @@ import Simplex.Messaging.Transport.HTTP2 (defaultHTTP2BufferSize, getHTTP2Body)
 import Simplex.Messaging.Transport.HTTP2.Client (HTTP2Client, HTTP2ClientError (..), attachHTTP2Client, bodyHeadSize, connTimeout, defaultHTTP2ClientConfig)
 import Simplex.Messaging.Transport.HTTP2.Server (HTTP2Request (..), runHTTP2ServerWith)
 import Simplex.RemoteControl.Discovery
-import UnliftIO
 
 attachRevHTTP2Client :: IO () -> TLS -> IO (Either HTTP2ClientError HTTP2Client)
 attachRevHTTP2Client disconnected = attachHTTP2Client config ANY_ADDR_V4 "0" disconnected defaultHTTP2BufferSize
   where
     config = defaultHTTP2ClientConfig {bodyHeadSize = doNotPrefetchHead, connTimeout = maxBound}
 
-attachHTTP2Server :: MonadUnliftIO m => TLS -> (HTTP2Request -> m ()) -> m ()
-attachHTTP2Server tls processRequest = do
-  withRunInIO $ \unlift ->
-    runHTTP2ServerWith defaultHTTP2BufferSize ($ tls) $ \sessionId r sendResponse -> do
-      reqBody <- getHTTP2Body r doNotPrefetchHead
-      unlift $ processRequest HTTP2Request {sessionId, request = r, reqBody, sendResponse}
+attachHTTP2Server :: TLS -> (HTTP2Request -> IO ()) -> IO ()
+attachHTTP2Server tls processRequest =
+  runHTTP2ServerWith defaultHTTP2BufferSize ($ tls) $ \sessionId r sendResponse -> do
+    reqBody <- getHTTP2Body r doNotPrefetchHead
+    processRequest HTTP2Request {sessionId, request = r, reqBody, sendResponse}
 
 -- | Suppress storing initial chunk in bodyHead, forcing clients and servers to stream chunks
 doNotPrefetchHead :: Int
diff --git a/src/Simplex/Chat/Remote/Transport.hs b/src/Simplex/Chat/Remote/Transport.hs
index 1c9c3f08eb..774aeccda2 100644
--- a/src/Simplex/Chat/Remote/Transport.hs
+++ b/src/Simplex/Chat/Remote/Transport.hs
@@ -15,7 +15,7 @@ import Simplex.FileTransfer.Transport (ReceiveFileError (..), receiveSbFile, sen
 import qualified Simplex.Messaging.Crypto as C
 import qualified Simplex.Messaging.Crypto.Lazy as LC
 import Simplex.Messaging.Encoding
-import Simplex.Messaging.Util (liftEitherError, liftEitherWith)
+import Simplex.Messaging.Util (liftError', liftEitherWith)
 import Simplex.RemoteControl.Types (RCErrorType (..))
 import UnliftIO
 import UnliftIO.Directory (getFileSize)
@@ -37,11 +37,11 @@ receiveEncryptedFile :: RemoteCrypto -> (Int -> IO ByteString) -> Word32 -> File
 receiveEncryptedFile RemoteCrypto {hybridKey} getChunk fileSize fileDigest toPath = do
   c <- liftIO $ getChunk 1
   unless (c == "\x01") $ throwError RPENoFile
-  nonce <- liftEitherError RPEInvalidBody $ smpDecode <$> getChunk 24
-  size <- liftEitherError RPEInvalidBody $ smpDecode <$> getChunk 4
+  nonce <- liftError' RPEInvalidBody $ smpDecode <$> getChunk 24
+  size <- liftError' RPEInvalidBody $ smpDecode <$> getChunk 4
   unless (size == fileSize + fromIntegral C.authTagSize) $ throwError RPEFileSize
   sbState <- liftEitherWith (const $ PRERemoteControl RCEDecrypt) $ LC.kcbInit hybridKey nonce
-  liftEitherError fErr $ withFile toPath WriteMode $ \h -> receiveSbFile getChunk h sbState fileSize
+  liftError' fErr $ withFile toPath WriteMode $ \h -> receiveSbFile getChunk h sbState fileSize
   digest <- liftIO $ LC.sha512Hash <$> LB.readFile toPath
   unless (FileDigest digest == fileDigest) $ throwError RPEFileDigest
   where
diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs
index f8e9fa3401..6584aabb0a 100644
--- a/src/Simplex/Chat/Store/Connections.hs
+++ b/src/Simplex/Chat/Store/Connections.hs
@@ -75,19 +75,19 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
           [sql|
             SELECT
               c.contact_profile_id, c.local_display_name, p.display_name, p.full_name, p.image, p.contact_link, p.local_alias, c.via_group, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
-              p.preferences, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.contact_group_member_id, c.contact_grp_inv_sent
+              p.preferences, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.contact_group_member_id, c.contact_grp_inv_sent, c.custom_data
             FROM contacts c
             JOIN contact_profiles p ON c.contact_profile_id = p.contact_profile_id
             WHERE c.user_id = ? AND c.contact_id = ? AND c.deleted = 0
           |]
           (userId, contactId)
-    toContact' :: Int64 -> Connection -> [(ProfileId, ContactName, Text, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Int64, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool)] -> Either StoreError Contact
-    toContact' contactId conn [(profileId, localDisplayName, displayName, fullName, image, contactLink, localAlias, viaGroup, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)] =
+    toContact' :: Int64 -> Connection -> [(ProfileId, ContactName, Text, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Int64, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool, Maybe CustomData)] -> Either StoreError Contact
+    toContact' contactId conn [(profileId, localDisplayName, displayName, fullName, image, contactLink, localAlias, viaGroup, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, customData)] =
       let profile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
           chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
           mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
           activeConn = Just conn
-       in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent}
+       in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, customData}
     toContact' _ _ _ = Left $ SEInternalError "referenced contact not found"
     getGroupAndMember_ :: Int64 -> Connection -> ExceptT StoreError IO (GroupInfo, GroupMember)
     getGroupAndMember_ groupMemberId c = ExceptT $ do
@@ -99,7 +99,7 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
               -- GroupInfo
               g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image,
               g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-              g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
+              g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.custom_data,
               -- GroupInfo {membership}
               mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
               mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index 47174a59a6..ba2586b0ca 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -68,6 +68,7 @@ module Simplex.Chat.Store.Direct
     updateContactSettings,
     setConnConnReqInv,
     resetContactConnInitiated,
+    setContactCustomData,
   )
 where
 
@@ -175,7 +176,7 @@ getContactByConnReqHash db vr user@User {userId} cReqHash =
         SELECT
           -- Contact
           ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
-          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent,
+          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.custom_data,
           -- Connection
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
           c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter,
@@ -221,7 +222,7 @@ createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p
   let profile = toLocalProfile profileId p localAlias
       userPreferences = emptyChatPrefs
       mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
-  pure $ Contact {contactId, localDisplayName, profile, activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+  pure $ Contact {contactId, localDisplayName, profile, activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False, customData = Nothing}
 
 deleteContactConnectionsAndFiles :: DB.Connection -> UserId -> Contact -> IO ()
 deleteContactConnectionsAndFiles db userId Contact {contactId} = do
@@ -578,7 +579,7 @@ createOrUpdateContactRequest db vr user@User {userId} userContactLinkId invId (V
             SELECT
               -- Contact
               ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
-              cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent,
+              cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.custom_data,
               -- Connection
               c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
               c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter,
@@ -724,7 +725,7 @@ createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}
   contactId <- insertedRowId db
   conn <- createConnection_ db userId ConnContact (Just contactId) agentConnId connChatVersion cReqChatVRange Nothing (Just userContactLinkId) customUserProfileId 0 createdAt subMode pqSup
   let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
-  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn = Just conn, viaGroup = Nothing, contactUsed, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False, customData = Nothing}
 
 getContactIdByName :: DB.Connection -> User -> ContactName -> ExceptT StoreError IO Int64
 getContactIdByName db User {userId} cName =
@@ -743,7 +744,7 @@ getContact_ db vr user@User {userId} contactId deleted =
         SELECT
           -- Contact
           ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
-          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent,
+          cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.custom_data,
           -- Connection
           c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.custom_user_profile_id, c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias,
           c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at, c.security_code, c.security_code_verified_at, c.pq_support, c.pq_encryption, c.pq_snd_enabled, c.pq_rcv_enabled, c.auth_err_counter,
@@ -883,3 +884,8 @@ resetContactConnInitiated db User {userId} Connection {connId} = do
       WHERE user_id = ? AND connection_id = ?
     |]
     (updatedAt, userId, connId)
+
+setContactCustomData :: DB.Connection -> User -> Contact -> Maybe CustomData -> IO ()
+setContactCustomData db User {userId} Contact {contactId} customData = do
+  updatedAt <- getCurrentTime
+  DB.execute db "UPDATE contacts SET custom_data = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?" (customData, updatedAt, userId, contactId)
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index 254b8dab59..832b928012 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -116,6 +116,7 @@ module Simplex.Chat.Store.Groups
     createNewUnknownGroupMember,
     updateUnknownMemberAnnounced,
     updateUserMemberProfileSentAt,
+    setGroupCustomData,
   )
 where
 
@@ -148,19 +149,19 @@ import Simplex.Messaging.Util (eitherToMaybe, ($>>=), (<$$>))
 import Simplex.Messaging.Version
 import UnliftIO.STM
 
-type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Maybe ImageData, Maybe ProfileId, Maybe MsgFilter, Maybe Bool, Bool, Maybe GroupPreferences) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime) :. GroupMemberRow
+type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Maybe ImageData, Maybe ProfileId, Maybe MsgFilter, Maybe Bool, Bool, Maybe GroupPreferences) :. (UTCTime, UTCTime, Maybe UTCTime, Maybe UTCTime, Maybe CustomData) :. GroupMemberRow
 
 type GroupMemberRow = ((Int64, Int64, MemberId, VersionChat, VersionChat, GroupMemberRole, GroupMemberCategory, GroupMemberStatus, Bool, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, ContactName, Maybe ContactId, ProfileId, ProfileId, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Preferences))
 
 type MaybeGroupMemberRow = ((Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe Bool, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId, Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe ImageData, Maybe ConnReqContact, Maybe LocalAlias, Maybe Preferences))
 
 toGroupInfo :: (PQSupport -> VersionRangeChat) -> Int64 -> GroupInfoRow -> GroupInfo
-toGroupInfo vr userContactId ((groupId, localDisplayName, displayName, fullName, description, image, hostConnCustomUserProfileId, enableNtfs_, sendRcpts, favorite, groupPreferences) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. userMemberRow) =
+toGroupInfo vr userContactId ((groupId, localDisplayName, displayName, fullName, description, image, hostConnCustomUserProfileId, enableNtfs_, sendRcpts, favorite, groupPreferences) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt, customData) :. userMemberRow) =
   let membership = (toGroupMember userContactId userMemberRow) {memberChatVRange = vr PQSupportOff}
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
       fullGroupPreferences = mergeGroupPreferences groupPreferences
       groupProfile = GroupProfile {displayName, fullName, description, image, groupPreferences}
-   in GroupInfo {groupId, localDisplayName, groupProfile, fullGroupPreferences, membership, hostConnCustomUserProfileId, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt}
+   in GroupInfo {groupId, localDisplayName, groupProfile, fullGroupPreferences, membership, hostConnCustomUserProfileId, chatSettings, createdAt, updatedAt, chatTs, userMemberProfileSentAt, customData}
 
 toGroupMember :: Int64 -> GroupMemberRow -> GroupMember
 toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberRestriction_) :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId, profileId, displayName, fullName, image, contactLink, localAlias, preferences)) =
@@ -271,7 +272,7 @@ getGroupAndMember db User {userId, userContactId} groupMemberId vr =
           -- GroupInfo
           g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image,
           g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
+          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.custom_data,
           -- GroupInfo {membership}
           mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
           mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
@@ -344,7 +345,8 @@ createNewGroup db vr gVar user@User {userId} groupProfile incognitoProfile = Exc
           createdAt = currentTs,
           updatedAt = currentTs,
           chatTs = Just currentTs,
-          userMemberProfileSentAt = Just currentTs
+          userMemberProfileSentAt = Just currentTs,
+          customData = Nothing
         }
 
 -- | creates a new group record for the group the current user was invited to, or returns an existing one
@@ -409,7 +411,8 @@ createGroupInvitation db vr user@User {userId} contact@Contact {contactId, activ
                   createdAt = currentTs,
                   updatedAt = currentTs,
                   chatTs = Just currentTs,
-                  userMemberProfileSentAt = Just currentTs
+                  userMemberProfileSentAt = Just currentTs,
+                  customData = Nothing
                 },
               groupMemberId
             )
@@ -628,7 +631,7 @@ getUserGroupDetails db vr User {userId, userContactId} _contactId_ search_ =
         SELECT
           g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image,
           g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
+          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.custom_data,
           mu.group_member_id, g.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction,
           mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.image, pu.contact_link, pu.local_alias, pu.preferences
         FROM groups g
@@ -1293,7 +1296,7 @@ getViaGroupMember db vr User {userId, userContactId} Contact {contactId} =
           -- GroupInfo
           g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image,
           g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
+          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.custom_data,
           -- GroupInfo {membership}
           mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
           mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
@@ -1389,7 +1392,7 @@ getGroupInfo db vr User {userId, userContactId} groupId =
           -- GroupInfo
           g.group_id, g.local_display_name, gp.display_name, gp.full_name, gp.description, gp.image,
           g.host_conn_custom_user_profile_id, g.enable_ntfs, g.send_rcpts, g.favorite, gp.preferences,
-          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at,
+          g.created_at, g.updated_at, g.chat_ts, g.user_member_profile_sent_at, g.custom_data,
           -- GroupMember - membership
           mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
           mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
@@ -1951,7 +1954,7 @@ createMemberContact
               authErrCounter = 0
             }
         mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False}
+    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False, customData = Nothing}
 
 getMemberContact :: DB.Connection -> (PQSupport -> VersionRangeChat) -> User -> ContactId -> ExceptT StoreError IO (GroupInfo, GroupMember, Contact, ConnReqInvitation)
 getMemberContact db vr user contactId = do
@@ -1988,7 +1991,7 @@ createMemberContactInvited
     contactId <- createContactUpdateMember currentTs userPreferences
     ctConn <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
     let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False, customData = Nothing}
         m' = m {memberContactId = Just contactId}
     pure (mCt', m')
     where
@@ -2188,3 +2191,8 @@ updateUserMemberProfileSentAt db User {userId} GroupInfo {groupId} sentTs =
     db
     "UPDATE groups SET user_member_profile_sent_at = ? WHERE user_id = ? AND group_id = ?"
     (sentTs, userId, groupId)
+
+setGroupCustomData :: DB.Connection -> User -> GroupInfo -> Maybe CustomData -> IO ()
+setGroupCustomData db User {userId} GroupInfo {groupId} customData = do
+  updatedAt <- getCurrentTime
+  DB.execute db "UPDATE groups SET custom_data = ?, updated_at = ? WHERE user_id = ? AND group_id = ?" (customData, updatedAt, userId, groupId)
diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs
index bf74add6db..fe89d7f506 100644
--- a/src/Simplex/Chat/Store/Messages.hs
+++ b/src/Simplex/Chat/Store/Messages.hs
@@ -25,7 +25,6 @@ module Simplex.Chat.Store.Messages
     createNewMessageAndRcvMsgDelivery,
     createNewRcvMessage,
     updateSndMsgDeliveryStatus,
-    updateRcvMsgDeliveryStatus,
     createPendingGroupMessage,
     getPendingGroupMessages,
     deletePendingGroupMessage,
@@ -42,6 +41,7 @@ module Simplex.Chat.Store.Messages
     getDirectChatItemLast,
     getAllChatItems,
     getAChatItem,
+    getAChatItemBySharedMsgId,
     updateDirectChatItem,
     updateDirectChatItem',
     addInitialAndNewCIVersions,
@@ -211,7 +211,7 @@ createSndMsgDelivery db SndMsgDelivery {connId, agentMsgId} messageId = do
   insertedRowId db
 
 createNewMessageAndRcvMsgDelivery :: forall e. MsgEncodingI e => DB.Connection -> ConnOrGroupId -> NewRcvMessage e -> Maybe SharedMsgId -> RcvMsgDelivery -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
-createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMsgDelivery {connId, agentMsgId, agentMsgMeta, agentAckCmdId} authorGroupMemberId_ = do
+createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMsgDelivery {connId, agentMsgId, agentMsgMeta} authorGroupMemberId_ = do
   msg@RcvMessage {msgId} <- createNewRcvMessage db connOrGroupId newMessage sharedMsgId_ authorGroupMemberId_ Nothing
   liftIO $ do
     currentTs <- getCurrentTime
@@ -219,10 +219,10 @@ createNewMessageAndRcvMsgDelivery db connOrGroupId newMessage sharedMsgId_ RcvMs
       db
       [sql|
         INSERT INTO msg_deliveries
-          (message_id, connection_id, agent_msg_id, agent_msg_meta, agent_ack_cmd_id, chat_ts, created_at, updated_at, delivery_status)
-        VALUES (?,?,?,?,?,?,?,?,?)
+          (message_id, connection_id, agent_msg_id, agent_msg_meta, chat_ts, created_at, updated_at, delivery_status)
+        VALUES (?,?,?,?,?,?,?,?)
       |]
-      (msgId, connId, agentMsgId, msgMetaJson agentMsgMeta, agentAckCmdId, snd $ broker agentMsgMeta, currentTs, currentTs, MDSRcvAgent)
+      (msgId, connId, agentMsgId, msgMetaJson agentMsgMeta, snd $ broker agentMsgMeta, currentTs, currentTs, MDSRcvAgent)
   pure msg
 
 createNewRcvMessage :: forall e. MsgEncodingI e => DB.Connection -> ConnOrGroupId -> NewRcvMessage e -> Maybe SharedMsgId -> Maybe GroupMemberId -> Maybe GroupMemberId -> ExceptT StoreError IO RcvMessage
@@ -273,18 +273,6 @@ updateSndMsgDeliveryStatus db connId agentMsgId sndMsgDeliveryStatus = do
     |]
     (sndMsgDeliveryStatus, currentTs, connId, agentMsgId)
 
-updateRcvMsgDeliveryStatus :: DB.Connection -> Int64 -> CommandId -> MsgDeliveryStatus 'MDRcv -> IO ()
-updateRcvMsgDeliveryStatus db connId cmdId rcvMsgDeliveryStatus = do
-  currentTs <- getCurrentTime
-  DB.execute
-    db
-    [sql|
-      UPDATE msg_deliveries
-      SET delivery_status = ?, updated_at = ?
-      WHERE connection_id = ? AND agent_ack_cmd_id = ?
-    |]
-    (rcvMsgDeliveryStatus, currentTs, connId, cmdId)
-
 createPendingGroupMessage :: DB.Connection -> Int64 -> MessageId -> Maybe Int64 -> IO ()
 createPendingGroupMessage db groupMemberId messageId introId_ = do
   currentTs <- getCurrentTime
@@ -2215,6 +2203,15 @@ getAChatItem db vr user chatRef itemId = case chatRef of
     pure $ AChatItem SCTLocal msgDir (LocalChat nf) ci
   _ -> throwError $ SEChatItemNotFound itemId
 
+getAChatItemBySharedMsgId :: ChatTypeQuotable c => DB.Connection -> User -> ChatDirection c 'MDRcv -> SharedMsgId -> ExceptT StoreError IO AChatItem
+getAChatItemBySharedMsgId db user cd sharedMsgId = case cd of
+  CDDirectRcv ct@Contact {contactId} -> do
+    (CChatItem msgDir ci) <- getDirectChatItemBySharedMsgId db user contactId sharedMsgId
+    pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
+  CDGroupRcv g@GroupInfo {groupId} GroupMember {groupMemberId} -> do
+    (CChatItem msgDir ci) <- getGroupChatItemBySharedMsgId db user groupId groupMemberId sharedMsgId
+    pure $ AChatItem SCTGroup msgDir (GroupChat g) ci
+
 getChatItemVersions :: DB.Connection -> ChatItemId -> IO [ChatItemVersion]
 getChatItemVersions db itemId = do
   map toChatItemVersion
diff --git a/src/Simplex/Chat/Store/Migrations.hs b/src/Simplex/Chat/Store/Migrations.hs
index d8bdbd6fd3..e351f0f27a 100644
--- a/src/Simplex/Chat/Store/Migrations.hs
+++ b/src/Simplex/Chat/Store/Migrations.hs
@@ -102,6 +102,8 @@ import Simplex.Chat.Migrations.M20240214_redirect_file_id
 import Simplex.Chat.Migrations.M20240222_app_settings
 import Simplex.Chat.Migrations.M20240226_users_restrict
 import Simplex.Chat.Migrations.M20240228_pq
+import Simplex.Chat.Migrations.M20240313_drop_agent_ack_cmd_id
+import Simplex.Chat.Migrations.M20240324_custom_data
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -203,7 +205,9 @@ schemaMigrations =
     ("20240214_redirect_file_id", m20240214_redirect_file_id, Just down_m20240214_redirect_file_id),
     ("20240222_app_settings", m20240222_app_settings, Just down_m20240222_app_settings),
     ("20240226_users_restrict", m20240226_users_restrict, Just down_m20240226_users_restrict),
-    ("20240228_pq", m20240228_pq, Just down_m20240228_pq)
+    ("20240228_pq", m20240228_pq, Just down_m20240228_pq),
+    ("20240313_drop_agent_ack_cmd_id", m20240313_drop_agent_ack_cmd_id, Just down_m20240313_drop_agent_ack_cmd_id),
+    ("20240324_custom_data", m20240324_custom_data, Just down_m20240324_custom_data)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/Shared.hs b/src/Simplex/Chat/Store/Shared.hs
index fd628d09ee..88540134fe 100644
--- a/src/Simplex/Chat/Store/Shared.hs
+++ b/src/Simplex/Chat/Store/Shared.hs
@@ -371,16 +371,16 @@ deleteUnusedIncognitoProfileById_ db User {userId} profileId =
     |]
     [":user_id" := userId, ":profile_id" := profileId]
 
-type ContactRow = (ContactId, ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool)
+type ContactRow = (ContactId, ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool, Maybe CustomData)
 
 toContact :: (PQSupport -> VersionRangeChat) -> User -> ContactRow :. MaybeConnectionRow -> Contact
-toContact vr user (((contactId, profileId, localDisplayName, viaGroup, displayName, fullName, image, contactLink, localAlias, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)) :. connRow) =
+toContact vr user (((contactId, profileId, localDisplayName, viaGroup, displayName, fullName, image, contactLink, localAlias, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, customData)) :. connRow) =
   let profile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
       activeConn = toMaybeConnection vr connRow
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
       incognito = maybe False connIncognito activeConn
       mergedPreferences = contactUserPreferences user userPreferences preferences incognito
-   in Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent}
+   in Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent, customData}
 
 getProfileById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO LocalProfile
 getProfileById db userId profileId =
diff --git a/src/Simplex/Chat/Terminal/Main.hs b/src/Simplex/Chat/Terminal/Main.hs
new file mode 100644
index 0000000000..2b26bb1d66
--- /dev/null
+++ b/src/Simplex/Chat/Terminal/Main.hs
@@ -0,0 +1,64 @@
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NamedFieldPuns #-}
+
+module Simplex.Chat.Terminal.Main where
+
+import Control.Concurrent (forkIO, threadDelay)
+import Control.Concurrent.STM
+import Control.Monad
+import Data.Time.Clock (getCurrentTime)
+import Data.Time.LocalTime (getCurrentTimeZone)
+import Network.Socket
+import Simplex.Chat.Controller (ChatConfig, ChatController (..), ChatResponse (..), currentRemoteHost, versionNumber, versionString)
+import Simplex.Chat.Core
+import Simplex.Chat.Options
+import Simplex.Chat.Terminal
+import Simplex.Chat.View (serializeChatResponse)
+import Simplex.Messaging.Client (NetworkConfig (..))
+import System.Directory (getAppUserDataDirectory)
+import System.Exit (exitFailure)
+import System.Terminal (withTerminal)
+
+simplexChatCLI :: ChatConfig -> Maybe (ServiceName -> ChatConfig -> ChatOpts -> IO ()) -> IO ()
+simplexChatCLI cfg server_ = do
+  appDir <- getAppUserDataDirectory "simplex"
+  opts@ChatOpts {chatCmd, chatServerPort} <- getChatOpts appDir "simplex_v1"
+  if null chatCmd
+    then case chatServerPort of
+      Just chatPort -> case server_ of
+        Just server -> server chatPort cfg opts
+        Nothing -> putStrLn "Not allowed to run as a WebSockets server" >> exitFailure
+      _ -> runCLI opts
+    else simplexChatCore cfg opts $ runCommand opts
+  where
+    runCLI opts = do
+      welcome opts
+      t <- withTerminal pure
+      simplexChatTerminal cfg opts t
+    runCommand ChatOpts {chatCmd, chatCmdLog, chatCmdDelay} user cc = do
+      when (chatCmdLog /= CCLNone) . void . forkIO . forever $ do
+        (_, _, r') <- atomically . readTBQueue $ outputQ cc
+        case r' of
+          CRNewChatItem {} -> printResponse r'
+          _ -> when (chatCmdLog == CCLAll) $ printResponse r'
+      sendChatCmdStr cc chatCmd >>= printResponse
+      threadDelay $ chatCmdDelay * 1000000
+      where
+        printResponse r = do
+          ts <- getCurrentTime
+          tz <- getCurrentTimeZone
+          rh <- readTVarIO $ currentRemoteHost cc
+          putStrLn $ serializeChatResponse (rh, Just user) ts tz rh r
+
+welcome :: ChatOpts -> IO ()
+welcome ChatOpts {coreOptions = CoreChatOpts {dbFilePrefix, networkConfig}} =
+  mapM_
+    putStrLn
+    [ versionString versionNumber,
+      "db: " <> dbFilePrefix <> "_chat.db, " <> dbFilePrefix <> "_agent.db",
+      maybe
+        "direct network connection - use `/network` command or `-x` CLI option to connect via SOCKS5 at :9050"
+        (("using SOCKS5 proxy " <>) . show)
+        (socksProxy networkConfig),
+      "type \"/help\" or \"/h\" for usage info"
+    ]
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index f16913439d..e419f8c4cb 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -174,10 +174,25 @@ data Contact = Contact
     updatedAt :: UTCTime,
     chatTs :: Maybe UTCTime,
     contactGroupMemberId :: Maybe GroupMemberId,
-    contactGrpInvSent :: Bool
+    contactGrpInvSent :: Bool,
+    customData :: Maybe CustomData
   }
   deriving (Eq, Show)
 
+newtype CustomData = CustomData J.Object
+  deriving (Eq, Show)
+
+instance ToJSON CustomData where
+  toJSON (CustomData v) = toJSON v
+  toEncoding (CustomData v) = toEncoding v
+
+instance FromJSON CustomData where
+  parseJSON = J.withObject "CustomData" (pure . CustomData)
+
+instance ToField CustomData where toField (CustomData v) = toField $ J.encode v
+
+instance FromField CustomData where fromField = fromBlobField_ J.eitherDecodeStrict
+
 contactConn :: Contact -> Maybe Connection
 contactConn Contact {activeConn} = activeConn
 
@@ -356,7 +371,8 @@ data GroupInfo = GroupInfo
     createdAt :: UTCTime,
     updatedAt :: UTCTime,
     chatTs :: Maybe UTCTime,
-    userMemberProfileSentAt :: Maybe UTCTime
+    userMemberProfileSentAt :: Maybe UTCTime,
+    customData :: Maybe CustomData
   }
   deriving (Eq, Show)
 
@@ -1551,7 +1567,7 @@ data CommandFunction
   | CFJoinConn
   | CFAllowConn
   | CFAcceptContact
-  | CFAckMessage
+  | CFAckMessage -- not used
   | CFDeleteConn -- not used
   deriving (Eq, Show)
 
diff --git a/src/Simplex/Chat/Util.hs b/src/Simplex/Chat/Util.hs
index eacaf8d7ef..2b2bd599ae 100644
--- a/src/Simplex/Chat/Util.hs
+++ b/src/Simplex/Chat/Util.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TupleSections #-}
 
-module Simplex.Chat.Util (week, encryptFile, chunkSize, shuffle) where
+module Simplex.Chat.Util (week, encryptFile, chunkSize, liftIOEither, shuffle) where
 
 import Control.Monad
 import Control.Monad.Except
@@ -42,3 +42,7 @@ shuffle xs = map snd . sortBy (comparing fst) <$> mapM (\x -> (,x) <$> random) x
   where
     random :: IO Word16
     random = randomRIO (0, 65535)
+
+liftIOEither :: (MonadIO m, MonadError e m) => IO (Either e a) -> m a
+liftIOEither a = liftIO a >>= liftEither
+{-# INLINE liftIOEither #-}
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 50dc151aa4..65a6626308 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -183,8 +183,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRUnknownMemberBlocked u g byM um -> ttyUser u [ttyGroup' g <> ": " <> ttyMember byM <> " blocked an unknown member, creating unknown member record " <> ttyMember um]
   CRUnknownMemberAnnounced u g _ um m -> ttyUser u [ttyGroup' g <> ": unknown member " <> ttyMember um <> " updated to " <> ttyMember m]
   CRGroupDeletedUser u g -> ttyUser u [ttyGroup' g <> ": you deleted the group"]
-  CRRcvFileDescrReady _ _ -> []
-  CRRcvFileDescrNotReady _ _ -> []
+  CRRcvFileDescrReady _ _ _ _ -> []
   CRRcvFileProgressXFTP {} -> []
   CRRcvFileAccepted u ci -> ttyUser u $ savingFile' ci
   CRRcvFileAcceptedSndCancelled u ft -> ttyUser u $ viewRcvFileSndCancelled ft
@@ -391,6 +390,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRArchiveImported archiveErrs -> if null archiveErrs then ["ok"] else ["archive import errors: " <> plain (show archiveErrs)]
   CRAppSettings as -> ["app settings: " <> plain (LB.unpack $ J.encode as)]
   CRTimedAction _ _ -> []
+  CRCustomChatResponse u r -> ttyUser' u $ [plain r]
   where
     ttyUser :: User -> [StyledString] -> [StyledString]
     ttyUser user@User {showNtfs, activeUser} ss
@@ -1167,7 +1167,7 @@ viewNetworkConfig NetworkConfig {socksProxy, tcpTimeout} =
   ]
 
 viewContactInfo :: Contact -> Maybe ConnectionStats -> Maybe Profile -> [StyledString]
-viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}, activeConn} stats incognitoProfile =
+viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}, activeConn, customData} stats incognitoProfile =
   ["contact ID: " <> sShow contactId]
     <> maybe [] viewConnectionStats stats
     <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact l)]) contactLink
@@ -1179,12 +1179,17 @@ viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, conta
     <> [viewConnectionVerified (contactSecurityCode ct)]
     <> ["quantum resistant end-to-end encryption" | contactPQEnabled ct == CR.PQEncOn]
     <> maybe [] (\ac -> [viewPeerChatVRange (peerChatVRange ac)]) activeConn
+    <> viewCustomData customData
 
 viewGroupInfo :: GroupInfo -> GroupSummary -> [StyledString]
-viewGroupInfo GroupInfo {groupId} s =
+viewGroupInfo GroupInfo {groupId, customData} s =
   [ "group ID: " <> sShow groupId,
     "current members: " <> sShow (currentMembers s)
   ]
+    <> viewCustomData customData
+
+viewCustomData :: Maybe CustomData -> [StyledString]
+viewCustomData = maybe [] (\(CustomData v) -> ["custom data: " <> plain (LB.toStrict . J.encode $ J.Object v)])
 
 viewGroupMemberInfo :: GroupInfo -> GroupMember -> Maybe ConnectionStats -> [StyledString]
 viewGroupMemberInfo GroupInfo {groupId} m@GroupMember {groupMemberId, memberProfile = LocalProfile {localAlias, contactLink}, activeConn} stats =
diff --git a/tests/Bots/DirectoryTests.hs b/tests/Bots/DirectoryTests.hs
index 1054a1d8eb..b78d36f489 100644
--- a/tests/Bots/DirectoryTests.hs
+++ b/tests/Bots/DirectoryTests.hs
@@ -522,7 +522,7 @@ testNotApprovedBadRoles tmp =
         let approve = "/approve 1:privacy 1"
         superUser #> ("@SimpleX-Directory " <> approve)
         superUser <# ("SimpleX-Directory> > " <> approve)
-        superUser <## "      Group is not approved: user is not an owner."
+        superUser <## "      Group is not approved: SimpleX-Directory is not an admin."
         groupNotFound cath "privacy"
         bob ##> "/mr privacy SimpleX-Directory admin"
         bob <## "#privacy: you changed the role of SimpleX-Directory from member to admin"
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index 8e9d11d91f..a827236a15 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -87,7 +87,7 @@ testOpts =
 testCoreOpts :: CoreChatOpts
 testCoreOpts =
   CoreChatOpts
-    { dbFilePrefix = undefined,
+    { dbFilePrefix = "./simplex_v1",
       dbKey = "",
       -- dbKey = "this is a pass-phrase to encrypt the database",
       smpServers = ["smp://LcJUMfVhwD8yxjAiSaDzzGF3-kLG4Uh0Fl_ZIjrRwjI=:server_password@localhost:7001"],
@@ -413,6 +413,8 @@ serverCfg =
       allowNewQueues = True,
       -- server password is disabled as otherwise v1 tests fail
       newQueueBasicAuth = Nothing, -- Just "server_password",
+      controlPortUserAuth = Nothing,
+      controlPortAdminAuth = Nothing,
       messageExpiration = Just defaultMessageExpiration,
       inactiveClientExpiration = Just defaultInactiveClientExpiration,
       caCertificateFile = "tests/fixtures/tls/ca.crt",
@@ -448,6 +450,8 @@ xftpServerConfig =
       allowedChunkSizes = [kb 64, kb 128, kb 256, mb 1, mb 4],
       allowNewFiles = True,
       newFileBasicAuth = Nothing,
+      controlPortUserAuth = Nothing,
+      controlPortAdminAuth = Nothing,
       fileExpiration = Just defaultFileExpiration,
       fileTimeout = 10000000,
       inactiveClientExpiration = Just defaultInactiveClientExpiration,
diff --git a/tests/ChatTests/Direct.hs b/tests/ChatTests/Direct.hs
index 4e06f68fb6..4b0389ab90 100644
--- a/tests/ChatTests/Direct.hs
+++ b/tests/ChatTests/Direct.hs
@@ -2997,10 +2997,15 @@ testPQEnableContactCompression =
     bob ##> "/pq @alice on"
     bob <## "alice: enable quantum resistant end-to-end encryption"
     PQSupportOn <- bob `pqSupportForCt` 2
+    threadDelay 300000
     (alice, "lrg 1", v) \:#> (bob, v')
+    threadDelay 300000
     (bob, "lrg 2", v') \:#> (alice, v')
+    threadDelay 300000
     (alice, "lrg 3", v') \:#> (bob, v')
+    threadDelay 300000
     (bob, "lrg 4", v') \:#> (alice, v')
+    threadDelay 300000
     (alice, "lrg 5", v') +:#> (bob, v')
     PQEncOff <- alice `pqForContact` 2
     PQEncOff <- bob `pqForContact` 2
diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs
index bf9b445925..77bac11145 100644
--- a/tests/ChatTests/Groups.hs
+++ b/tests/ChatTests/Groups.hs
@@ -871,6 +871,9 @@ testGroupRemoveAdd =
   testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
     \alice bob cath -> do
       createGroup3 "team" alice bob cath
+
+      threadDelay 100000
+
       -- remove member
       alice ##> "/rm team bob"
       concurrentlyN_
@@ -880,6 +883,9 @@ testGroupRemoveAdd =
             bob <## "use /d #team to delete the group",
           cath <## "#team: alice removed bob from the group"
         ]
+
+      threadDelay 100000
+
       alice ##> "/a team bob"
       alice <## "invitation to join the group #team sent to bob"
       bob <## "#team_1: alice invites you to join the group as member"
@@ -1916,6 +1922,8 @@ testGroupLink =
         (alice <# "#team cath> hey team")
         (bob <# "#team cath> hey team")
 
+      threadDelay 100000
+
       -- leaving team removes link
       alice ##> "/l team"
       concurrentlyN_
diff --git a/tests/SchemaDump.hs b/tests/SchemaDump.hs
index 77269a9b33..b6bc91e48b 100644
--- a/tests/SchemaDump.hs
+++ b/tests/SchemaDump.hs
@@ -75,7 +75,9 @@ skipComparisonForDownMigrations =
     -- on down migration idx_connections_via_contact_uri_hash index moves down to the end of the file
     "20231019_indexes",
     -- table and indexes move down to the end of the file
-    "20231215_recreate_msg_deliveries"
+    "20231215_recreate_msg_deliveries",
+    -- on down migration idx_msg_deliveries_agent_ack_cmd_id index moves down to the end of the file
+    "20240313_drop_agent_ack_cmd_id"
   ]
 
 getSchema :: FilePath -> FilePath -> IO String
diff --git a/website/langs/fi.json b/website/langs/fi.json
index 1d704cc8ec..0b82902fdc 100644
--- a/website/langs/fi.json
+++ b/website/langs/fi.json
@@ -28,7 +28,7 @@
     "hero-overlay-2-title": "Miksi käyttäjätunnukset ovat huonoja yksityisyydelle?",
     "feature-1-title": "Päästä päähän salattuja viestejä markdownin ja muokkaamisen kera",
     "feature-2-title": "Päästä päähän salattuja<br>kuvia, videoita ja tiedostoja",
-    "feature-3-title": "Hajautetut salaiset ryhmät &mdash;<br>vain käyttäjät tietävät niiden olemassaolosta",
+    "feature-3-title": "E2E-salatut hajautetut ryhmät &mdash; vain käyttäjät tietävät niiden olemassaolosta",
     "feature-4-title": "Päästä päähän salattuja ääniviestejä",
     "feature-5-title": "Katoavia viestejä",
     "feature-8-title": "Incognito-tila &mdash;<br>ainutlaatuinen SimpleX Chatille",
@@ -108,7 +108,7 @@
     "hero-2-header": "Luo yksityinen yhteys",
     "hero-2-header-desc": "Video näyttää, kuinka muodostat yhteyden ystävääsi heidän kertakäyttöiseen QR-koodiinsa, henkilökohtaisesti tai videolinkin kautta. Voit myös liittyä jakamalla kutsulinkin kautta.",
     "feature-6-title": "Päästä päähän salattuja<br>puheluita ja videopuheluja",
-    "feature-7-title": "Siirrettävä salattu tietokanta &mdash; siirrä profiilisi toiselle laitteelle",
+    "feature-7-title": "Kannettava salattu sovellustallennus &mdash; siirrä profiili toiseen laitteeseen",
     "simplex-explained-tab-1-p-1": "Voit luoda yhteyshenkilöitä ja ryhmiä sekä käydä kaksisuuntaisia keskusteluja kuten missä tahansa muussa viestisovelluksessa.",
     "simplex-explained-tab-3-p-1": "Palvelimilla on erilliset anonyymit tunnistetiedot kullekin jonolle, eivätkä ne tiedä, mille käyttäjille ne kuuluvat.",
     "donate": "Lahjoita",
@@ -245,5 +245,12 @@
     "stable-and-beta-versions-built-by-developers": "Kehittäjien luomat vakaat ja beta-versiot",
     "f-droid-page-simplex-chat-repo-section-text": "Lisätäksesi sen F-Droid-asiakkaaseesi, <span class='hide-on-mobile'>skannaa QR-koodi tai</span> käytä tätä URL-osoitetta:",
     "jobs": "Liity tiimiin",
-    "docs-dropdown-9": "Lataukset"
+    "docs-dropdown-9": "Lataukset",
+    "hero-overlay-3-title": "Turvallisuuden arviointi",
+    "hero-overlay-card-3-p-1": "<a href=\"https://www.trailofbits.com/about/\">Trail of Bits</a> on johtava turvallisuus- ja teknologiakonsultointiyritys, jonka asiakkaita ovat muun muassa suuret teknologiayritykset, valtion virastot ja suuret lohkoketjuprojektit.",
+    "hero-overlay-3-textlink": "Turvallisuusarviointi",
+    "hero-overlay-card-3-p-2": "Trail of Bits tarkasteli SimpleX-alustan salaus- ja verkkokomponentteja marraskuussa 2022.",
+    "hero-overlay-card-3-p-3": "Lue lisää <a href=\"/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html\">ilmoituksesta</a>.",
+    "please-enable-javascript": "Ota JavaScript käyttöön nähdäksesi QR-koodin.",
+    "please-use-link-in-mobile-app": "Käytä mobiilisovelluksessa olevaa linkkiä"
 }
diff --git a/website/langs/he.json b/website/langs/he.json
index f4e776c67f..9effb8474b 100644
--- a/website/langs/he.json
+++ b/website/langs/he.json
@@ -21,7 +21,7 @@
     "hero-2-header-desc": "הסרטון מראה כיצד אתם יוצרים קשר עם חברכם באמצעות קוד QR חד פעמי, באופן אישי או באמצעות קישור וידאו. באפשרותכם גם להתחבר על-ידי שיתוף קישור ההזמנה.",
     "hero-overlay-1-title": "איך SimpleX עובד?",
     "feature-1-title": "הודעות מוצפנות מקצה לקצה עם סימונים ואפשרויות עריכה",
-    "feature-2-title": "תמונות וקבצים<br>מוצפנים מקצה לקצה",
+    "feature-2-title": "תמונות, וידאו וקבצים<br>בהצפנת קצה-אל-קצה",
     "feature-3-title": "קבוצות סודיות מבוזרות &mdash;<br>רק המשתמשים יודעים שהן קיימות",
     "simplex-private-3-title": "תעבורת TLS<br>מאובטחת ומאומתת",
     "simplex-private-card-1-point-2": "תיבת הצפנה NaCL בכל תור כדי למנוע קורלציית תעבורה בין תורי הודעות במקרה שאבטחת TLS נפגעה.",
@@ -59,7 +59,7 @@
     "feature-6-title": "שיחות שמע ווידאו<br>מוצפנות מקצה לקצה",
     "feature-4-title": "הודעות קוליות מוצפנות מקצה לקצה",
     "feature-5-title": "הודעות נעלמות",
-    "feature-7-title": "מסד נתונים מוצפן נייד &mdash; העברת הפרופיל שלכם למכשיר אחר",
+    "feature-7-title": "מסד נתונים מוצפן נייד &mdash; העבר פרופיל למכשיר אחר",
     "feature-8-title": "מצב זהות נסתרת &mdash;<br>ייחודי ל-SimpleX Chat",
     "simplex-private-4-title": "אופציונלי<br>גישה דרך Tor",
     "simplex-network-overlay-1-title": "השוואה לפרוטוקולי העברת הודעות P2P",
@@ -250,5 +250,7 @@
     "stable-and-beta-versions-built-by-developers": "גרסאות יציבות ובטא שנבנו על ידי המפתחים",
     "f-droid-page-simplex-chat-repo-section-text": "כדי להוסיף אותו ללקוח F-Droid שלכם, <span class='hide-on-mobile'>סרקו את קוד ה-QR או</span> השתמשו בכתובת האתר הזו:",
     "docs-dropdown-8": "שירות מדריך כתובות SimpleX",
-    "f-droid-page-f-droid-org-repo-section-text": "מאגרי SimpleX Chat ו-F-Droid.org חותמים על גרסאות עם מפתחות שונים. כדי לעבור, אנא <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>ייצא</a> את מסד הנתונים של הצ'אט והתקן מחדש את האפליקציה."
+    "f-droid-page-f-droid-org-repo-section-text": "מאגרי SimpleX Chat ו-F-Droid.org חותמים על גרסאות עם מפתחות שונים. כדי לעבור, אנא <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>ייצא</a> את מסד הנתונים של הצ'אט והתקן מחדש את האפליקציה.",
+    "please-enable-javascript": "אנא הפעל JavaScript כדי לראות את קוד ה-QR.",
+    "please-use-link-in-mobile-app": "אנא השתמש בקישור באפליקציה במכשיר נייד"
 }
diff --git a/website/langs/pl.json b/website/langs/pl.json
index 041176a1e1..3e7c546cf1 100644
--- a/website/langs/pl.json
+++ b/website/langs/pl.json
@@ -194,7 +194,7 @@
     "simplex-network-1-header": "W przeciwieństwie do sieci P2P",
     "simplex-network-section-desc": "Simplex Chat zapewnia najlepszą prywatność dzięki połączeniu zalet sieci P2P i sieci federacyjnych.",
     "simplex-network-2-header": "W przeciwieństwie do sieci federacyjnych",
-    "simplex-private-section-header": "Co sprawia, że SimpleX jest<span class='gradient-text'>prywatny</span>",
+    "simplex-private-section-header": "Co sprawia, że SimpleX jest <span class='gradient-text'>prywatny</span>",
     "tap-to-close": "Stuknij, aby zamknąć",
     "simplex-network-section-header": "SimpleX <span class='gradient-text'>Sieć</span>",
     "simplex-network-2-desc": "Serwery przekaźnikowe SimpleX NIE przechowują profili użytkowników, kontaktów i dostarczonych wiadomości, NIE łączą się ze sobą i NIE ma katalogu serwerów.",
diff --git a/website/langs/ru.json b/website/langs/ru.json
index 73fba95480..1629aafe54 100644
--- a/website/langs/ru.json
+++ b/website/langs/ru.json
@@ -250,5 +250,7 @@
     "simplex-unique-overlay-card-1-p-1": "В отличие от других платформ обмена сообщениями, SimpleX <strong>не имеет идентификаторов, присвоенных пользователям</strong>. Он не полагается на номера телефонов, доменные адреса (например, электронную почту или XMPP), имена пользователей, открытые ключи или даже случайные числа для идентификации своих пользователей &mdash; мы не знаем, сколько людей пользуются нашими SimpleX серверами.",
     "reference": "Ссылки",
     "f-droid-page-f-droid-org-repo-section-text": "Приложение SimpleX Chat от разработчиков и от репозитория F-Droid.org имеют разные ключи подписи. Если вы хотите сменить одно на другое, вам сначала нужно будет <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>экспортировать</a> базу данных и только потом скачать другое приложение.",
-    "simplex-private-5-title": "Многоуровневое<br>Заполнения содержимого"
+    "simplex-private-5-title": "Многоуровневое<br>Заполнения содержимого",
+    "please-use-link-in-mobile-app": "Пожалуйста, воспользуйтесь ссылкой в мобильном приложении",
+    "please-enable-javascript": "Пожалуйста, включите JavaScript, чтобы увидеть QR-код."
 }
diff --git a/website/src/_includes/blog_previews/20240323.html b/website/src/_includes/blog_previews/20240323.html
new file mode 100644
index 0000000000..7fe4c78179
--- /dev/null
+++ b/website/src/_includes/blog_previews/20240323.html
@@ -0,0 +1,16 @@
+<p><strong>SimpleX network: deliver real privacy via a profitable business and non-profit protocol governance:</strong></p>
+
+<ul class="mb-[12px]">
+    <li>community and business interests are aligned.</li>
+    <li>the journey to the decentralized non-profit protocol governance.</li>
+    <li>welcome, Esra&apos;a!</li>
+</ul>
+
+<p><strong>v5.6 is released:</strong></p>
+
+<ul class="mb-[12px]">
+    <li>quantum resistant end-to-end encryption (BETA) - enable it for the new contacts.</li>
+    <li>use the app during the audio and video calls.</li>
+    <li>migrate all app data to another device via QR code.</li>
+    <li>blocking members and many other improvements.</li>
+</ul>
diff --git a/website/src/_includes/blog_previews/20240404.html b/website/src/_includes/blog_previews/20240404.html
new file mode 100644
index 0000000000..b2407b3ab2
--- /dev/null
+++ b/website/src/_includes/blog_previews/20240404.html
@@ -0,0 +1,8 @@
+<em>By Esra'a al Shafei</em>
+
+<p>Transitioning from a lifelong career dedicated to nonprofits,
+including Board roles at organizations like the Wikimedia Foundation, Access Now and Tor,
+my decision to join SimpleX Chat may come as a surprise to some.
+But, as I step into this new chapter, I want to share the insights and convictions
+that have guided me here, shedding light on what I think sets SimpleX Chat apart
+and why this move feels like an essential learning opportunity.</p>