Merge branch 'stable' into stable-android

6.0.3: ios 235, android 235, desktop 64
ios: update core library
2024-12-17 17:20:21 +01:00 · 2024-08-24 16:49:03 +01:00 · 2024-08-24 16:32:32 +01:00 · 2024-08-24 15:44:08 +01:00 · 2024-08-24 15:10:05 +01:00 · 2024-08-24 15:07:32 +01:00
396 changed files with 6448 additions and 2616 deletions
@@ -92,7 +92,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
        with:
          ghc-version: ${{ matrix.ghc }}
          cabal-version: "3.10.1.0"
@@ -220,7 +220,7 @@ jobs:
          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
        run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
          echo "package_path=$path" >> $GITHUB_OUTPUT
          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -300,7 +300,9 @@ jobs:
      # Unix /

      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065

      - name: 'Setup MSYS2'
        if: matrix.os == 'windows-latest'
@@ -18,7 +18,7 @@
 2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
+5. ⚡️ [Contribute](#contribute) and [support us with donations](#please-support-us-with-your-donations).

 [Learn more about SimpleX Chat](#contents).

@@ -150,7 +150,7 @@ We would love to have you join the development! You can help us with:
 - contributing to SimpleX Chat knowledge-base.
 - developing features - please connect to us via chat so we can help you get started.

-## Help us with donations
+## Please support us with your donations

 Huge thank you to everybody who donated to SimpleX Chat!

@@ -233,6 +233,8 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

+[Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)
+
 [Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)

 [Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
@@ -15,31 +15,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
        logger.debug("AppDelegate: didFinishLaunchingWithOptions")
        application.registerForRemoteNotifications()
-        if #available(iOS 17.0, *) { trackKeyboard() }
        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
        removePasscodesIfReinstalled()
        prepareForLaunch()
        return true
    }

-    @available(iOS 17.0, *)
-    private func trackKeyboard() {
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillShow(_ notification: Notification) {
-        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
-            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
-        }
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillHide(_ notification: Notification) {
-        ChatModel.shared.keyboardHeight = 0
-    }
-
    @objc func pasteboardChanged() {
        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
    }
@@ -36,7 +36,7 @@ struct ContentView: View {
    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil

-    private let callTopPadding: CGFloat = 50
+    private let callTopPadding: CGFloat = 40

    private enum ChatListActionSheet: Identifiable {
        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
@@ -151,12 +151,12 @@ struct ContentView: View {
            }
        }
        .onAppear {
-            reactOnDarkThemeChanges()
+            reactOnDarkThemeChanges(systemInDarkThemeCurrently)
        }
        .onChange(of: colorScheme) { scheme in
            // It's needed to update UI colors when iOS wants to make screenshot after going to background,
            // so when a user changes his global theme from dark to light or back, the app will adapt to it
-            reactOnDarkThemeChanges()
+            reactOnDarkThemeChanges(scheme == .dark)
        }
        .onChange(of: theme.name) { _ in
            ThemeManager.adjustWindowStyle()
@@ -207,7 +207,7 @@ struct ContentView: View {
            CallDuration(call: call)
        }
        .padding(.horizontal)
-        .frame(height: callTopPadding - 10)
+        .frame(height: callTopPadding)
        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
        .onTapGesture {
            chatModel.activeCallViewIsCollapsed = false
@@ -54,12 +54,73 @@ class ItemsModel: ObservableObject {
        willSet { publisher.send() }
    }
    
+    // Publishes directly to `objectWillChange` publisher,
+    // this will cause reversedChatItems to be rendered without throttling
+    @Published var isLoading = false
+    @Published var showLoadingProgress = false
+
    init() {
        publisher
            .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
            .sink { self.objectWillChange.send() }
            .store(in: &bag)
    }
+
+    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
+        let navigationTimeout = Task {
+            do {
+                try await Task.sleep(nanoseconds: 250_000000)
+                await MainActor.run {
+                    willNavigate()
+                    ChatModel.shared.chatId = chatId
+                }
+            } catch {}
+        }
+        let progressTimeout = Task {
+            do {
+                try await Task.sleep(nanoseconds: 1500_000000)
+                await MainActor.run { showLoadingProgress = true }
+            } catch {}
+        }
+        Task {
+            if let chat = ChatModel.shared.getChat(chatId) {
+                await MainActor.run { self.isLoading = true }
+//                try? await Task.sleep(nanoseconds: 5000_000000)
+                await loadChat(chat: chat)
+                navigationTimeout.cancel()
+                progressTimeout.cancel()
+                await MainActor.run {
+                    self.isLoading = false
+                    self.showLoadingProgress = false
+                    willNavigate()
+                    ChatModel.shared.chatId = chatId
+                }
+            }
+        }
+    }
+}
+
+class NetworkModel: ObservableObject {
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
+
+    static let shared = NetworkModel()
+
+    private init() { }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
+    }
 }

 final class ChatModel: ObservableObject {
@@ -82,10 +143,8 @@ final class ChatModel: ObservableObject {
    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
-    @Published var chats: [Chat] = []
+    @Published private(set) var chats: [Chat] = []
    @Published var deletedChats: Set<String> = []
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
    // current chat
    @Published var chatId: String?
    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
@@ -124,8 +183,6 @@ final class ChatModel: ObservableObject {
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
    @Published var draftChatId: String?
-    // tracks keyboard height via subscription in AppDelegate
-    @Published var keyboardHeight: CGFloat = 0
    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)

@@ -300,25 +357,8 @@ final class ChatModel: ObservableObject {
        }
    }

-    func updateChats(with newChats: [ChatData]) {
-        for i in 0..<newChats.count {
-            let c = newChats[i]
-            if let j = getChatIndex(c.id)   {
-                let chat = chats[j]
-                chat.chatInfo = c.chatInfo
-                chat.chatItems = c.chatItems
-                chat.chatStats = c.chatStats
-                if i != j {
-                    if chatId != c.chatInfo.id  {
-                        popChat_(j, to: i)
-                    }  else if i == 0 {
-                        chatToTop = c.chatInfo.id
-                    }
-                }
-            } else {
-                addChat_(Chat(c), at: i)
-            }
-        }
+    func updateChats(_ newChats: [ChatData]) {
+        chats = newChats.map { Chat($0) }
        NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
        popChatCollector.clear()
    }
@@ -328,6 +368,12 @@ final class ChatModel: ObservableObject {
 //    }

    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // mark chat non deleted
+        if case let .direct(contact) = cInfo, contact.chatDeleted {
+            var updatedContact = contact
+            updatedContact.chatDeleted = false
+            updateContact(updatedContact)
+        }
        // update previews
        if let i = getChatIndex(cInfo.id) {
            chats[i].chatItems = switch cInfo {
@@ -865,20 +911,6 @@ final class ChatModel: ObservableObject {
        while i < maxIx && inView(i) { i += 1 }
        return im.reversedChatItems[min(i - 1, maxIx)]
    }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
 }

 struct ShowingInvitation {
@@ -57,7 +57,9 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                chatModel.ntfCallInvitationAction = (chatId, ntfAction)
            }
        } else {
-            chatModel.chatId = content.targetContentIdentifier
+            if let chatId = content.targetContentIdentifier {
+                ItemsModel.shared.loadOpenChat(chatId)
+            }
        }
        handler()
    }
@@ -112,9 +112,9 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
    return resp
 }

-func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) async -> ChatResponse {
+func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) async -> ChatResponse {
    await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl))
+        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl, log: log))
    }
 }

@@ -320,8 +320,8 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {

 let loadItemsPerPage = 50

-func apiGetChat(type: ChatType, id: Int64, search: String = "") throws -> Chat {
-    let r = chatSendCmdSync(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
+func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> Chat {
+    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
    if case let .apiChat(_, chat) = r { return Chat.init(chat) }
    throw r
 }
@@ -332,22 +332,20 @@ func apiGetChatItems(type: ChatType, id: Int64, pagination: ChatPagination, sear
    throw r
 }

-func loadChat(chat: Chat, search: String = "") {
+func loadChat(chat: Chat, search: String = "", clearItems: Bool = true) async {
    do {
        let cInfo = chat.chatInfo
        let m = ChatModel.shared
        let im = ItemsModel.shared
        m.chatItemStatuses = [:]
-        im.reversedChatItems = []
-        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        if case let .direct(contact) = chat.chatInfo, !cInfo.chatDeleted, chat.chatInfo.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            m.updateContact(updatedContact)
-        } else {
+        if clearItems {
+            await MainActor.run { im.reversedChatItems = [] }
+        }
+        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        await MainActor.run {
+            im.reversedChatItems = chat.chatItems.reversed()
            m.updateChatInfo(chat.chatInfo)
        }
-        im.reversedChatItems = chat.chatItems.reversed()
    } catch let error {
        logger.error("loadChat error: \(responseError(error))")
    }
@@ -707,7 +705,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
        return ((.contact, connection), nil)
    case let .contactAlreadyExists(_, contact):
        if let c = m.getContactChat(contact.contactId) {
-            await MainActor.run { m.chatId = c.id }
+            ItemsModel.shared.loadOpenChat(c.id)
        }
        let alert = contactAlreadyExistsAlert(contact)
        return (nil, alert)
@@ -1171,12 +1169,12 @@ func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) a
        let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
        await MainActor.run {
            ChatModel.shared.replaceChat(contactRequest.id, chat)
-            ChatModel.shared.setContactNetworkStatus(contact, .connected)
+            NetworkModel.shared.setContactNetworkStatus(contact, .connected)
        }
        if contact.sndReady {
            DispatchQueue.main.async {
                dismissAllSheets(animated: true) {
-                    ChatModel.shared.chatId = chat.id
+                    ItemsModel.shared.loadOpenChat(chat.id)
                }
            }
        }
@@ -1220,12 +1218,18 @@ func apiEndCall(_ contact: Contact) async throws {
    try await sendCommandOkResp(.apiEndCall(contact: contact))
 }

-func apiGetCallInvitations() throws -> [RcvCallInvitation] {
+func apiGetCallInvitationsSync() throws -> [RcvCallInvitation] {
    let r = chatSendCmdSync(.apiGetCallInvitations)
    if case let .callInvitations(invs) = r { return invs }
    throw r
 }

+func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
+    let r = await chatSendCmd(.apiGetCallInvitations)
+    if case let .callInvitations(invs) = r { return invs }
+    throw r
+}
+
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
    if let callStatus = WebRTCCallStatus.init(rawValue: status) {
        try await sendCommandOkResp(.apiCallStatus(contact: contact, callStatus: callStatus))
@@ -1422,9 +1426,9 @@ func apiGetVersion() throws -> CoreVersionInfo {
    throw r
 }

-func getAgentSubsTotal() throws -> (SMPServerSubs, Bool) {
+func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
    let userId = try currentUserId("getAgentSubsTotal")
-    let r = chatSendCmdSync(.getAgentSubsTotal(userId: userId), log: false)
+    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
    if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
    logger.error("getAgentSubsTotal error: \(String(describing: r))")
    throw r
@@ -1519,7 +1523,7 @@ func startChat(refreshInvitations: Bool = true) throws {
        try getUserChatData()
        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
        if (refreshInvitations) {
-            try refreshCallInvitations()
+            Task { try await refreshCallInvitations() }
        }
        (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
        _ = try apiStartChat()
@@ -1593,8 +1597,7 @@ func getUserChatData() throws {
    m.userAddress = try apiGetUserAddress()
    m.chatItemTTL = try getChatItemTTL()
    let chats = try apiGetChats()
-    m.chats = chats.map { Chat.init($0) }
-    m.popChatCollector.clear()
+    m.updateChats(chats)
 }

 private func getUserChatDataAsync() async throws {
@@ -1606,14 +1609,12 @@ private func getUserChatDataAsync() async throws {
        await MainActor.run {
            m.userAddress = userAddress
            m.chatItemTTL = chatItemTTL
-            m.chats = chats.map { Chat.init($0) }
-            m.popChatCollector.clear()
+            m.updateChats(chats)
        }
    } else {
        await MainActor.run {
            m.userAddress = nil
-            m.chats = []
-            m.popChatCollector.clear()
+            m.updateChats([])
        }
    }
 }
@@ -1663,6 +1664,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await TerminalItems.shared.add(.resp(.now, res))
    }
    let m = ChatModel.shared
+    let n = NetworkModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
    case let .contactDeletedByContact(user, contact):
@@ -1685,7 +1687,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
            NtfManager.shared.notifyContactConnected(user, contact)
        }
        await MainActor.run {
-            m.setContactNetworkStatus(contact, .connected)
+            n.setContactNetworkStatus(contact, .connected)
        }
    case let .contactConnecting(user, contact):
        if active(user) && contact.directOrUsed {
@@ -1708,7 +1710,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
            }
        }
        await MainActor.run {
-            m.setContactNetworkStatus(contact, .connected)
+            n.setContactNetworkStatus(contact, .connected)
        }
    case let .receivedContactRequest(user, contactRequest):
        if active(user) {
@@ -1742,7 +1744,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && m.hasChat(mergedContact.id) {
            await MainActor.run {
                if m.chatId == mergedContact.id {
-                    m.chatId = intoContact.id
+                    ItemsModel.shared.loadOpenChat(mergedContact.id)
                }
                m.removeChat(mergedContact.id)
            }
@@ -1750,27 +1752,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
    case let .networkStatus(status, connections):
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = m.networkStatuses
+            var ns = n.networkStatuses
            // slow loop is on the background thread
            for cId in connections {
                ns[cId] = status
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+                n.networkStatuses = ns
            }
        }
    case let .networkStatuses(_, statuses): ()
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = m.networkStatuses
+            var ns = n.networkStatuses
            // slow loop is on the background thread
            for s in statuses {
                ns[s.agentConnId] = s.networkStatus
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+                n.networkStatuses = ns
            }
        }
    case let .newChatItem(user, aChatItem):
@@ -1778,11 +1780,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
        let cItem = aChatItem.chatItem
        await MainActor.run {
            if active(user) {
-                if case let .direct(contact) = cInfo, contact.chatDeleted {
-                    var updatedContact = contact
-                    updatedContact.chatDeleted = false
-                    m.updateContact(updatedContact)
-                }
                m.addChatItem(cInfo, cItem)
            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                m.increaseUnreadCounter(user: user)
@@ -1916,7 +1913,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
        if let contact = memberContact {
            await MainActor.run {
-                m.setContactNetworkStatus(contact, .connected)
+                n.setContactNetworkStatus(contact, .connected)
            }
        }
    case let .groupUpdated(user, toGroup):
@@ -2097,6 +2094,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.remoteCtrlSession = nil
                dismissAllSheets() {
                    switch rcStopReason {
+                    case .disconnected:
+                        ()
                    case .connectionFailed(.errorAgent(.RCP(.identity))):
                        AlertManager.shared.showAlertMsg(
                            title: "Connection with desktop stopped",
@@ -2139,12 +2138,13 @@ func processReceivedMsg(_ res: ChatResponse) async {

 func switchToLocalSession() {
    let m = ChatModel.shared
+    let n = NetworkModel.shared
    m.remoteCtrlSession = nil
    do {
        m.users = try listUsers()
        try getUserChatData()
        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
+        n.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
    } catch let error {
        logger.debug("error updating chat data: \(responseError(error))")
    }
@@ -2167,23 +2167,30 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    }
 }

-func refreshCallInvitations() throws {
+func refreshCallInvitations() async throws {
    let m = ChatModel.shared
-    let callInvitations = try justRefreshCallInvitations()
-    if let (chatId, ntfAction) = m.ntfCallInvitationAction,
-       let invitation = m.callInvitations.removeValue(forKey: chatId) {
-        m.ntfCallInvitationAction = nil
-        CallController.shared.callAction(invitation: invitation, action: ntfAction)
-    } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
-        activateCall(invitation)
+    let callInvitations = try await apiGetCallInvitations()
+    await MainActor.run {
+        m.callInvitations = callsByChat(callInvitations)
+        if let (chatId, ntfAction) = m.ntfCallInvitationAction,
+           let invitation = m.callInvitations.removeValue(forKey: chatId) {
+            m.ntfCallInvitationAction = nil
+            CallController.shared.callAction(invitation: invitation, action: ntfAction)
+        } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
+            activateCall(invitation)
+        }
    }
 }

-func justRefreshCallInvitations() throws -> [RcvCallInvitation] {
-    let m = ChatModel.shared
-    let callInvitations = try apiGetCallInvitations()
-    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
-    return callInvitations
+func justRefreshCallInvitations() throws {
+    let callInvitations = try apiGetCallInvitationsSync()
+    ChatModel.shared.callInvitations = callsByChat(callInvitations)
+}
+
+private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: RcvCallInvitation] {
+    callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) {
+        result, inv in result[inv.contact.id] = inv
+    }
 }

 func activateCall(_ callInvitation: RcvCallInvitation) {
@@ -83,9 +83,11 @@ struct SimpleXApp: App {
                        if appState != .stopped {
                            startChatAndActivate {
                                if appState.inactive && chatModel.chatRunning == true {
-                                    updateChats()
-                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                        updateCallInvitations()
+                                    Task {
+                                        await updateChats()
+                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                            await updateCallInvitations()
+                                        }
                                    }
                                }
                            }
@@ -130,16 +132,16 @@ struct SimpleXApp: App {
        }
    }

-    private func updateChats() {
+    private func updateChats() async {
        do {
-            let chats = try apiGetChats()
-            chatModel.updateChats(with: chats)
+            let chats = try await apiGetChatsAsync()
+            await MainActor.run { chatModel.updateChats(chats) }
            if let id = chatModel.chatId,
               let chat = chatModel.getChat(id) {
-                loadChat(chat: chat)
+                Task { await loadChat(chat: chat, clearItems: false) }
            }
            if let ncr = chatModel.ntfContactRequest {
-                chatModel.ntfContactRequest = nil
+                await MainActor.run { chatModel.ntfContactRequest = nil }
                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                }
@@ -149,9 +151,9 @@ struct SimpleXApp: App {
        }
    }

-    private func updateCallInvitations() {
+    private func updateCallInvitations() async {
        do {
-            try refreshCallInvitations()
+            try await refreshCallInvitations()
        } catch let error {
            logger.error("apiGetCallInvitations: cannot update call invitations \(responseError(error))")
        }
@@ -91,8 +91,8 @@ var systemInDarkThemeCurrently: Bool {
    return UITraitCollection.current.userInterfaceStyle == .dark
 }

-func reactOnDarkThemeChanges() {
-    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == systemInDarkThemeCurrently {
+func reactOnDarkThemeChanges(_ inDarkNow: Bool) {
+    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == inDarkNow {
        // Change active colors from light to dark and back based on system theme
        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
    }
@@ -53,7 +53,7 @@ class ThemeManager {
            return perUserTheme
        }
        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper)
+        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper ?? ThemeWallpaper.from(PresetWallpaper.school.toType(CurrentColors.base), nil, nil))
    }

    static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {
@@ -186,7 +186,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        logger.debug("CallController: started chat")
        self.shouldSuspendChat = true
        // There are no invitations in the model, as it was processed by NSE
-        _ = try? justRefreshCallInvitations()
+        try? justRefreshCallInvitations()
        logger.debug("CallController: updated call invitations chat")
        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
        // Extract the call information from the push notification payload
@@ -411,6 +411,15 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }

    func endCall() {
+        if #available(iOS 16.0, *) {
+            _endCall()
+        } else {
+            // Fixes `connection.close()` getting locked up in iOS15
+            DispatchQueue.global(qos: .utility).async { self._endCall() }
+        }
+    }
+
+    private func _endCall() {
        guard let call = activeCall.wrappedValue else { return }
        logger.debug("WebRTCClient: ending the call")
        activeCall.wrappedValue = nil
@@ -92,6 +92,7 @@ struct ChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
+    @ObservedObject var networkModel = NetworkModel.shared
    @ObservedObject var chat: Chat
    @State var contact: Contact
    @State var localAlias: String
@@ -502,14 +503,14 @@ struct ChatInfoView: View {
                .foregroundColor(theme.colors.primary)
                .font(.system(size: 14))
            Spacer()
-            Text(chatModel.contactNetworkStatus(contact).statusString)
+            Text(networkModel.contactNetworkStatus(contact).statusString)
                .foregroundColor(theme.colors.secondary)
            serverImage()
        }
    }
    
    private func serverImage() -> some View {
-        let status = chatModel.contactNetworkStatus(contact)
+        let status = networkModel.contactNetworkStatus(contact)
        return Image(systemName: status.imageName)
            .foregroundColor(status == .connected ? .green : theme.colors.secondary)
            .font(.system(size: 12))
@@ -557,7 +558,7 @@ struct ChatInfoView: View {
    private func networkStatusAlert() -> Alert {
        Alert(
            title: Text("Network status"),
-            message: Text(chatModel.contactNetworkStatus(contact).statusExplanation)
+            message: Text(networkModel.contactNetworkStatus(contact).statusExplanation)
        )
    }
    
@@ -670,7 +671,14 @@ private struct CallButton: View {

        InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
            if canCall {
-                CallController.shared.startCall(contact, mediaType)
+                if CallController.useCallKit() {
+                    CallController.shared.startCall(contact, mediaType)
+                } else {
+                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
+                    dismissAllSheets(animated: true) {
+                        CallController.shared.startCall(contact, mediaType)
+                    }
+                }
            } else if contact.nextSendGrpInv {
                showAlert(SomeAlert(
                    alert: mkAlert(
@@ -294,7 +294,6 @@ struct FramedItemView: View {
        .padding(.horizontal, 12)
        .overlay(DetermineWidth())
        .frame(minWidth: 0, alignment: .leading)
-        .textSelection(.enabled)

        if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
            v.frame(maxWidth: mediaWidth, alignment: .leading)
@@ -97,7 +97,7 @@ struct ChatItemForwardingView: View {
                    )
                } else {
                    composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                    chatModel.chatId = chat.id
+                    ItemsModel.shared.loadOpenChat(chat.id)
                }
            }
        } label: {
@@ -351,7 +351,7 @@ struct ChatItemInfoView: View {
            Button {
                Task {
                    await MainActor.run {
-                        chatModel.chatId = forwardedFromItem.chatInfo.id
+                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
                        dismiss()
                    }
                }
@@ -53,13 +53,12 @@ struct ChatView: View {
        if #available(iOS 16.0, *) {
            viewBody
                .scrollDismissesKeyboard(.immediately)
-                .keyboardPadding()
                .toolbarBackground(.hidden, for: .navigationBar)
        } else {
            viewBody
        }
    }
-    
+
    @ViewBuilder
    private var viewBody: some View {
        let cInfo = chat.chatInfo
@@ -130,16 +129,23 @@ struct ChatView: View {
                }
            }
        }
+        .appSheet(item: $selectedMember) { member in
+            Group {
+                if case let .group(groupInfo) = chat.chatInfo {
+                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                }
+            }
+        }
        .onAppear {
-            loadChat(chat: chat)
-            initChatView()
            selectedChatItems = nil
+            initChatView()
        }
        .onChange(of: chatModel.chatId) { cId in
            showChatInfoSheet = false
+            selectedChatItems = nil
+            scrollModel.scrollToBottom()
            stopAudioPlayer()
            if let cId {
-                selectedChatItems = nil
                if let c = chatModel.getChat(cId) {
                    chat = c
                }
@@ -152,8 +158,10 @@ struct ChatView: View {
        .onChange(of: revealedChatItem) { _ in
            NotificationCenter.postReverseListNeedsLayout()
        }
-        .onChange(of: im.reversedChatItems) { reversedChatItems in
-            if reversedChatItems.count <= loadItemsPerPage && filtered(reversedChatItems).count < 10 {
+        .onChange(of: im.isLoading) { isLoading in
+            if !isLoading,
+               im.reversedChatItems.count <= loadItemsPerPage,
+               filtered(im.reversedChatItems).count < 10 {
                loadChatItems(chat.chatInfo)
            }
        }
@@ -221,6 +229,7 @@ struct ChatView: View {
                }
            }
            ToolbarItem(placement: .navigationBarTrailing) {
+                let isLoading = im.isLoading && im.showLoadingProgress
                if selectedChatItems != nil {
                    Button {
                        withAnimation {
@@ -243,19 +252,23 @@ struct ChatView: View {
                                }
                            }
                            Menu {
-                                if callsPrefEnabled && chatModel.activeCall == nil {
-                                    Button {
-                                        CallController.shared.startCall(contact, .video)
-                                    } label: {
-                                        Label("Video call", systemImage: "video")
+                                if !isLoading {
+                                    if callsPrefEnabled && chatModel.activeCall == nil {
+                                        Button {
+                                            CallController.shared.startCall(contact, .video)
+                                        } label: {
+                                            Label("Video call", systemImage: "video")
+                                        }
+                                        .disabled(!contact.ready || !contact.active)
                                    }
-                                    .disabled(!contact.ready || !contact.active)
+                                    searchButton()
+                                    ToggleNtfsButton(chat: chat)
+                                        .disabled(!contact.ready || !contact.active)
                                }
-                                searchButton()
-                                ToggleNtfsButton(chat: chat)
-                                    .disabled(!contact.ready || !contact.active)
                            } label: {
                                Image(systemName: "ellipsis")
+                                    .tint(isLoading ? Color.clear : nil)
+                                    .overlay { if isLoading { ProgressView() } }
                            }
                        }
                    case let .group(groupInfo):
@@ -280,10 +293,14 @@ struct ChatView: View {
                                }
                            }
                            Menu {
-                                searchButton()
-                                ToggleNtfsButton(chat: chat)
+                                if !isLoading {
+                                    searchButton()
+                                    ToggleNtfsButton(chat: chat)
+                                }
                            } label: {
                                Image(systemName: "ellipsis")
+                                    .tint(isLoading ? Color.clear : nil)
+                                    .overlay { if isLoading { ProgressView() } }
                            }
                        }
                    case .local:
@@ -349,9 +366,7 @@ struct ChatView: View {
                searchText = ""
                searchMode = false
                searchFocussed = false
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
-                    loadChat(chat: chat)
-                }
+                Task { await loadChat(chat: chat) }
            }
        }
        .padding(.horizontal)
@@ -408,18 +423,11 @@ struct ChatView: View {
            } loadPage: {
                loadChatItems(cInfo)
            }
+            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
            .padding(.vertical, -InvertedTableView.inset)
            .onTapGesture { hideKeyboard() }
            .onChange(of: searchText) { _ in
-                loadChat(chat: chat, search: searchText)
-            }
-            .onChange(of: chatModel.chatId) { chatId in
-                if let chatId, let c = chatModel.getChat(chatId) {
-                    chat = c
-                    showChatInfoSheet = false
-                    loadChat(chat: c)
-                    scrollModel.scrollToBottom()
-                }
+                Task { await loadChat(chat: chat, search: searchText) }
            }
            .onChange(of: im.reversedChatItems) { _ in
                floatingButtonModel.chatItemsChanged()
@@ -717,7 +725,7 @@ struct ChatView: View {
            Group {
                if revealed, let range = range {
                    let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    ForEach(items, id: \.1.viewId) { (i, ci) in
+                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
                        let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
                        chatItemView(ci, nil, prev)
                        .overlay {
@@ -815,8 +823,8 @@ struct ChatView: View {
                            HStack(alignment: .top, spacing: 8) {
                                MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
                                    .onTapGesture {
-                                        if m.membersLoaded {
-                                            selectedMember = m.getGroupMember(member.groupMemberId)
+                                        if let member =  m.getGroupMember(member.groupMemberId) {
+                                            selectedMember = member
                                        } else {
                                            Task {
                                                await m.loadGroupMembers(groupInfo) {
@@ -825,9 +833,6 @@ struct ChatView: View {
                                            }
                                        }
                                    }
-                                    .appSheet(item: $selectedMember) { member in
-                                        GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
-                                    }
                                chatItemWithMenu(ci, range, maxWidth)
                            }
                        }
@@ -55,7 +55,7 @@ struct ComposeLinkView: View {
                    .foregroundColor(theme.colors.secondary)
            }
            .padding(.vertical, 5)
-            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
+            .frame(maxWidth: .infinity, minHeight: 60)
        }
    }
 }
@@ -382,7 +382,11 @@ struct ComposeView: View {
                }
            }
        }
-        .background(ToolbarMaterial.material(toolbarMaterial))
+        .background {
+            Color.clear
+                .overlay(ToolbarMaterial.material(toolbarMaterial))
+                .ignoresSafeArea(.all, edges: .bottom)
+        }
        .onChange(of: composeState.message) { msg in
            if composeState.linkPreviewAllowed {
                if msg.count > 0 {
@@ -185,7 +185,6 @@ struct GroupChatInfoView: View {
                logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
            }
        }
-         .keyboardPadding()
    }

    private func groupInfoHeader() -> some View {
@@ -321,24 +321,24 @@ struct GroupMemberInfoView: View {

    func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            dismissAllSheets(animated: true)
-            DispatchQueue.main.async {
-                chatModel.chatId = chat.id
+            ItemsModel.shared.loadOpenChat(chat.id) {
+                dismissAllSheets(animated: true)
            }
        }
    }

    func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            do {
-                let chat = try apiGetChat(type: .direct, id: contactId)
-                chatModel.addChat(chat)
-                dismissAllSheets(animated: true)
-                DispatchQueue.main.async {
-                    chatModel.chatId = chat.id
+            Task {
+                do {
+                    let chat = try await apiGetChat(type: .direct, id: contactId)
+                    chatModel.addChat(chat)
+                    ItemsModel.shared.loadOpenChat(chat.id) {
+                        dismissAllSheets(animated: true)
+                    }
+                } catch let error {
+                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
                }
-            } catch let error {
-                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
            }
        }
    }
@@ -352,9 +352,10 @@ struct GroupMemberInfoView: View {
                    await MainActor.run {
                        progressIndicator = false
                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        dismissAllSheets(animated: true)
-                        chatModel.chatId = memberContact.id
-                        chatModel.setContactNetworkStatus(memberContact, .connected)
+                        ItemsModel.shared.loadOpenChat(memberContact.id) {
+                            dismissAllSheets(animated: true)
+                        }
+                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
                    }
                } catch let error {
                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
@@ -152,18 +152,23 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
        /// Scrolls to Item at index path
        /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
        func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            if let index {
-                var animated = false
-                if #available(iOS 16.0, *) {
-                    animated = true
-                }
+            var animated = false
+            if #available(iOS 16.0, *) {
+                animated = true
+            }
+            if let index, tableView.numberOfRows(inSection: 0) != 0 {
                tableView.scrollToRow(
                    at: IndexPath(row: index, section: 0),
                    at: position,
                    animated: animated
                )
-                Task { representer.scrollState = .atDestination }
+            } else {
+                tableView.setContentOffset(
+                    CGPoint(x: .zero, y: -InvertedTableView.inset),
+                    animated: animated
+                )
            }
+            Task { representer.scrollState = .atDestination }
        }

        func update(items: Array<Item>) {
@@ -175,6 +180,13 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                snapshot,
                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
            )
+            // Sets content offset on initial load
+            if itemCount == 0 {
+                tableView.setContentOffset(
+                    CGPoint(x: 0, y: -InvertedTableView.inset),
+                    animated: false
+                )
+            }
            itemCount = items.count
        }
    }
@@ -114,7 +114,7 @@ struct ChatListNavLink: View {
                    }
            } else {
                NavLinkPlain(
-                    tag: chat.chatInfo.id,
+                    chatId: chat.chatInfo.id,
                    selection: $chatModel.chatId,
                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                )
@@ -194,7 +194,7 @@ struct ChatListNavLink: View {
                }
        default:
            NavLinkPlain(
-                tag: chat.chatInfo.id,
+                chatId: chat.chatInfo.id,
                selection: $chatModel.chatId,
                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                disabled: !groupInfo.ready
@@ -221,7 +221,7 @@ struct ChatListNavLink: View {

    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
        NavLinkPlain(
-            tag: chat.chatInfo.id,
+            chatId: chat.chatInfo.id,
            selection: $chatModel.chatId,
            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
            disabled: !noteFolder.ready
@@ -355,6 +355,7 @@ struct ChatListNavLink: View {
            .tint(.red)
        }
        .frame(height: dynamicRowHeight)
+        .contentShape(Rectangle())
        .onTapGesture { showContactRequestDialog = true }
        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
@@ -392,6 +393,7 @@ struct ChatListNavLink: View {
                }
            }
        }
+        .contentShape(Rectangle())
        .onTapGesture {
            showContactConnectionInfo = true
        }
@@ -472,9 +474,7 @@ struct ChatListNavLink: View {
        Task {
            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
+                ItemsModel.shared.loadOpenChat(contact.id)
                AlertManager.shared.showAlert(connReqSentAlert(.contact))
            }
        }
@@ -217,14 +217,31 @@ struct ChatListView: View {
                            .listRowSeparator(.hidden)
                            .listRowBackground(Color.clear)
                    }
-                    ForEach(cs, id: \.viewId) { chat in
-                        ChatListNavLink(chat: chat)
+                    if #available(iOS 16.0, *) {
+                        ForEach(cs, id: \.viewId) { chat in
+                            ChatListNavLink(chat: chat)
+                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                                .padding(.trailing, -16)
+                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                                .listRowBackground(Color.clear)
+                        }
+                        .offset(x: -8)
+                    } else {
+                        ForEach(cs, id: \.viewId) { chat in
+                            VStack(spacing: .zero) {
+                                Divider()
+                                    .padding(.leading, 16)
+                                ChatListNavLink(chat: chat)
+                                    .padding(.horizontal, 8)
+                                    .padding(.vertical, 6)
+                            }
                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .padding(.trailing, -16)
+                            .listRowSeparator(.hidden)
+                            .listRowInsets(EdgeInsets())
+                            .background { theme.colors.background } // Hides default list selection colour
                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
-                            .listRowBackground(Color.clear)
+                        }
                    }
-                    .offset(x: -8)
                }
                .listStyle(.plain)
                .onChange(of: chatModel.chatId) { currentChatId in
@@ -324,7 +341,7 @@ struct ChatListView: View {
 struct SubsStatusIndicator: View {
    @State private var subs: SMPServerSubs = SMPServerSubs.newSMPServerSubs
    @State private var hasSess: Bool = false
-    @State private var timer: Timer? = nil
+    @State private var task: Task<Void, Never>?
    @State private var showServersSummary = false

    @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false
@@ -341,11 +358,12 @@ struct SubsStatusIndicator: View {
                }
            }
        }
+        .disabled(ChatModel.shared.chatRunning != true)
        .onAppear {
-            startTimer()
+            startTask()
        }
        .onDisappear {
-            stopTimer()
+            stopTask()
        }
        .appSheet(isPresented: $showServersSummary) {
            ServersSummaryView()
@@ -353,25 +371,28 @@ struct SubsStatusIndicator: View {
        }
    }

-    private func startTimer() {
-        timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in
-            if AppChatState.shared.value == .active {
-                getSubsTotal()
+    private func startTask() {
+        task = Task {
+            while !Task.isCancelled {
+                if AppChatState.shared.value == .active {
+                    do {
+                        let (subs, hasSess) = try await getAgentSubsTotal()
+                        await MainActor.run {
+                            self.subs = subs
+                            self.hasSess = hasSess
+                        }
+                    } catch let error {
+                        logger.error("getSubsTotal error: \(responseError(error))")
+                    }
+                }
+                try? await Task.sleep(nanoseconds: 1_000_000_000) // Sleep for 1 second
            }
        }
    }

-    func stopTimer() {
-        timer?.invalidate()
-        timer = nil
-    }
-
-    private func getSubsTotal() {
-        do {
-            (subs, hasSess) = try getAgentSubsTotal()
-        } catch let error {
-            logger.error("getSubsTotal error: \(responseError(error))")
-        }
+    func stopTask() {
+        task?.cancel()
+        task = nil
    }
 }

@@ -497,21 +518,21 @@ func chatStoppedIcon() -> some View {
 struct ChatListView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
-        chatModel.chats = [
-            Chat(
+        chatModel.updateChats([
+            ChatData(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
            ),
-            Chat(
+            ChatData(
                chatInfo: ChatInfo.sampleData.group,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")]
            ),
-            Chat(
+            ChatData(
                chatInfo: ChatInfo.sampleData.contactRequest,
                chatItems: []
            )

-        ]
+        ])
        return Group {
            ChatListView(showSettings: Binding.constant(false))
                .environmentObject(chatModel)
@@ -376,17 +376,7 @@ struct ChatPreviewView: View {
        switch chat.chatInfo {
        case let .direct(contact):
            if contact.active && contact.activeConn != nil {
-                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
-                case .error:
-                    Image(systemName: "exclamationmark.circle")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
-                        .foregroundColor(theme.colors.secondary)
-                default:
-                    ProgressView()
-                }
+                NetworkStatusView(contact: contact, size: size)
            } else {
                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
            }
@@ -400,6 +390,30 @@ struct ChatPreviewView: View {
            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
        }
    }
+
+    struct NetworkStatusView: View {
+        @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+        @EnvironmentObject var theme: AppTheme
+        @ObservedObject var networkModel = NetworkModel.shared
+
+        let contact: Contact
+        let size: CGFloat
+
+        var body: some View {
+            let dynamicChatInfoSize = dynamicSize(userFont).chatInfoSize
+            switch (networkModel.contactNetworkStatus(contact)) {
+            case .connected: incognitoIcon(contact.contactConnIncognito, theme.colors.secondary, size: size)
+            case .error:
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
+                    .foregroundColor(theme.colors.secondary)
+            default:
+                ProgressView()
+            }
+        }
+    }
 }

@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color, size: CGFloat) -> some View {
@@ -16,7 +16,6 @@ struct ContactConnectionView: View {
    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
    @State private var localAlias = ""
    @FocusState private var aliasTextFieldFocused: Bool
-    @State private var showContactConnectionInfo = false

    var body: some View {
        if case let .contactConnection(conn) = chat.chatInfo {
@@ -32,7 +31,6 @@ struct ContactConnectionView: View {
                    .scaledToFill()
                    .frame(width: 48, height: 48)
                    .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground).asAnotherColorFromSecondaryVariant(theme))
-                    .onTapGesture { showContactConnectionInfo = true }
            }
            .frame(width: 63, height: 63)
            .padding(.leading, 4)
@@ -72,9 +70,6 @@ struct ContactConnectionView: View {
                Spacer()
            }
            .frame(maxHeight: .infinity)
-            .appSheet(isPresented: $showContactConnectionInfo) {
-                ContactConnectionInfo(contactConnection: contactConnection)
-            }
        }
    }
 }
@@ -85,15 +85,18 @@ struct UserPicker: View {
        .padding(8)
        .opacity(userPickerVisible ? 1.0 : 0.0)
        .onAppear {
-            do {
-                // 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))")
-            }
-        }
+             // This check prevents the call of listUsers after the app is suspended, and the database is closed.
+             if case .active = scenePhase {
+                 Task {
+                     do {
+                         let users = try await listUsersAsync()
+                         await MainActor.run { m.users = users }
+                     } catch {
+                         logger.error("Error loading users \(responseError(error))")
+                     }
+                 }
+             }
+         }
    }

    private func userView(_ u: UserInfo) -> some View {
@@ -56,7 +56,7 @@ struct ContactListNavLink: View {
    func recentContactNavLink(_ contact: Contact) -> some View {
        Button {
            dismissAllSheets(animated: true) {
-                ChatModel.shared.chatId = contact.id
+                ItemsModel.shared.loadOpenChat(contact.id)
            }
        } label: {
            contactPreview(contact, titleColor: theme.colors.onBackground)
@@ -82,11 +82,8 @@ struct ContactListNavLink: View {
        Button {
            Task {
                await MainActor.run {
-                    var updatedContact = contact
-                    updatedContact.chatDeleted = false
-                    ChatModel.shared.updateContact(updatedContact)
                    dismissAllSheets(animated: true) {
-                        ChatModel.shared.chatId = contact.id
+                        ItemsModel.shared.loadOpenChat(contact.id)
                    }
                }
            }
@@ -191,9 +188,7 @@ struct ContactListNavLink: View {
        Task {
            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
            if ok {
-                await MainActor.run {
-                    ChatModel.shared.chatId = contact.id
-                }
+                ItemsModel.shared.loadOpenChat(contact.id)
                DispatchQueue.main.async {
                    dismissAllSheets(animated: true) {
                        AlertManager.shared.showAlert(connReqSentAlert(.contact))
@@ -491,7 +491,7 @@ struct DatabaseView: View {
        appFilesCountAndSize = directoryFileCountAndSize(getAppFilesDirectory())
        do {
            let chats = try apiGetChats()
-            m.updateChats(with: chats)
+            m.updateChats(chats)
        } catch let error {
            logger.error("apiGetChats: cannot update chats \(responseError(error))")
        }
@@ -11,13 +11,22 @@ import SwiftUI
 import SimpleXChat

 struct ChatViewBackground: ViewModifier {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    var image: Image
    var imageType: WallpaperType
    var background: Color
    var tint: Color

    func body(content: Content) -> some View {
+        // Workaround a problem (SwiftUI bug?) when wallpaper is not updated when user changes global theme in iOS settings from dark to light and vice versa
+        if colorScheme == .light {
+            back(content)
+        } else {
+            back(content)
+        }
+    }
+
+    func back(_ content: Content) -> some View {
        content.background(
            Canvas { context, size in
                var image = context.resolve(image)
@@ -91,7 +100,7 @@ extension PresetWallpaper {
            scale
        } else if let type = ChatModel.shared.currentUser?.uiThemes?.preferredMode(base.mode == DefaultThemeMode.dark)?.wallpaper?.toAppWallpaper().type, type.sameType(WallpaperType.preset(filename, nil)) {
            type.scale
-        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename })?.wallpaper?.scale {
+        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename && $0.base == base })?.wallpaper?.scale {
            scale
        } else {
            Float(1.0)
@@ -1,21 +0,0 @@
-//
-//  KeyboardPadding.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 10/07/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-extension View {
-    @ViewBuilder func keyboardPadding() -> some View {
-        if #available(iOS 17.0, *) {
-            GeometryReader { g in
-                self.padding(.bottom, max(0, ChatModel.shared.keyboardHeight - g.safeAreaInsets.bottom))
-            }
-        } else {
-            self
-        }
-    }
-}
@@ -7,16 +7,17 @@
 //

 import SwiftUI
+import SimpleXChat

-struct NavLinkPlain<V: Hashable, Label: View>: View {
-    @State var tag: V
-    @Binding var selection: V?
+struct NavLinkPlain<Label: View>: View {
+    let chatId: ChatId
+    @Binding var selection: ChatId?
    @ViewBuilder var label: () -> Label
    var disabled = false

    var body: some View {
        ZStack {
-            Button("") { DispatchQueue.main.async { selection = tag } }
+            Button("") { ItemsModel.shared.loadOpenChat(chatId) }
                .disabled(disabled)
            label()
        }
@@ -65,8 +65,7 @@ struct LocalAuthView: View {
                // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                m.chatId = nil
                ItemsModel.shared.reversedChatItems = []
-                m.chats = []
-                m.popChatCollector.clear()
+                m.updateChats([])
                m.users = []
                _ = kcAppPassword.set(password)
                _ = kcSelfDestructPassword.remove()
@@ -37,7 +37,7 @@ struct AddGroupView: View {
                ) { _ in
                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                        dismissAllSheets(animated: true) {
-                            m.chatId = groupInfo.id
+                            ItemsModel.shared.loadOpenChat(groupInfo.id)
                        }
                    }
                }
@@ -52,14 +52,14 @@ struct AddGroupView: View {
                ) {
                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                        dismissAllSheets(animated: true) {
-                            m.chatId = groupInfo.id
+                            ItemsModel.shared.loadOpenChat(groupInfo.id)
                        }
                    }
                }
                .navigationBarTitle("Group link")
            }
        } else {
-            createGroupView().keyboardPadding()
+            createGroupView()
        }
    }

@@ -898,11 +898,11 @@ func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert:
            DispatchQueue.main.async {
                if dismiss {
                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
+                        ItemsModel.shared.loadOpenChat(c.id)
                        showAlreadyExistsAlert?()
                    }
                } else {
-                    m.chatId = c.id
+                    ItemsModel.shared.loadOpenChat(c.id)
                    showAlreadyExistsAlert?()
                }
            }
@@ -917,11 +917,11 @@ func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAler
            DispatchQueue.main.async {
                if dismiss {
                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
+                        ItemsModel.shared.loadOpenChat(g.id)
                        showAlreadyExistsAlert?()
                    }
                } else {
-                    m.chatId = g.id
+                    ItemsModel.shared.loadOpenChat(g.id)
                    showAlreadyExistsAlert?()
                }
            }
@@ -77,7 +77,6 @@ struct CreateProfile: View {
                focusDisplayName = true
            }
        }
-        .keyboardPadding()
    }
 }

@@ -128,7 +127,6 @@ struct CreateFirstProfile: View {
        }
        .padding()
        .frame(maxWidth: .infinity, alignment: .leading)
-        .keyboardPadding()
    }

    func onboardingButtons() -> some View {
@@ -1057,7 +1057,7 @@
      </trans-unit>
      <trans-unit id="Better networking" xml:space="preserve">
        <source>Better networking</source>
-        <target>Bessere Vernetzung</target>
+        <target>Kontrollieren Sie Ihr Netzwerk</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -802,7 +802,7 @@
      </trans-unit>
      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
        <source>Allow to send SimpleX links.</source>
-        <target>Permitir enviar enlaces SimpleX.</target>
+        <target>Se permite enviar enlaces SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -947,7 +947,7 @@
      </trans-unit>
      <trans-unit id="Archive contacts to chat later." xml:space="preserve">
        <source>Archive contacts to chat later.</source>
-        <target>Archivar contactos para charlar más tarde.</target>
+        <target>Archiva contactos para charlar más tarde.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archived contacts" xml:space="preserve">
@@ -1102,7 +1102,7 @@
      </trans-unit>
      <trans-unit id="Blur for better privacy." xml:space="preserve">
        <source>Blur for better privacy.</source>
-        <target>Difuminar para más privacidad.</target>
+        <target>Difumina para mayor privacidad.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Blur media" xml:space="preserve">
@@ -1617,7 +1617,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connection and servers status." xml:space="preserve">
        <source>Connection and servers status.</source>
-        <target>Estado de conexión y servidores.</target>
+        <target>Estado de tu conexión y servidores.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection error" xml:space="preserve">
@@ -2406,7 +2406,7 @@ This is your own one-time link!</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>No enviar historial a miembros nuevos.</target>
+        <target>No se envía el historial a los miembros nuevos.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
@@ -4819,7 +4819,7 @@ Requiere activación de la VPN.</target>
      </trans-unit>
      <trans-unit id="Pending" xml:space="preserve">
        <source>Pending</source>
-        <target>Pendiente</target>
+        <target>Pendientes</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">
@@ -5068,7 +5068,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
        <source>Prohibit sending SimpleX links.</source>
-        <target>No permitir el envío de enlaces SimpleX.</target>
+        <target>No se permite enviar enlaces SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -5125,7 +5125,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Proxied" xml:space="preserve">
        <source>Proxied</source>
-        <target>Con proxy</target>
+        <target>Como proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Proxied servers" xml:space="preserve">
@@ -5841,7 +5841,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </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>Enviar hasta 100 últimos mensajes a los miembros nuevos.</target>
+        <target>Se envían hasta 100 mensajes más recientes a los miembros nuevos.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
@@ -5906,7 +5906,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Sent directly" xml:space="preserve">
        <source>Sent directly</source>
-        <target>Enviado directamente</target>
+        <target>Directamente</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sent file event" xml:space="preserve">
@@ -5941,7 +5941,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Sent via proxy" xml:space="preserve">
        <source>Sent via proxy</source>
-        <target>Enviado vía proxy</target>
+        <target>Mediante proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
@@ -6538,7 +6538,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
      </trans-unit>
      <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
        <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
-        <target>La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .onion).</target>
+        <target>La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto si son .onion).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
@@ -7087,7 +7087,7 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
      </trans-unit>
      <trans-unit id="Use the app with one hand." xml:space="preserve">
        <source>Use the app with one hand.</source>
-        <target>Usa la aplicación con una mano.</target>
+        <target>Usa la aplicación con una sola mano.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
@@ -7449,7 +7449,7 @@ Repeat join request?</source>
      </trans-unit>
      <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
        <source>You can change it in Appearance settings.</source>
-        <target>Puede cambiarlo desde el menú Apariencia.</target>
+        <target>Puedes cambiar la posición de la barra desde el menú Apariencia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
@@ -8208,7 +8208,7 @@ Los servidores SimpleX no pueden ver tu perfil.</target>
      </trans-unit>
      <trans-unit id="expired" xml:space="preserve">
        <source>expired</source>
-        <target>expirado</target>
+        <target>expirados</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="forwarded" xml:space="preserve">
@@ -524,7 +524,7 @@
      </trans-unit>
      <trans-unit id="Abort" xml:space="preserve">
        <source>Abort</source>
-        <target>Annuler</target>
+        <target>Abandonner</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Abort changing address" xml:space="preserve">
@@ -752,6 +752,7 @@
      </trans-unit>
      <trans-unit id="Allow calls?" xml:space="preserve">
        <source>Allow calls?</source>
+        <target>Autoriser les appels ?</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">
@@ -941,15 +942,17 @@
      </trans-unit>
      <trans-unit id="Archive and upload" xml:space="preserve">
        <source>Archive and upload</source>
-        <target>Archiver et transférer</target>
+        <target>Archiver et téléverser</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archive contacts to chat later." xml:space="preserve">
        <source>Archive contacts to chat later.</source>
+        <target>Archiver les contacts pour discuter plus tard.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archived contacts" xml:space="preserve">
        <source>Archived contacts</source>
+        <target>Contacts archivés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archiving database" xml:space="preserve">
@@ -1054,6 +1057,7 @@
      </trans-unit>
      <trans-unit id="Better networking" xml:space="preserve">
        <source>Better networking</source>
+        <target>Meilleure gestion de réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1098,6 +1102,7 @@
      </trans-unit>
      <trans-unit id="Blur for better privacy." xml:space="preserve">
        <source>Blur for better privacy.</source>
+        <target>Rendez les images floues et protégez-les contre les regards indiscrets.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Blur media" xml:space="preserve">
@@ -1152,6 +1157,7 @@
      </trans-unit>
      <trans-unit id="Calls prohibited!" xml:space="preserve">
        <source>Calls prohibited!</source>
+        <target>Les appels ne sont pas autorisés !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Camera not available" xml:space="preserve">
@@ -1161,10 +1167,12 @@
      </trans-unit>
      <trans-unit id="Can't call contact" xml:space="preserve">
        <source>Can't call contact</source>
+        <target>Impossible d'appeler le contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Can't call member" xml:space="preserve">
        <source>Can't call member</source>
+        <target>Impossible d'appeler le membre</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1179,6 +1187,7 @@
      </trans-unit>
      <trans-unit id="Can't message member" xml:space="preserve">
        <source>Can't message member</source>
+        <target>Impossible d'envoyer un message à ce membre</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cancel" xml:space="preserve">
@@ -1294,6 +1303,7 @@
      </trans-unit>
      <trans-unit id="Chat database exported" xml:space="preserve">
        <source>Chat database exported</source>
+        <target>Exportation de la base de données des discussions</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chat database imported" xml:space="preserve">
@@ -1318,6 +1328,7 @@
      </trans-unit>
      <trans-unit id="Chat list" xml:space="preserve">
        <source>Chat list</source>
+        <target>Liste de discussion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1407,6 +1418,7 @@
      </trans-unit>
      <trans-unit id="Color chats with the new themes." xml:space="preserve">
        <source>Color chats with the new themes.</source>
+        <target>Colorez vos discussions avec les nouveaux thèmes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Color mode" xml:space="preserve">
@@ -1426,7 +1438,7 @@
      </trans-unit>
      <trans-unit id="Completed" xml:space="preserve">
        <source>Completed</source>
-        <target>Complété</target>
+        <target>Complétées</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1451,6 +1463,7 @@
      </trans-unit>
      <trans-unit id="Confirm contact deletion?" xml:space="preserve">
        <source>Confirm contact deletion?</source>
+        <target>Confirmer la suppression du contact ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Confirm database upgrades" xml:space="preserve">
@@ -1510,6 +1523,7 @@
      </trans-unit>
      <trans-unit id="Connect to your friends faster." xml:space="preserve">
        <source>Connect to your friends faster.</source>
+        <target>Connectez-vous à vos amis plus rapidement.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -1588,6 +1602,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
        <source>Connecting to contact, please wait or check later!</source>
+        <target>Connexion au contact, veuillez patienter ou vérifier plus tard !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting to desktop" xml:space="preserve">
@@ -1602,6 +1617,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Connection and servers status." xml:space="preserve">
        <source>Connection and servers status.</source>
+        <target>État de la connexion et des serveurs.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection error" xml:space="preserve">
@@ -1656,6 +1672,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Contact deleted!" xml:space="preserve">
        <source>Contact deleted!</source>
+        <target>Contact supprimé !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
@@ -1670,6 +1687,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Contact is deleted." xml:space="preserve">
        <source>Contact is deleted.</source>
+        <target>Le contact est supprimé.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact name" xml:space="preserve">
@@ -1684,6 +1702,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
        <source>Contact will be deleted - this cannot be undone!</source>
+        <target>Le contact sera supprimé - il n'est pas possible de revenir en arrière !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
@@ -1703,6 +1722,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Conversation deleted!" xml:space="preserve">
        <source>Conversation deleted!</source>
+        <target>Conversation supprimée !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Copy" xml:space="preserve">
@@ -1792,7 +1812,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Created" xml:space="preserve">
        <source>Created</source>
-        <target>Créé</target>
+        <target>Créées</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Created at" xml:space="preserve">
@@ -2046,6 +2066,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Delete contact?" xml:space="preserve">
        <source>Delete contact?</source>
+        <target>Supprimer le contact ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -2155,6 +2176,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
        <source>Delete up to 20 messages at once.</source>
+        <target>Supprimez jusqu'à 20 messages à la fois.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -2164,11 +2186,12 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Delete without notification" xml:space="preserve">
        <source>Delete without notification</source>
+        <target>Supprimer sans notification</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Deleted" xml:space="preserve">
        <source>Deleted</source>
-        <target>Supprimé</target>
+        <target>Supprimées</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Deleted at" xml:space="preserve">
@@ -2253,6 +2276,7 @@ Il s'agit de votre propre lien unique !</target>
      </trans-unit>
      <trans-unit id="Developer options" xml:space="preserve">
        <source>Developer options</source>
+        <target>Options pour les développeurs</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Developer tools" xml:space="preserve">
@@ -3815,6 +3839,7 @@ Erreur : %2$@</target>
      </trans-unit>
      <trans-unit id="It protects your IP address and connections." xml:space="preserve">
        <source>It protects your IP address and connections.</source>
+        <target>Il protège votre adresse IP et vos connexions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
@@ -3881,6 +3906,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Keep conversation" xml:space="preserve">
        <source>Keep conversation</source>
+        <target>Garder la conversation</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">
@@ -4060,6 +4086,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Media &amp; file servers" xml:space="preserve">
        <source>Media &amp; file servers</source>
+        <target>Serveurs de fichiers et de médias</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Medium" xml:space="preserve">
@@ -4154,6 +4181,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Message servers" xml:space="preserve">
        <source>Message servers</source>
+        <target>Serveurs de messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4368,6 +4396,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="New chat experience 🎉" xml:space="preserve">
        <source>New chat experience 🎉</source>
+        <target>Nouvelle expérience de discussion 🎉</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
@@ -4402,6 +4431,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="New media options" xml:space="preserve">
        <source>New media options</source>
+        <target>Nouvelles options de médias</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="New member role" xml:space="preserve">
@@ -4574,6 +4604,7 @@ Nécessite l'activation d'un VPN.</target>
      </trans-unit>
      <trans-unit id="Only delete conversation" xml:space="preserve">
        <source>Only delete conversation</source>
+        <target>Ne supprimer que la conversation</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -4813,10 +4844,12 @@ Nécessite l'activation d'un VPN.</target>
      </trans-unit>
      <trans-unit id="Play from the chat list." xml:space="preserve">
        <source>Play from the chat list.</source>
+        <target>Aperçu depuis la liste de conversation.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
        <source>Please ask your contact to enable calls.</source>
+        <target>Veuillez demander à votre contact d'autoriser les appels.</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">
@@ -5122,6 +5155,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Reachable chat toolbar" xml:space="preserve">
        <source>Reachable chat toolbar</source>
+        <target>Barre d'outils accessible</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
@@ -5397,6 +5431,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Reset all hints" xml:space="preserve">
        <source>Reset all hints</source>
+        <target>Rétablir tous les conseils</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -5531,6 +5566,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Save and reconnect" xml:space="preserve">
        <source>Save and reconnect</source>
+        <target>Sauvegarder et se reconnecter</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and update group profile" xml:space="preserve">
@@ -5675,7 +5711,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Secured" xml:space="preserve">
        <source>Secured</source>
-        <target>Sécurisé</target>
+        <target>Sécurisées</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Security assessment" xml:space="preserve">
@@ -5755,7 +5791,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Send link previews" xml:space="preserve">
        <source>Send link previews</source>
-        <target>Envoi d'aperçus de liens</target>
+        <target>Aperçu des liens</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send live message" xml:space="preserve">
@@ -5765,6 +5801,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Send message to enable calls." xml:space="preserve">
        <source>Send message to enable calls.</source>
+        <target>Envoyer un message pour activer les appels.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
@@ -5929,7 +5966,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Server requires authorization to upload, check password" xml:space="preserve">
        <source>Server requires authorization to upload, check password</source>
-        <target>Le serveur requiert une autorisation pour uploader, vérifiez le mot de passe</target>
+        <target>Le serveur requiert une autorisation pour téléverser, vérifiez le mot de passe</target>
        <note>server test error</note>
      </trans-unit>
      <trans-unit id="Server test failed!" xml:space="preserve">
@@ -6054,6 +6091,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Share from other apps." xml:space="preserve">
        <source>Share from other apps.</source>
+        <target>Partager depuis d'autres applications.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share link" xml:space="preserve">
@@ -6093,7 +6131,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Show last messages" xml:space="preserve">
        <source>Show last messages</source>
-        <target>Voir les derniers messages</target>
+        <target>Aperçu des derniers messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Show message status" xml:space="preserve">
@@ -6108,7 +6146,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
-        <target>Afficher l'aperçu</target>
+        <target>Aperçu affiché</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
@@ -6228,6 +6266,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
+        <target>Certains fichiers n'ont pas été exportés :</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
@@ -6237,6 +6276,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
        <source>Some non-fatal errors occurred during import:</source>
+        <target>L'importation a entraîné des erreurs non fatales :</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Somebody" xml:space="preserve">
@@ -6346,7 +6386,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="Subscribed" xml:space="preserve">
        <source>Subscribed</source>
-        <target>Inscrit</target>
+        <target>Inscriptions</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Subscription errors" xml:space="preserve">
@@ -6376,6 +6416,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      </trans-unit>
      <trans-unit id="TCP connection" xml:space="preserve">
        <source>TCP connection</source>
+        <target>Connexion TCP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="TCP connection timeout" xml:space="preserve">
@@ -6739,6 +6780,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
      </trans-unit>
      <trans-unit id="Toggle chat list:" xml:space="preserve">
        <source>Toggle chat list:</source>
+        <target>Afficher la liste des conversations :</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6748,6 +6790,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
      </trans-unit>
      <trans-unit id="Toolbar opacity" xml:space="preserve">
        <source>Toolbar opacity</source>
+        <target>Opacité de la barre d'outils</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Total" xml:space="preserve">
@@ -6934,6 +6977,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Update settings?" xml:space="preserve">
        <source>Update settings?</source>
+        <target>Mettre à jour les paramètres ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -6958,7 +7002,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Upload file" xml:space="preserve">
        <source>Upload file</source>
-        <target>Transférer le fichier</target>
+        <target>Téléverser le fichier</target>
        <note>server test step</note>
      </trans-unit>
      <trans-unit id="Uploaded" xml:space="preserve">
@@ -7043,6 +7087,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Use the app with one hand." xml:space="preserve">
        <source>Use the app with one hand.</source>
+        <target>Utiliser l'application d'une main.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
@@ -7112,7 +7157,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Video will be received when your contact completes uploading it." xml:space="preserve">
        <source>Video will be received when your contact completes uploading it.</source>
-        <target>La vidéo ne sera reçue que lorsque votre contact aura fini de la transférer.</target>
+        <target>La vidéo ne sera reçue que lorsque votre contact aura fini la mettre en ligne.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Video will be received when your contact is online, please wait or check later!" xml:space="preserve">
@@ -7404,6 +7449,7 @@ Répéter la demande d'adhésion ?</target>
      </trans-unit>
      <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
        <source>You can change it in Appearance settings.</source>
+        <target>Vous pouvez choisir de le modifier dans les paramètres d'apparence.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
@@ -7443,6 +7489,7 @@ Répéter la demande d'adhésion ?</target>
      </trans-unit>
      <trans-unit id="You can send messages to %@ from Archived contacts." xml:space="preserve">
        <source>You can send messages to %@ from Archived contacts.</source>
+        <target>Vous pouvez envoyer des messages à %@ à partir des contacts archivés.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -7472,6 +7519,7 @@ Répéter la demande d'adhésion ?</target>
      </trans-unit>
      <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
        <source>You can still view conversation with %@ in the list of chats.</source>
+        <target>Vous pouvez toujours voir la conversation avec %@ dans la liste des discussions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -7538,10 +7586,12 @@ Répéter la demande de connexion ?</target>
      </trans-unit>
      <trans-unit id="You may migrate the exported database." xml:space="preserve">
        <source>You may migrate the exported database.</source>
+        <target>Vous pouvez migrer la base de données exportée.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You may save the exported archive." xml:space="preserve">
        <source>You may save the exported archive.</source>
+        <target>Vous pouvez enregistrer l'archive exportée.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
@@ -7551,6 +7601,7 @@ Répéter la demande de connexion ?</target>
      </trans-unit>
      <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
        <source>You need to allow your contact to call to be able to call them.</source>
+        <target>Vous devez autoriser votre contact à appeler pour pouvoir l'appeler.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -7862,6 +7913,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="call" xml:space="preserve">
        <source>call</source>
+        <target>appeler</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="call error" xml:space="preserve">
@@ -8236,6 +8288,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="invite" xml:space="preserve">
        <source>invite</source>
+        <target>inviter</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="invited" xml:space="preserve">
@@ -8295,6 +8348,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="message" xml:space="preserve">
        <source>message</source>
+        <target>message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="message received" xml:space="preserve">
@@ -8329,6 +8383,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="mute" xml:space="preserve">
        <source>mute</source>
+        <target>muet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="never" xml:space="preserve">
@@ -8465,6 +8520,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="search" xml:space="preserve">
        <source>search</source>
+        <target>rechercher</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
@@ -8553,6 +8609,7 @@ dernier message reçu : %2$@</target>
      </trans-unit>
      <trans-unit id="unmute" xml:space="preserve">
        <source>unmute</source>
+        <target>démuter</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="unprotected" xml:space="preserve">
@@ -8602,6 +8659,7 @@ dernier message reçu : %2$@</target>
      </trans-unit>
      <trans-unit id="video" xml:space="preserve">
        <source>video</source>
+        <target>vidéo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
@@ -8944,10 +9002,12 @@ dernier message reçu : %2$@</target>
      </trans-unit>
      <trans-unit id="Sending a message takes longer than expected." xml:space="preserve">
        <source>Sending a message takes longer than expected.</source>
+        <target>L'envoi d'un message prend plus de temps que prévu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending message…" xml:space="preserve">
        <source>Sending message…</source>
+        <target>Envoi du message…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -8957,6 +9017,7 @@ dernier message reçu : %2$@</target>
      </trans-unit>
      <trans-unit id="Slow network?" xml:space="preserve">
        <source>Slow network?</source>
+        <target>Réseau lent ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unknown database error: %@" xml:space="preserve">
@@ -8971,6 +9032,7 @@ dernier message reçu : %2$@</target>
      </trans-unit>
      <trans-unit id="Wait" xml:space="preserve">
        <source>Wait</source>
+        <target>Attendez</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
@@ -219,12 +219,12 @@
      </trans-unit>
      <trans-unit id="%lld messages blocked" xml:space="preserve">
        <source>%lld messages blocked</source>
-        <target>%lld üzenet blokkolva</target>
+        <target>%lld üzenet letiltva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld messages blocked by admin" xml:space="preserve">
        <source>%lld messages blocked by admin</source>
-        <target>%lld üzenet blokkolva az admin által</target>
+        <target>%lld üzenet letiltva az admin által</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
@@ -1042,7 +1042,7 @@
      </trans-unit>
      <trans-unit id="Bad message hash" xml:space="preserve">
        <source>Bad message hash</source>
-        <target>Téves üzenet hash</target>
+        <target>Hibás az üzenet ellenőrzőösszege</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1067,7 +1067,7 @@
      </trans-unit>
      <trans-unit id="Block" xml:space="preserve">
        <source>Block</source>
-        <target>Blokkolás</target>
+        <target>Letiltás</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block for all" xml:space="preserve">
@@ -1077,12 +1077,12 @@
      </trans-unit>
      <trans-unit id="Block group members" xml:space="preserve">
        <source>Block group members</source>
-        <target>Csoporttagok blokkolása</target>
+        <target>Csoporttagok letiltása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block member" xml:space="preserve">
        <source>Block member</source>
-        <target>Tag blokkolása</target>
+        <target>Tag letiltása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block member for all?" xml:space="preserve">
@@ -1092,7 +1092,7 @@
      </trans-unit>
      <trans-unit id="Block member?" xml:space="preserve">
        <source>Block member?</source>
-        <target>Tag blokkolása?</target>
+        <target>Tag letiltása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Blocked by admin" xml:space="preserve">
@@ -2131,7 +2131,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Delete member message?" xml:space="preserve">
        <source>Delete member message?</source>
-        <target>Csoporttag üzenet törlése?</target>
+        <target>Csoporttag üzenetének törlése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete message?" xml:space="preserve">
@@ -2221,7 +2221,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
        <source>Delivery receipts!</source>
-        <target>Kézbesítési igazolások!</target>
+        <target>Üzenet kézbesítési jelentések!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
@@ -2681,12 +2681,12 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
-        <target>Üdvözlő üzenetet megadása…</target>
+        <target>Üdvözlő üzenet megadása…</target>
        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="Enter welcome message… (optional)" xml:space="preserve">
        <source>Enter welcome message… (optional)</source>
-        <target>Üdvözlő üzenetet megadása… (opcionális)</target>
+        <target>Üdvözlő üzenet megadása… (opcionális)</target>
        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="Enter your name…" xml:space="preserve">
@@ -2961,7 +2961,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
-        <target>Hiba a kapcsolat szinkronizálása során</target>
+        <target>Hiba a kapcsolat szinkronizálása közben</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
@@ -3541,7 +3541,7 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
-        <target>Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás során, vagy ossza meg a hivatkozást.</target>
+        <target>Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
@@ -4131,7 +4131,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Message delivery receipts!" xml:space="preserve">
        <source>Message delivery receipts!</source>
-        <target>Üzenetkézbesítési bizonylatok!</target>
+        <target>Üzenet kézbesítési jelentések!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message delivery warning" xml:space="preserve">
@@ -4176,7 +4176,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Message reception" xml:space="preserve">
        <source>Message reception</source>
-        <target>Üzenetjelentés</target>
+        <target>Üzenet kézbesítési jelentés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message servers" xml:space="preserve">
@@ -5971,7 +5971,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Server test failed!" xml:space="preserve">
        <source>Server test failed!</source>
-        <target>Sikertelen kiszolgáló-teszt!</target>
+        <target>Sikertelen kiszolgáló teszt!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Server type" xml:space="preserve">
@@ -6271,12 +6271,12 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
-        <target>Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.</target>
+        <target>Néhány nem végzetes hiba történt az importálás közben – további részletekért a csevegési konzolban olvashat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
        <source>Some non-fatal errors occurred during import:</source>
-        <target>Néhány nem végzetes hiba történt az importálás során:</target>
+        <target>Néhány nem végzetes hiba történt az importálás közben:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Somebody" xml:space="preserve">
@@ -6573,7 +6573,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The hash of the previous message is different." xml:space="preserve">
        <source>The hash of the previous message is different.</source>
-        <target>Az előző üzenet hash-e más.</target>
+        <target>Az előző üzenet ellenőrzőösszege különbözik.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The message will be deleted for all members." xml:space="preserve">
@@ -6603,7 +6603,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The old database was not removed during the migration, it can be deleted." xml:space="preserve">
        <source>The old database was not removed during the migration, it can be deleted.</source>
-        <target>A régi adatbázis nem került eltávolításra az átköltöztetés során, így törölhető.</target>
+        <target>A régi adatbázis nem került eltávolításra az átköltöztetés közben, így törölhető.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
@@ -7888,17 +7888,17 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="bad message hash" xml:space="preserve">
        <source>bad message hash</source>
-        <target>téves üzenet hash</target>
+        <target>hibás az üzenet ellenőrzőösszege</target>
        <note>integrity error chat item</note>
      </trans-unit>
      <trans-unit id="blocked" xml:space="preserve">
        <source>blocked</source>
-        <target>blokkolva</target>
+        <target>letiltva</target>
        <note>marked deleted chat item preview text</note>
      </trans-unit>
      <trans-unit id="blocked %@" xml:space="preserve">
        <source>blocked %@</source>
-        <target>letiltotta őt: %@</target>
+        <target>letiltotta %@-t</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="blocked by admin" xml:space="preserve">
@@ -8490,7 +8490,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="removed %@" xml:space="preserve">
        <source>removed %@</source>
-        <target>%@ eltávolítva</target>
+        <target>eltávolította őt: %@</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="removed contact address" xml:space="preserve">
@@ -8589,7 +8589,7 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="unblocked %@" xml:space="preserve">
        <source>unblocked %@</source>
-        <target>%@ feloldva</target>
+        <target>feloldotta %@ letiltását</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="unknown" xml:space="preserve">
@@ -8714,7 +8714,7 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="you blocked %@" xml:space="preserve">
        <source>you blocked %@</source>
-        <target>blokkolta őt: %@</target>
+        <target>ön letiltotta %@-t</target>
        <note>snd group event chat item</note>
      </trans-unit>
      <trans-unit id="you changed address" xml:space="preserve">
@@ -8759,7 +8759,7 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="you unblocked %@" xml:space="preserve">
        <source>you unblocked %@</source>
-        <target>feloldotta %@ blokkolását</target>
+        <target>ön feloldotta %@ letiltását</target>
        <note>snd group event chat item</note>
      </trans-unit>
      <trans-unit id="you: " xml:space="preserve">
@@ -1617,7 +1617,7 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Connection and servers status." xml:space="preserve">
        <source>Connection and servers status.</source>
-        <target>Stato di connessione e server.</target>
+        <target>Stato della connessione e dei server.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection error" xml:space="preserve">
@@ -6780,7 +6780,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
      </trans-unit>
      <trans-unit id="Toggle chat list:" xml:space="preserve">
        <source>Toggle chat list:</source>
-        <target>Cambia elenco chat:</target>
+        <target>Cambia l'elenco delle chat:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -3906,7 +3906,7 @@ Dit is jouw link voor groep %@!</target>
      </trans-unit>
      <trans-unit id="Keep conversation" xml:space="preserve">
        <source>Keep conversation</source>
-        <target>Blijf in gesprek</target>
+        <target>Behoud het gesprek</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">
@@ -752,6 +752,7 @@
      </trans-unit>
      <trans-unit id="Allow calls?" xml:space="preserve">
        <source>Allow calls?</source>
+        <target>Zezwolić na połączenia?</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">
@@ -791,6 +792,7 @@
      </trans-unit>
      <trans-unit id="Allow sharing" xml:space="preserve">
        <source>Allow sharing</source>
+        <target>Zezwól na udostępnianie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -945,10 +947,12 @@
      </trans-unit>
      <trans-unit id="Archive contacts to chat later." xml:space="preserve">
        <source>Archive contacts to chat later.</source>
+        <target>Archiwizuj kontakty aby porozmawiać później.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archived contacts" xml:space="preserve">
        <source>Archived contacts</source>
+        <target>Zarchiwizowane kontakty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Archiving database" xml:space="preserve">
@@ -1053,6 +1057,7 @@
      </trans-unit>
      <trans-unit id="Better networking" xml:space="preserve">
        <source>Better networking</source>
+        <target>Lepsze sieciowanie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1097,10 +1102,12 @@
      </trans-unit>
      <trans-unit id="Blur for better privacy." xml:space="preserve">
        <source>Blur for better privacy.</source>
+        <target>Rozmycie dla lepszej prywatności.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Blur media" xml:space="preserve">
        <source>Blur media</source>
+        <target>Rozmycie mediów</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -1150,6 +1157,7 @@
      </trans-unit>
      <trans-unit id="Calls prohibited!" xml:space="preserve">
        <source>Calls prohibited!</source>
+        <target>Połączenia zakazane!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Camera not available" xml:space="preserve">
@@ -1159,10 +1167,12 @@
      </trans-unit>
      <trans-unit id="Can't call contact" xml:space="preserve">
        <source>Can't call contact</source>
+        <target>Nie można zadzwonić do kontaktu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Can't call member" xml:space="preserve">
        <source>Can't call member</source>
+        <target>Nie można zadzwonić do członka</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1177,6 +1187,7 @@
      </trans-unit>
      <trans-unit id="Can't message member" xml:space="preserve">
        <source>Can't message member</source>
+        <target>Nie można wysłać wiadomości do członka</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cancel" xml:space="preserve">
@@ -1292,6 +1303,7 @@
      </trans-unit>
      <trans-unit id="Chat database exported" xml:space="preserve">
        <source>Chat database exported</source>
+        <target>Wyeksportowano bazę danych czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chat database imported" xml:space="preserve">
@@ -1316,6 +1328,7 @@
      </trans-unit>
      <trans-unit id="Chat list" xml:space="preserve">
        <source>Chat list</source>
+        <target>Lista czatów</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1405,6 +1418,7 @@
      </trans-unit>
      <trans-unit id="Color chats with the new themes." xml:space="preserve">
        <source>Color chats with the new themes.</source>
+        <target>Koloruj czaty z nowymi motywami.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Color mode" xml:space="preserve">
@@ -1449,6 +1463,7 @@
      </trans-unit>
      <trans-unit id="Confirm contact deletion?" xml:space="preserve">
        <source>Confirm contact deletion?</source>
+        <target>Potwierdzić usunięcie kontaktu?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Confirm database upgrades" xml:space="preserve">
@@ -1508,6 +1523,7 @@
      </trans-unit>
      <trans-unit id="Connect to your friends faster." xml:space="preserve">
        <source>Connect to your friends faster.</source>
+        <target>Szybciej łącz się ze znajomymi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -1586,6 +1602,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
        <source>Connecting to contact, please wait or check later!</source>
+        <target>Łączenie z kontaktem, poczekaj lub sprawdź później!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting to desktop" xml:space="preserve">
@@ -1600,6 +1617,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Connection and servers status." xml:space="preserve">
        <source>Connection and servers status.</source>
+        <target>Stan połączenia i serwerów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection error" xml:space="preserve">
@@ -1614,6 +1632,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Connection notifications" xml:space="preserve">
        <source>Connection notifications</source>
+        <target>Powiadomienia o połączeniu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
@@ -1653,6 +1672,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Contact deleted!" xml:space="preserve">
        <source>Contact deleted!</source>
+        <target>Kontakt usunięty!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
@@ -1667,6 +1687,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Contact is deleted." xml:space="preserve">
        <source>Contact is deleted.</source>
+        <target>Kontakt jest usunięty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact name" xml:space="preserve">
@@ -1681,6 +1702,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
        <source>Contact will be deleted - this cannot be undone!</source>
+        <target>Kontakt zostanie usunięty – nie można tego cofnąć!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contacts" xml:space="preserve">
@@ -1700,6 +1722,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Conversation deleted!" xml:space="preserve">
        <source>Conversation deleted!</source>
+        <target>Rozmowa usunięta!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Copy" xml:space="preserve">
@@ -1978,6 +2001,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
        <source>Delete %lld messages of members?</source>
+        <target>Usunąć %lld wiadomości członków?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete %lld messages?" xml:space="preserve">
@@ -2042,6 +2066,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Delete contact?" xml:space="preserve">
        <source>Delete contact?</source>
+        <target>Usunąć kontakt?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -2151,6 +2176,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
        <source>Delete up to 20 messages at once.</source>
+        <target>Usuń do 20 wiadomości na raz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -2160,6 +2186,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Delete without notification" xml:space="preserve">
        <source>Delete without notification</source>
+        <target>Usuń bez powiadomienia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Deleted" xml:space="preserve">
@@ -2219,6 +2246,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Destination server address of %@ is incompatible with forwarding server %@ settings." xml:space="preserve">
        <source>Destination server address of %@ is incompatible with forwarding server %@ settings.</source>
+        <target>Adres serwera docelowego %@ jest niekompatybilny z ustawieniami serwera przekazującego %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Destination server error: %@" xml:space="preserve">
@@ -2228,6 +2256,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Destination server version of %@ is incompatible with forwarding server %@." xml:space="preserve">
        <source>Destination server version of %@ is incompatible with forwarding server %@.</source>
+        <target>Wersja serwera docelowego %@ jest niekompatybilna z serwerem przekierowującym %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Detailed statistics" xml:space="preserve">
@@ -2247,6 +2276,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Developer options" xml:space="preserve">
        <source>Developer options</source>
+        <target>Opcje deweloperskie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Developer tools" xml:space="preserve">
@@ -2301,6 +2331,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Disabled" xml:space="preserve">
        <source>Disabled</source>
+        <target>Wyłączony</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
@@ -2530,6 +2561,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Enabled" xml:space="preserve">
        <source>Enabled</source>
+        <target>Włączony</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Enabled for" xml:space="preserve">
@@ -2704,6 +2736,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
+        <target>Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error creating address" xml:space="preserve">
@@ -3209,14 +3242,17 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
+        <target>Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarding server address is incompatible with network settings: %@." xml:space="preserve">
        <source>Forwarding server address is incompatible with network settings: %@.</source>
+        <target>Adres serwera przekierowującego jest niekompatybilny z ustawieniami sieciowymi: %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarding server version is incompatible with network settings: %@." xml:space="preserve">
        <source>Forwarding server version is incompatible with network settings: %@.</source>
+        <target>Wersja serwera przekierowującego jest niekompatybilna z ustawieniami sieciowymi: %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
@@ -3803,6 +3839,7 @@ Błąd: %2$@</target>
      </trans-unit>
      <trans-unit id="It protects your IP address and connections." xml:space="preserve">
        <source>It protects your IP address and connections.</source>
+        <target>Chroni Twój adres IP i połączenia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
@@ -3869,6 +3906,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Keep conversation" xml:space="preserve">
        <source>Keep conversation</source>
+        <target>Zachowaj rozmowę</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">
@@ -4048,10 +4086,12 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Media &amp; file servers" xml:space="preserve">
        <source>Media &amp; file servers</source>
+        <target>Serwery mediów i plików</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Medium" xml:space="preserve">
        <source>Medium</source>
+        <target>Średni</target>
        <note>blur media</note>
      </trans-unit>
      <trans-unit id="Member" xml:space="preserve">
@@ -4141,6 +4181,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Message servers" xml:space="preserve">
        <source>Message servers</source>
+        <target>Serwery wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4355,6 +4396,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="New chat experience 🎉" xml:space="preserve">
        <source>New chat experience 🎉</source>
+        <target>Nowe możliwości czatu 🎉</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
@@ -4389,6 +4431,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="New media options" xml:space="preserve">
        <source>New media options</source>
+        <target>Nowe opcje mediów</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="New member role" xml:space="preserve">
@@ -4483,6 +4526,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Nothing selected" xml:space="preserve">
        <source>Nothing selected</source>
+        <target>Nic nie jest zaznaczone</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
@@ -4560,6 +4604,7 @@ Wymaga włączenia VPN.</target>
      </trans-unit>
      <trans-unit id="Only delete conversation" xml:space="preserve">
        <source>Only delete conversation</source>
+        <target>Usuń tylko rozmowę</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -4799,10 +4844,12 @@ Wymaga włączenia VPN.</target>
      </trans-unit>
      <trans-unit id="Play from the chat list." xml:space="preserve">
        <source>Play from the chat list.</source>
+        <target>Odtwórz z listy czatów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
        <source>Please ask your contact to enable calls.</source>
+        <target>Poproś kontakt o włącznie połączeń.</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">
@@ -5108,6 +5155,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Reachable chat toolbar" xml:space="preserve">
        <source>Reachable chat toolbar</source>
+        <target>Osiągalny pasek narzędzi czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
@@ -5383,6 +5431,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Reset all hints" xml:space="preserve">
        <source>Reset all hints</source>
+        <target>Zresetuj wszystkie wskazówki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -5517,6 +5566,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Save and reconnect" xml:space="preserve">
        <source>Save and reconnect</source>
+        <target>Zapisz i połącz ponownie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save and update group profile" xml:space="preserve">
@@ -5681,6 +5731,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
+        <target>Zaznaczono %lld</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
@@ -5750,6 +5801,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Send message to enable calls." xml:space="preserve">
        <source>Send message to enable calls.</source>
+        <target>Wyślij wiadomość aby włączyć połączenia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
@@ -6039,6 +6091,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Share from other apps." xml:space="preserve">
        <source>Share from other apps.</source>
+        <target>Udostępnij z innych aplikacji.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share link" xml:space="preserve">
@@ -6053,6 +6106,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Share to SimpleX" xml:space="preserve">
        <source>Share to SimpleX</source>
+        <target>Udostępnij do SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -6207,10 +6261,12 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Soft" xml:space="preserve">
        <source>Soft</source>
+        <target>Łagodny</target>
        <note>blur media</note>
      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
+        <target>Niektóre plik(i) nie zostały wyeksportowane:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
@@ -6220,6 +6276,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
        <source>Some non-fatal errors occurred during import:</source>
+        <target>Podczas importu wystąpiły niekrytyczne błędy:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Somebody" xml:space="preserve">
@@ -6319,6 +6376,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Strong" xml:space="preserve">
        <source>Strong</source>
+        <target>Silne</target>
        <note>blur media</note>
      </trans-unit>
      <trans-unit id="Submit" xml:space="preserve">
@@ -6358,6 +6416,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="TCP connection" xml:space="preserve">
        <source>TCP connection</source>
+        <target>Połączenie TCP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="TCP connection timeout" xml:space="preserve">
@@ -6529,10 +6588,12 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
      </trans-unit>
      <trans-unit id="The messages will be deleted for all members." xml:space="preserve">
        <source>The messages will be deleted for all members.</source>
+        <target>Wiadomości zostaną usunięte dla wszystkich członków.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The messages will be marked as moderated for all members." xml:space="preserve">
        <source>The messages will be marked as moderated for all members.</source>
+        <target>Wiadomości zostaną oznaczone jako moderowane dla wszystkich członków.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The next generation of private messaging" xml:space="preserve">
@@ -6719,6 +6780,7 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
      </trans-unit>
      <trans-unit id="Toggle chat list:" xml:space="preserve">
        <source>Toggle chat list:</source>
+        <target>Przełącz listę czatów:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6728,6 +6790,7 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
      </trans-unit>
      <trans-unit id="Toolbar opacity" xml:space="preserve">
        <source>Toolbar opacity</source>
+        <target>Nieprzezroczystość paska narzędzi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Total" xml:space="preserve">
@@ -6914,6 +6977,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="Update settings?" xml:space="preserve">
        <source>Update settings?</source>
+        <target>Zaktualizować ustawienia?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -7023,6 +7087,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="Use the app with one hand." xml:space="preserve">
        <source>Use the app with one hand.</source>
+        <target>Korzystaj z aplikacji jedną ręką.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
@@ -7384,6 +7449,7 @@ Powtórzyć prośbę dołączenia?</target>
      </trans-unit>
      <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
        <source>You can change it in Appearance settings.</source>
+        <target>Możesz to zmienić w ustawieniach wyglądu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
@@ -7423,6 +7489,7 @@ Powtórzyć prośbę dołączenia?</target>
      </trans-unit>
      <trans-unit id="You can send messages to %@ from Archived contacts." xml:space="preserve">
        <source>You can send messages to %@ from Archived contacts.</source>
+        <target>Możesz wysyłać wiadomości do %@ ze zarchiwizowanych kontaktów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -7452,6 +7519,7 @@ Powtórzyć prośbę dołączenia?</target>
      </trans-unit>
      <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
        <source>You can still view conversation with %@ in the list of chats.</source>
+        <target>Nadal możesz przeglądać rozmowę z %@ na liście czatów.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -7518,10 +7586,12 @@ Powtórzyć prośbę połączenia?</target>
      </trans-unit>
      <trans-unit id="You may migrate the exported database." xml:space="preserve">
        <source>You may migrate the exported database.</source>
+        <target>Możesz zmigrować wyeksportowaną bazy danych.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You may save the exported archive." xml:space="preserve">
        <source>You may save the exported archive.</source>
+        <target>Możesz zapisać wyeksportowane archiwum.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
@@ -7531,6 +7601,7 @@ Powtórzyć prośbę połączenia?</target>
      </trans-unit>
      <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
        <source>You need to allow your contact to call to be able to call them.</source>
+        <target>Aby móc dzwonić, musisz zezwolić kontaktowi na połączenia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -7842,6 +7913,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="call" xml:space="preserve">
        <source>call</source>
+        <target>zadzwoń</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="call error" xml:space="preserve">
@@ -8216,6 +8288,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="invite" xml:space="preserve">
        <source>invite</source>
+        <target>zaproś</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="invited" xml:space="preserve">
@@ -8275,6 +8348,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="message" xml:space="preserve">
        <source>message</source>
+        <target>wiadomość</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="message received" xml:space="preserve">
@@ -8309,6 +8383,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="mute" xml:space="preserve">
        <source>mute</source>
+        <target>wycisz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="never" xml:space="preserve">
@@ -8445,6 +8520,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="search" xml:space="preserve">
        <source>search</source>
+        <target>szukaj</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
@@ -8533,6 +8609,7 @@ ostatnia otrzymana wiadomość: %2$@</target>
      </trans-unit>
      <trans-unit id="unmute" xml:space="preserve">
        <source>unmute</source>
+        <target>wyłącz wyciszenie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="unprotected" xml:space="preserve">
@@ -8582,6 +8659,7 @@ ostatnia otrzymana wiadomość: %2$@</target>
      </trans-unit>
      <trans-unit id="video" xml:space="preserve">
        <source>video</source>
+        <target>wideo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
@@ -8762,14 +8840,17 @@ ostatnia otrzymana wiadomość: %2$@</target>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
        <source>SimpleX SE</source>
+        <target>SimpleX SE</target>
        <note>Bundle display name</note>
      </trans-unit>
      <trans-unit id="CFBundleName" xml:space="preserve">
        <source>SimpleX SE</source>
+        <target>SimpleX SE</target>
        <note>Bundle name</note>
      </trans-unit>
      <trans-unit id="NSHumanReadableCopyright" xml:space="preserve">
        <source>Copyright © 2024 SimpleX Chat. All rights reserved.</source>
+        <target>Copyright © 2024 SimpleX Chat. Wszelkie prawa zastrzeżone.</target>
        <note>Copyright (human-readable)</note>
      </trans-unit>
    </body>
@@ -8781,150 +8862,187 @@ ostatnia otrzymana wiadomość: %2$@</target>
    <body>
      <trans-unit id="%@" xml:space="preserve">
        <source>%@</source>
+        <target>%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="App is locked!" xml:space="preserve">
        <source>App is locked!</source>
+        <target>Aplikacja zablokowana!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
+        <target>Anuluj</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
        <source>Cannot access keychain to save database password</source>
+        <target>Nie można uzyskać dostępu do pęku kluczy aby zapisać hasło do bazy danych</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cannot forward message" xml:space="preserve">
        <source>Cannot forward message</source>
+        <target>Nie można przekazać wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Comment" xml:space="preserve">
        <source>Comment</source>
+        <target>Komentarz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
        <source>Currently maximum supported file size is %@.</source>
+        <target>Obecnie maksymalny obsługiwany rozmiar pliku to %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database downgrade required" xml:space="preserve">
        <source>Database downgrade required</source>
+        <target>Wymagane obniżenie wersji bazy danych</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database encrypted!" xml:space="preserve">
        <source>Database encrypted!</source>
+        <target>Baza danych zaszyfrowana!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database error" xml:space="preserve">
        <source>Database error</source>
+        <target>Błąd bazy danych</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
        <source>Database passphrase is different from saved in the keychain.</source>
+        <target>Hasło bazy danych jest inne niż zapisane w pęku kluczy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
        <source>Database passphrase is required to open chat.</source>
+        <target>Hasło do bazy danych jest wymagane do otwarcia czatu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database upgrade required" xml:space="preserve">
        <source>Database upgrade required</source>
+        <target>Wymagana aktualizacja bazy danych</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error preparing file" xml:space="preserve">
        <source>Error preparing file</source>
+        <target>Błąd przygotowania pliku</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error preparing message" xml:space="preserve">
        <source>Error preparing message</source>
+        <target>Błąd przygotowania wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
+        <target>Błąd: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File error" xml:space="preserve">
        <source>File error</source>
+        <target>Błąd pliku</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incompatible database version" xml:space="preserve">
        <source>Incompatible database version</source>
+        <target>Niekompatybilna wersja bazy danych</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>Nieprawidłowe potwierdzenie migracji</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Keychain error" xml:space="preserve">
        <source>Keychain error</source>
+        <target>Błąd pęku kluczy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Large file!" xml:space="preserve">
        <source>Large file!</source>
+        <target>Duży plik!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No active profile" xml:space="preserve">
        <source>No active profile</source>
+        <target>Brak aktywnego profilu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
+        <target>Ok</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Open the app to downgrade the database." xml:space="preserve">
        <source>Open the app to downgrade the database.</source>
+        <target>Otwórz aplikację aby obniżyć wersję bazy danych.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Open the app to upgrade the database." xml:space="preserve">
        <source>Open the app to upgrade the database.</source>
+        <target>Otwórz aplikację aby zaktualizować bazę danych.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Passphrase" xml:space="preserve">
        <source>Passphrase</source>
+        <target>Hasło</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Please create a profile in the SimpleX app" xml:space="preserve">
        <source>Please create a profile in the SimpleX app</source>
+        <target>Proszę utworzyć profil w aplikacji SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
        <source>Selected chat preferences prohibit this message.</source>
+        <target>Wybrane preferencje czatu zabraniają tej wiadomości.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending a message takes longer than expected." xml:space="preserve">
        <source>Sending a message takes longer than expected.</source>
+        <target>Wysłanie wiadomości trwa dłużej niż oczekiwano.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending message…" xml:space="preserve">
        <source>Sending message…</source>
+        <target>Wysyłanie wiadomości…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
        <source>Share</source>
+        <target>Udostępnij</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Slow network?" xml:space="preserve">
        <source>Slow network?</source>
+        <target>Wolna sieć?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unknown database error: %@" xml:space="preserve">
        <source>Unknown database error: %@</source>
+        <target>Nieznany błąd bazy danych: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unsupported format" xml:space="preserve">
        <source>Unsupported format</source>
+        <target>Niewspierany format</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wait" xml:space="preserve">
        <source>Wait</source>
+        <target>Czekaj</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
+        <target>Nieprawidłowe hasło bazy danych</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve">
        <source>You can allow sharing in Privacy &amp; Security / SimpleX Lock settings.</source>
+        <target>Możesz zezwolić na udostępnianie w ustawieniach Prywatność i bezpieczeństwo / Blokada SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
    </body>
@@ -5234,6 +5234,274 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
        <target state="translated">%1$@ em %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</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">Permitir que seus contatos deletem mensagens enviadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">baixado</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">transferido</target>
+      </trans-unit>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
+        <source>A new random profile will be shared.</source>
+        <target state="translated">Um novo perfil aleatório será compartilhado.</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">Câmera indisponível</target>
+      </trans-unit>
+      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
+        <source>Admins can block a member for all.</source>
+        <target state="translated">Administradores podem bloquear um membro para todos.</target>
+      </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 que mensagens enviadas sejam deletadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">Aplicar</target>
+      </trans-unit>
+      <trans-unit id="Accent" xml:space="preserve" approved="no">
+        <source>Accent</source>
+        <target state="translated">Esquema</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">Aceitar solicitação de conexão?</target>
+      </trans-unit>
+      <trans-unit id="Active connections" xml:space="preserve" approved="no">
+        <source>Active connections</source>
+        <target state="translated">Conexões ativas</target>
+      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve" approved="no">
+        <source>Add contact</source>
+        <target state="translated">Adicionar contato</target>
+      </trans-unit>
+      <trans-unit id="Additional accent" xml:space="preserve" approved="no">
+        <source>Additional accent</source>
+        <target state="translated">Esquema adicional</target>
+      </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 %@ serão ocultas!</target>
+      </trans-unit>
+      <trans-unit id="All profiles" xml:space="preserve" approved="no">
+        <source>All profiles</source>
+        <target state="translated">Todos perfis</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">Permitir chamadas?</target>
+      </trans-unit>
+      <trans-unit id="Archive contacts to chat later." xml:space="preserve" approved="no">
+        <source>Archive contacts to chat later.</source>
+        <target state="translated">Arquivar contatos para conversar depois.</target>
+      </trans-unit>
+      <trans-unit id="Blur media" xml:space="preserve" approved="no">
+        <source>Blur media</source>
+        <target state="translated">Censurar mídia</target>
+      </trans-unit>
+      <trans-unit id="Calls prohibited!" xml:space="preserve" approved="no">
+        <source>Calls prohibited!</source>
+        <target state="translated">Chamadas proibidas!</target>
+      </trans-unit>
+      <trans-unit id="Can't call contact" xml:space="preserve" approved="no">
+        <source>Can't call contact</source>
+        <target state="translated">Não foi possível ligar para o contato</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">mensagens deletadas</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 seg</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">mensagens bloqueadas</target>
+      </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">mensagens bloqueadas pelo administrador</target>
+      </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">**Nota**: usar o mesmo banco de dados em dois dispositivos irá quebrar a desencriptação das mensagens de suas conexões como uma medida de segurança.</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- entrega de mensagens mais estável.
+- grupos melhorados.
+- e muito mais!</target>
+      </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 deletadas - isto não pode ser desfeito!</target>
+      </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>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">Permitir envio de links SimpleX.</target>
+      </trans-unit>
+      <trans-unit id="Block for all" xml:space="preserve" approved="no">
+        <source>Block for all</source>
+        <target state="translated">Bloquear para todos</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">Bloquear membro</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">Bloqueado por um administrador</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">Bloquear membros de grupo</target>
+      </trans-unit>
+      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
+        <source>Block member for all?</source>
+        <target state="translated">Bloquear membro para todos?</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">Bloquear membro?</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Você e seu contato podem apagar mensagens enviadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">Não foi possível ligar para este membro</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">Não foi possível enviar mensagem para este membro</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">Cancelar migração</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">Abortar</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">Abortar troca de endereço</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">Abortar troca de endereço?</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- notificar contatos apagados de maneira opcional.
+- nome de perfil com espaços.
+- e muito mais!</target>
+      </trans-unit>
+      <trans-unit id="Allow sharing" xml:space="preserve" approved="no">
+        <source>Allow sharing</source>
+        <target state="translated">Permitir compartilhamento</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">Bloquear</target>
+      </trans-unit>
+      <trans-unit id="Additional accent 2" xml:space="preserve" approved="no">
+        <source>Additional accent 2</source>
+        <target state="translated">Esquema adicional 2</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">Alteração de endereço será abortada. O endereço antigo será utilizado.</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">Configurações avançadas</target>
+      </trans-unit>
+      <trans-unit id="All data is private to your device." xml:space="preserve" approved="no">
+        <source>All data is private to your device.</source>
+        <target state="translated">Toda informação é privada em seu dispositivo.</target>
+      </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 encriptados e enviados em pedaços para nós XFTP.</target>
+      </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">Permitir deletar mensagens de maneira irreversível apenas se seu contato permitir para você. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">Já está conectando!</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">Já está entrando no grupo!</target>
+      </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve" approved="no">
+        <source>Always use private routing.</source>
+        <target state="translated">Sempre use rotas privadas.</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">Aplicar em</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">Arquivando banco de dados</target>
+      </trans-unit>
+      <trans-unit id="Black" xml:space="preserve" approved="no">
+        <source>Black</source>
+        <target state="translated">Preto</target>
+      </trans-unit>
+      <trans-unit id="Cannot forward message" xml:space="preserve" approved="no">
+        <source>Cannot forward message</source>
+        <target state="translated">Não é possível encaminhar mensagem</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(novo)</target>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">este dispositivo</target>
+      </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**: criar um novo link de convite ou conectar via um link que você recebeu.</target>
+      </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**: criar um novo grupo.</target>
+      </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">**Aviso**: o arquivo será removido.</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">E mais algumas coisas</target>
+      </trans-unit>
+      <trans-unit id="Archived contacts" xml:space="preserve" approved="no">
+        <source>Archived contacts</source>
+        <target state="translated">Contatos arquivados</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt-BR" datatype="plaintext">
@@ -1418,7 +1418,7 @@
      </trans-unit>
      <trans-unit id="Color chats with the new themes." xml:space="preserve">
        <source>Color chats with the new themes.</source>
-        <target>Добавьте цвета к чатам в настройках тем.</target>
+        <target>Добавьте цвета к чатам в настройках.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Color mode" xml:space="preserve">
@@ -2176,7 +2176,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
        <source>Delete up to 20 messages at once.</source>
-        <target>Удаляйте до 20 сообщений одновременно.</target>
+        <target>Удаляйте до 20 сообщений за раз.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -4988,7 +4988,7 @@ Error: %@</source>
      </trans-unit>
      <trans-unit id="Private message routing 🚀" xml:space="preserve">
        <source>Private message routing 🚀</source>
-        <target>Конфиденциальная доставка сообщений 🚀</target>
+        <target>Конфиденциальная доставка 🚀</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Private notes" xml:space="preserve">
@@ -314,7 +314,7 @@
      </trans-unit>
      <trans-unit id="About SimpleX Chat" xml:space="preserve" approved="no">
        <source>About SimpleX Chat</source>
-        <target state="translated">關於 SimpleX 對話</target>
+        <target state="translated">關於 SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accent color" xml:space="preserve" approved="no">
@@ -445,7 +445,7 @@
      </trans-unit>
      <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">允許你的聯絡人傳送自動銷毀的訊息。</target>
+        <target state="translated">允許您的聯絡人傳送限時訊息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
@@ -5898,6 +5898,230 @@ It can happen because of some bug or when the connection is compromised.</source
        <target state="translated">%@ 和 %@ 已連接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">%@ 下載</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@ 上傳</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">中止</target>
+      </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">**創建群組**: 創建一個新的群組。</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">中止更改地址</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">接受連線請求？</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">相機不可用</target>
+      </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">所有訊息都將被刪除 - 這不能還原！</target>
+      </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">只有你的聯絡人允許的情況下，才允許不可逆地將訊息刪除。(24小時)</target>
+      </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">允許將不可撤銷的訊息刪除。(24小時)</target>
+      </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">允許您的聯絡人不可復原地刪除已傳送的訊息。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
+        <source>Bad desktop address</source>
+        <target state="translated">無效的桌面地址</target>
+      </trans-unit>
+      <trans-unit id="Error decrypting file" xml:space="preserve" approved="no">
+        <source>Error decrypting file</source>
+        <target state="translated">解密檔案時出錯</target>
+      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve" approved="no">
+        <source>Add contact</source>
+        <target state="translated">新增聯絡人</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">進階設定</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">允許通話？</target>
+      </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">允許傳送檔案和媒體。</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">已加入群組！</target>
+      </trans-unit>
+      <trans-unit id="App data migration" xml:space="preserve" approved="no">
+        <source>App data migration</source>
+        <target state="translated">應用資料轉移</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">應用</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">應用到</target>
+      </trans-unit>
+      <trans-unit id="Archive and upload" xml:space="preserve" approved="no">
+        <source>Archive and upload</source>
+        <target state="translated">儲存並上傳</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">封鎖</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">封鎖群組成員</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">封鎖成員</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
+        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target state="translated">保加利亞語、芬蘭語、泰語和烏克蘭語——感謝使用者們和[Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)！</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">無法與成員通話</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">無法傳送訊息給成員</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">取消遷移</target>
+      </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve" approved="no">
+        <source>Chat database exported</source>
+        <target state="translated">導出聊天數據庫</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 秒</target>
+      </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">你的所有聯絡人、對話和文件將被安全加密並切塊上傳到設置的 XFTP 中繼。</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">將取消地址更改。將使用舊聯絡地址。</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">正在儲存資料庫</target>
+      </trans-unit>
+      <trans-unit id="Cellular" xml:space="preserve" approved="no">
+        <source>Cellular</source>
+        <target state="translated">行動網路</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ 和 %lld 成員</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">%lld 條訊息已刪除</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">已連接！</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">封鎖成員？</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(新)</target>
+      </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">%@, %@ 和 %lld 個成員已連接</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">其他</target>
+      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve" approved="no">
+        <source>Show last messages</source>
+        <target state="translated">顯示最新的訊息</target>
+      </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">應用程式將為新的本機文件(影片除外)加密。</target>
+      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve" approved="no">
+        <source>Better groups</source>
+        <target state="translated">更加的群組</target>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld 種新的介面語言</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">由管理員封鎖</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">您與您的聯絡人都可以不可復原地删除已傳送的訊息。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Encrypt local files" xml:space="preserve" approved="no">
+        <source>Encrypt local files</source>
+        <target state="translated">加密本機檔案</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- 更穩定的傳送！
+- 更好的社群！
+- 以及更多！</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- 可選擇通知已刪除的聯絡人
+- 帶空格的共人資料名稱。
+-以及更多！</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">中止更改地址？</target>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">允許傳送 SimpleX 連結。</target>
+      </trans-unit>
+      <trans-unit id="Background" xml:space="preserve" approved="no">
+        <source>Background</source>
+        <target state="translated">後台</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hant" datatype="plaintext">
@@ -132,7 +132,7 @@ struct ShareView: View {
        switch content {
        case let .image(preview, _): imagePreview(preview)
        case let .movie(preview, _, _): imagePreview(preview)
-        case let .url(linkPreview): imagePreview(linkPreview.image)
+        case let .url(preview): linkPreview(preview)
        case let .data(cryptoFile):
            previewArea {
                Image(systemName: "doc.fill")
@@ -160,6 +160,29 @@ struct ShareView: View {
        }
    }

+    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
+        previewArea {
+            HStack(alignment: .center, spacing: 8) {
+                if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+                    Image(uiImage: uiImage)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(maxWidth: 80, maxHeight: 60)
+                }
+                VStack(alignment: .center, spacing: 4) {
+                    Text(linkPreview.title)
+                        .lineLimit(1)
+                    Text(linkPreview.uri.absoluteString)
+                        .font(.caption)
+                        .lineLimit(1)
+                        .foregroundColor(.secondary)
+                }
+                .padding(.vertical, 5)
+                .frame(maxWidth: .infinity, minHeight: 60)
+            }
+        }
+    }
+
    @ViewBuilder private func previewArea<V: View>(@ViewBuilder content: @escaping () -> V) -> some View {
        HStack(alignment: .center, spacing: 8) {
            content()
@@ -82,15 +82,27 @@
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Les paramètres de chat sélectionnés ne permettent pas l'envoi de ce message.";

+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "L'envoi d'un message prend plus de temps que prévu.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Envoi du message…";
+
 /* No comment provided by engineer. */
 "Share" = "Partager";

+/* No comment provided by engineer. */
+"Slow network?" = "Réseau lent ?";
+
 /* No comment provided by engineer. */
 "Unknown database error: %@" = "Erreur inconnue de la base de données : %@";

 /* No comment provided by engineer. */
 "Unsupported format" = "Format non pris en charge";

+/* No comment provided by engineer. */
+"Wait" = "Attendez";
+
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Mauvaise phrase secrète pour la base de données";

@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Wszelkie prawa zastrzeżone.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,111 @@
-/* 
-  Localizable.strings
-  SimpleX
+/* No comment provided by engineer. */
+"%@" = "%@";
+
+/* No comment provided by engineer. */
+"App is locked!" = "Aplikacja zablokowana!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Anuluj";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Nie można uzyskać dostępu do pęku kluczy aby zapisać hasło do bazy danych";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Nie można przekazać wiadomości";
+
+/* No comment provided by engineer. */
+"Comment" = "Komentarz";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Obecnie maksymalny obsługiwany rozmiar pliku to %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Wymagane obniżenie wersji bazy danych";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Baza danych zaszyfrowana!";
+
+/* No comment provided by engineer. */
+"Database error" = "Błąd bazy danych";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Hasło bazy danych jest inne niż zapisane w pęku kluczy.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Hasło do bazy danych jest wymagane do otwarcia czatu.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Wymagana aktualizacja bazy danych";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Błąd przygotowania pliku";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Błąd przygotowania wiadomości";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Błąd: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Błąd pliku";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Niekompatybilna wersja bazy danych";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Nieprawidłowe potwierdzenie migracji";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Błąd pęku kluczy";
+
+/* No comment provided by engineer. */
+"Large file!" = "Duży plik!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Brak aktywnego profilu";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Otwórz aplikację aby obniżyć wersję bazy danych.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Otwórz aplikację aby zaktualizować bazę danych.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Hasło";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Proszę utworzyć profil w aplikacji SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Wybrane preferencje czatu zabraniają tej wiadomości.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Wysłanie wiadomości trwa dłużej niż oczekiwano.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Wysyłanie wiadomości…";
+
+/* No comment provided by engineer. */
+"Share" = "Udostępnij";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Wolna sieć?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Nieznany błąd bazy danych: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Niewspierany format";
+
+/* No comment provided by engineer. */
+"Wait" = "Czekaj";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Nieprawidłowe hasło bazy danych";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Możesz zezwolić na udostępnianie w ustawieniach Prywatność i bezpieczeństwo / Blokada SimpleX.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Всі права захищені.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,111 @@
-/* 
-  Localizable.strings
-  SimpleX
+/* No comment provided by engineer. */
+"%@" = "%@";
+
+/* No comment provided by engineer. */
+"App is locked!" = "Додаток заблоковано!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Скасувати";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Не вдається отримати доступ до зв'язки ключів для збереження пароля до бази даних";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Неможливо переслати повідомлення";
+
+/* No comment provided by engineer. */
+"Comment" = "Коментар";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Наразі максимальний підтримуваний розмір файлу - %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Потрібне оновлення бази даних";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "База даних зашифрована!";
+
+/* No comment provided by engineer. */
+"Database error" = "Помилка в базі даних";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Парольна фраза бази даних відрізняється від збереженої у в’язці ключів.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Для відкриття чату потрібно ввести пароль до бази даних.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Потрібне оновлення бази даних";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Помилка підготовки файлу";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Повідомлення про підготовку до помилки";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Помилка: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Помилка файлу";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Несумісна версія бази даних";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Недійсне підтвердження міграції";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Помилка зв'язки ключів";
+
+/* No comment provided by engineer. */
+"Large file!" = "Великий файл!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Немає активного профілю";
+
+/* No comment provided by engineer. */
+"Ok" = "Гаразд";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Відкрийте програму, щоб знизити версію бази даних.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Відкрийте програму, щоб оновити базу даних.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Парольна фраза";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Будь ласка, створіть профіль у додатку SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Вибрані налаштування чату забороняють це повідомлення.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Надсилання повідомлення займає більше часу, ніж очікувалося.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Надсилаю повідомлення…";
+
+/* No comment provided by engineer. */
+"Share" = "Поділіться";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Повільна мережа?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Невідома помилка бази даних: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Непідтримуваний формат";
+
+/* No comment provided by engineer. */
+"Wait" = "Зачекай";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Неправильна ключова фраза до бази даних";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Ви можете дозволити спільний доступ у налаштуваннях Конфіденційність і безпека / SimpleX Lock.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -135,7 +135,6 @@
 		5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407827ADB701007B033A /* EmojiItemView.swift */; };
 		5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCE227DE9246000BD591 /* ComposeView.swift */; };
 		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 */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
@@ -215,15 +214,15 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
+		E51ED58A2C7A26FE009F2C7C /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5852C7A26FE009F2C7C /* libffi.a */; };
+		E51ED58B2C7A26FE009F2C7C /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5862C7A26FE009F2C7C /* libgmpxx.a */; };
+		E51ED58C2C7A26FE009F2C7C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5872C7A26FE009F2C7C /* libgmp.a */; };
+		E51ED58D2C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5882C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a */; };
+		E51ED58E2C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5892C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
 		E5DCF9982C5906FF007928CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9962C5906FF007928CC /* InfoPlist.strings */; };
-		E5E218492C6813750013B4C6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218442C6813750013B4C6 /* libgmpxx.a */; };
-		E5E2184A2C6813750013B4C6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218452C6813750013B4C6 /* libffi.a */; };
-		E5E2184B2C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218462C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a */; };
-		E5E2184C2C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218472C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a */; };
-		E5E2184D2C6813750013B4C6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218482C6813750013B4C6 /* libgmp.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -474,7 +473,6 @@
 		5CE6C7B42AAB1527007F345C /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CEACCE227DE9246000BD591 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -552,6 +550,11 @@
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
+		E51ED5852C7A26FE009F2C7C /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E51ED5862C7A26FE009F2C7C /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E51ED5872C7A26FE009F2C7C /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E51ED5882C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a"; sourceTree = "<group>"; };
+		E51ED5892C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a"; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -604,11 +607,6 @@
 		E5DCF9A62C590731007928CC /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A72C590732007928CC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A82C590732007928CC /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E5E218442C6813750013B4C6 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E5E218452C6813750013B4C6 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E5E218462C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E5E218472C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a"; sourceTree = "<group>"; };
-		E5E218482C6813750013B4C6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -647,14 +645,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E5E218492C6813750013B4C6 /* libgmpxx.a in Frameworks */,
+				E51ED58D2C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a in Frameworks */,
+				E51ED58E2C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				E5E2184D2C6813750013B4C6 /* libgmp.a in Frameworks */,
-				E5E2184C2C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a in Frameworks */,
+				E51ED58B2C7A26FE009F2C7C /* libgmpxx.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				E5E2184B2C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a in Frameworks */,
-				E5E2184A2C6813750013B4C6 /* libffi.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
+				E51ED58C2C7A26FE009F2C7C /* libgmp.a in Frameworks */,
+				E51ED58A2C7A26FE009F2C7C /* libffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -731,11 +729,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5E218452C6813750013B4C6 /* libffi.a */,
-				E5E218482C6813750013B4C6 /* libgmp.a */,
-				E5E218442C6813750013B4C6 /* libgmpxx.a */,
-				E5E218462C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf-ghc9.6.3.a */,
-				E5E218472C6813750013B4C6 /* libHSsimplex-chat-6.0.0.7-JAEd2ymO3CfCyjlINhbKkf.a */,
+				E51ED5852C7A26FE009F2C7C /* libffi.a */,
+				E51ED5872C7A26FE009F2C7C /* libgmp.a */,
+				E51ED5862C7A26FE009F2C7C /* libgmpxx.a */,
+				E51ED5892C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4-ghc9.6.3.a */,
+				E51ED5882C7A26FE009F2C7C /* libHSsimplex-chat-6.0.3.0-JVz5IxfwvrHaD2mJGTgT4.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -786,7 +784,6 @@
 				18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */,
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
-				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
 				8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */,
 				8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */,
 				8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */,
@@ -1435,7 +1432,6 @@
 				646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */,
 				8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
-				5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
 				5CB634B129E5EFEA0066AD6B /* PasscodeView.swift in Sources */,
 				8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */,
@@ -1883,7 +1879,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1908,7 +1904,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1932,7 +1928,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1957,7 +1953,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1973,11 +1969,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1993,11 +1989,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2018,7 +2014,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2033,7 +2029,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2055,7 +2051,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2070,7 +2066,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2092,7 +2088,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2118,7 +2114,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2143,7 +2139,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2169,7 +2165,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2194,7 +2190,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2209,7 +2205,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2228,7 +2224,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 232;
+				CURRENT_PROJECT_VERSION = 235;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2243,7 +2239,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0;
+				MARKETING_VERSION = 6.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2320,7 +2316,7 @@
 			repositoryURL = "https://github.com/twostraws/CodeScanner";
 			requirement = {
 				kind = exactVersion;
-				version = 2.1.1;
+				version = 2.5.0;
 			};
 		};
 		8C73C1162C21E17B00892670 /* XCRemoteSwiftPackageReference "Yams" */ = {
@@ -6,8 +6,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/twostraws/CodeScanner",
      "state" : {
-        "revision" : "c27a66149b7483fe42e2ec6aad61d5c3fffe522d",
-        "version" : "2.1.1"
+        "revision" : "34da57fb63b47add20de8a85da58191523ccce57",
+        "version" : "2.5.0"
      }
    },
    {
@@ -23,7 +23,6 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/kirualex/SwiftyGif",
      "state" : {
-        "branch" : "master",
        "revision" : "5e8619335d394901379c9add5c4c1c2f420b3800"
      }
    },
@@ -1500,6 +1500,12 @@ public struct ChatData: Decodable, Identifiable, Hashable, ChatLike {

    public var id: ChatId { get { chatInfo.id } }

+    public init(chatInfo: ChatInfo, chatItems: [ChatItem], chatStats: ChatStats = ChatStats()) {
+        self.chatInfo = chatInfo
+        self.chatItems = chatItems
+        self.chatStats = chatStats
+    }
+    
    public static func invalidJSON(_ json: String) -> ChatData {
        ChatData(
            chatInfo: .invalidJSON(json: json),
@@ -677,7 +677,7 @@
 "Better messages" = "Verbesserungen bei Nachrichten";

 /* No comment provided by engineer. */
-"Better networking" = "Bessere Vernetzung";
+"Better networking" = "Kontrollieren Sie Ihr Netzwerk";

 /* No comment provided by engineer. */
 "Black" = "Schwarz";
@@ -506,7 +506,7 @@
 "Allow to send files and media." = "Se permite enviar archivos y multimedia.";

 /* No comment provided by engineer. */
-"Allow to send SimpleX links." = "Permitir enviar enlaces SimpleX.";
+"Allow to send SimpleX links." = "Se permite enviar enlaces SimpleX.";

 /* No comment provided by engineer. */
 "Allow to send voice messages." = "Permites enviar mensajes de voz.";
@@ -596,7 +596,7 @@
 "Archive and upload" = "Archivar y subir";

 /* No comment provided by engineer. */
-"Archive contacts to chat later." = "Archivar contactos para charlar más tarde.";
+"Archive contacts to chat later." = "Archiva contactos para charlar más tarde.";

 /* No comment provided by engineer. */
 "Archived contacts" = "Contactos archivados";
@@ -713,7 +713,7 @@
 "Blocked by admin" = "Bloqueado por administrador";

 /* No comment provided by engineer. */
-"Blur for better privacy." = "Difuminar para más privacidad.";
+"Blur for better privacy." = "Difumina para mayor privacidad.";

 /* No comment provided by engineer. */
 "Blur media" = "Difuminar multimedia";
@@ -1089,7 +1089,7 @@
 "Connection" = "Conexión";

 /* No comment provided by engineer. */
-"Connection and servers status." = "Estado de conexión y servidores.";
+"Connection and servers status." = "Estado de tu conexión y servidores.";

 /* No comment provided by engineer. */
 "Connection error" = "Error conexión";
@@ -1606,7 +1606,7 @@
 "Do it later" = "Hacer más tarde";

 /* No comment provided by engineer. */
-"Do not send history to new members." = "No enviar historial a miembros nuevos.";
+"Do not send history to new members." = "No se envía el historial a los miembros nuevos.";

 /* No comment provided by engineer. */
 "Do NOT send messages directly, even if your or destination server does not support private routing." = "NO enviar mensajes directamente incluso si tu servidor o el de destino no soportan enrutamiento privado.";
@@ -2048,7 +2048,7 @@
 "Expand" = "Expandir";

 /* No comment provided by engineer. */
-"expired" = "expirado";
+"expired" = "expirados";

 /* No comment provided by engineer. */
 "Export database" = "Exportar base de datos";
@@ -3253,7 +3253,7 @@
 "peer-to-peer" = "p2p";

 /* No comment provided by engineer. */
-"Pending" = "Pendiente";
+"Pending" = "Pendientes";

 /* No comment provided by engineer. */
 "People can connect to you only via the links you share." = "Las personas pueden conectarse contigo solo mediante los enlaces que compartes.";
@@ -3415,7 +3415,7 @@
 "Prohibit sending files and media." = "No permitir el envío de archivos y multimedia.";

 /* No comment provided by engineer. */
-"Prohibit sending SimpleX links." = "No permitir el envío de enlaces SimpleX.";
+"Prohibit sending SimpleX links." = "No se permite enviar enlaces SimpleX.";

 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "No se permiten mensajes de voz.";
@@ -3439,7 +3439,7 @@
 "Protocol timeout per KB" = "Timeout protocolo por KB";

 /* No comment provided by engineer. */
-"Proxied" = "Con proxy";
+"Proxied" = "Como proxy";

 /* No comment provided by engineer. */
 "Proxied servers" = "Servidores con proxy";
@@ -3917,7 +3917,7 @@
 "Send them from gallery or custom keyboards." = "Envíalos desde la galería o desde teclados personalizados.";

 /* No comment provided by engineer. */
-"Send up to 100 last messages to new members." = "Enviar hasta 100 últimos mensajes a los miembros nuevos.";
+"Send up to 100 last messages to new members." = "Se envían hasta 100 mensajes más recientes a los miembros nuevos.";

 /* No comment provided by engineer. */
 "Sender cancelled file transfer." = "El remitente ha cancelado la transferencia de archivos.";
@@ -3956,7 +3956,7 @@
 "Sent at: %@" = "Enviado: %@";

 /* No comment provided by engineer. */
-"Sent directly" = "Enviado directamente";
+"Sent directly" = "Directamente";

 /* notification */
 "Sent file event" = "Evento de archivo enviado";
@@ -3977,7 +3977,7 @@
 "Sent total" = "Total enviados";

 /* No comment provided by engineer. */
-"Sent via proxy" = "Enviado vía proxy";
+"Sent via proxy" = "Mediante proxy";

 /* No comment provided by engineer. */
 "Server address" = "Dirección del servidor";
@@ -4352,7 +4352,7 @@
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "La aplicación puede notificarte cuando recibas mensajes o solicitudes de contacto: por favor, abre la configuración para activarlo.";

 /* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .onion).";
+"The app will ask to confirm downloads from unknown file servers (except .onion)." = "La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto si son .onion).";

 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "El intento de cambiar la contraseña de la base de datos no se ha completado.";
@@ -4709,7 +4709,7 @@
 "Use the app while in the call." = "Usar la aplicación durante la llamada.";

 /* No comment provided by engineer. */
-"Use the app with one hand." = "Usa la aplicación con una mano.";
+"Use the app with one hand." = "Usa la aplicación con una sola mano.";

 /* No comment provided by engineer. */
 "User profile" = "Perfil de usuario";
@@ -4979,7 +4979,7 @@
 "You can accept calls from lock screen, without device and app authentication." = "Puede aceptar llamadas desde la pantalla de bloqueo, sin autenticación de dispositivos y aplicaciones.";

 /* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Puede cambiarlo desde el menú Apariencia.";
+"You can change it in Appearance settings." = "Puedes cambiar la posición de la barra desde el menú Apariencia.";

 /* No comment provided by engineer. */
 "You can create it later" = "Puedes crearla más tarde";
@@ -314,7 +314,7 @@
 "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." = "Une connexion TCP distincte sera utilisée **pour chaque contact et membre de groupe**.\n**Veuillez noter** : si vous avez de nombreuses connexions, votre consommation de batterie et de réseau peut être nettement plus élevée et certaines liaisons peuvent échouer.";

 /* No comment provided by engineer. */
-"Abort" = "Annuler";
+"Abort" = "Abandonner";

 /* No comment provided by engineer. */
 "Abort changing address" = "Annuler le changement d'adresse";
@@ -472,6 +472,9 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Autoriser les appels que si votre contact les autorise.";

+/* No comment provided by engineer. */
+"Allow calls?" = "Autoriser les appels ?";
+
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Autorise les messages éphémères seulement si votre contact vous l’autorise.";

@@ -590,7 +593,13 @@
 "Apply to" = "Appliquer à";

 /* No comment provided by engineer. */
-"Archive and upload" = "Archiver et transférer";
+"Archive and upload" = "Archiver et téléverser";
+
+/* No comment provided by engineer. */
+"Archive contacts to chat later." = "Archiver les contacts pour discuter plus tard.";
+
+/* No comment provided by engineer. */
+"Archived contacts" = "Contacts archivés";

 /* No comment provided by engineer. */
 "Archiving database" = "Archivage de la base de données";
@@ -667,6 +676,9 @@
 /* No comment provided by engineer. */
 "Better messages" = "Meilleurs messages";

+/* No comment provided by engineer. */
+"Better networking" = "Meilleure gestion de réseau";
+
 /* No comment provided by engineer. */
 "Black" = "Noir";

@@ -700,6 +712,9 @@
 /* No comment provided by engineer. */
 "Blocked by admin" = "Bloqué par l'administrateur";

+/* No comment provided by engineer. */
+"Blur for better privacy." = "Rendez les images floues et protégez-les contre les regards indiscrets.";
+
 /* No comment provided by engineer. */
 "Blur media" = "Flouter les médias";

@@ -727,6 +742,9 @@
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";

+/* No comment provided by engineer. */
+"call" = "appeler";
+
 /* No comment provided by engineer. */
 "Call already ended!" = "Appel déjà terminé !";

@@ -742,15 +760,27 @@
 /* No comment provided by engineer. */
 "Calls" = "Appels";

+/* No comment provided by engineer. */
+"Calls prohibited!" = "Les appels ne sont pas autorisés !";
+
 /* No comment provided by engineer. */
 "Camera not available" = "Caméra non disponible";

+/* No comment provided by engineer. */
+"Can't call contact" = "Impossible d'appeler le contact";
+
+/* No comment provided by engineer. */
+"Can't call member" = "Impossible d'appeler le membre";
+
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Impossible d'inviter le contact !";

 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Impossible d'inviter les contacts !";

+/* No comment provided by engineer. */
+"Can't message member" = "Impossible d'envoyer un message à ce membre";
+
 /* No comment provided by engineer. */
 "Cancel" = "Annuler";

@@ -836,6 +866,9 @@
 /* No comment provided by engineer. */
 "Chat database deleted" = "Base de données du chat supprimée";

+/* No comment provided by engineer. */
+"Chat database exported" = "Exportation de la base de données des discussions";
+
 /* No comment provided by engineer. */
 "Chat database imported" = "Base de données du chat importée";

@@ -848,6 +881,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." = "Le chat est arrêté. Si vous avez déjà utilisé cette base de données sur un autre appareil, vous devez la transférer à nouveau avant de démarrer le chat.";

+/* No comment provided by engineer. */
+"Chat list" = "Liste de discussion";
+
 /* No comment provided by engineer. */
 "Chat migrated!" = "Messagerie transférée !";

@@ -899,6 +935,9 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Retirer la vérification";

+/* No comment provided by engineer. */
+"Color chats with the new themes." = "Colorez vos discussions avec les nouveaux thèmes.";
+
 /* No comment provided by engineer. */
 "Color mode" = "Mode de couleur";

@@ -915,7 +954,7 @@
 "complete" = "complet";

 /* No comment provided by engineer. */
-"Completed" = "Complété";
+"Completed" = "Complétées";

 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configurer les serveurs ICE";
@@ -926,6 +965,9 @@
 /* No comment provided by engineer. */
 "Confirm" = "Confirmer";

+/* No comment provided by engineer. */
+"Confirm contact deletion?" = "Confirmer la suppression du contact ?";
+
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Confirmer la mise à niveau de la base de données";

@@ -965,6 +1007,9 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "se connecter aux developpeurs de SimpleX Chat.";

+/* No comment provided by engineer. */
+"Connect to your friends faster." = "Connectez-vous à vos amis plus rapidement.";
+
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Se connecter à soi-même ?";

@@ -1031,6 +1076,9 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Connexion au serveur… (erreur : %@)";

+/* No comment provided by engineer. */
+"Connecting to contact, please wait or check later!" = "Connexion au contact, veuillez patienter ou vérifier plus tard !";
+
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Connexion au bureau";

@@ -1040,6 +1088,9 @@
 /* No comment provided by engineer. */
 "Connection" = "Connexion";

+/* No comment provided by engineer. */
+"Connection and servers status." = "État de la connexion et des serveurs.";
+
 /* No comment provided by engineer. */
 "Connection error" = "Erreur de connexion";

@@ -1079,6 +1130,9 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Contact déjà existant";

+/* No comment provided by engineer. */
+"Contact deleted!" = "Contact supprimé !";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "Ce contact a le chiffrement de bout en bout";

@@ -1091,12 +1145,18 @@
 /* notification */
 "Contact is connected" = "Le contact est connecté";

+/* No comment provided by engineer. */
+"Contact is deleted." = "Le contact est supprimé.";
+
 /* No comment provided by engineer. */
 "Contact name" = "Nom du contact";

 /* No comment provided by engineer. */
 "Contact preferences" = "Préférences de contact";

+/* No comment provided by engineer. */
+"Contact will be deleted - this cannot be undone!" = "Le contact sera supprimé - il n'est pas possible de revenir en arrière !";
+
 /* No comment provided by engineer. */
 "Contacts" = "Contacts";

@@ -1106,6 +1166,9 @@
 /* No comment provided by engineer. */
 "Continue" = "Continuer";

+/* No comment provided by engineer. */
+"Conversation deleted!" = "Conversation supprimée !";
+
 /* No comment provided by engineer. */
 "Copy" = "Copier";

@@ -1158,7 +1221,7 @@
 "Create your profile" = "Créez votre profil";

 /* No comment provided by engineer. */
-"Created" = "Créé";
+"Created" = "Créées";

 /* No comment provided by engineer. */
 "Created at" = "Créé à";
@@ -1329,6 +1392,9 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Supprimer le contact";

+/* No comment provided by engineer. */
+"Delete contact?" = "Supprimer le contact ?";
+
 /* No comment provided by engineer. */
 "Delete database" = "Supprimer la base de données";

@@ -1392,14 +1458,20 @@
 /* server test step */
 "Delete queue" = "Supprimer la file d'attente";

+/* No comment provided by engineer. */
+"Delete up to 20 messages at once." = "Supprimez jusqu'à 20 messages à la fois.";
+
 /* No comment provided by engineer. */
 "Delete user profile?" = "Supprimer le profil utilisateur ?";

+/* No comment provided by engineer. */
+"Delete without notification" = "Supprimer sans notification";
+
 /* deleted chat item */
 "deleted" = "supprimé";

 /* No comment provided by engineer. */
-"Deleted" = "Supprimé";
+"Deleted" = "Supprimées";

 /* No comment provided by engineer. */
 "Deleted at" = "Supprimé à";
@@ -1455,6 +1527,9 @@
 /* No comment provided by engineer. */
 "Develop" = "Développer";

+/* No comment provided by engineer. */
+"Developer options" = "Options pour les développeurs";
+
 /* No comment provided by engineer. */
 "Developer tools" = "Outils du développeur";

@@ -2461,6 +2536,9 @@
 /* group name */
 "invitation to group %@" = "invitation au groupe %@";

+/* No comment provided by engineer. */
+"invite" = "inviter";
+
 /* No comment provided by engineer. */
 "Invite friends" = "Inviter des amis";

@@ -2506,6 +2584,9 @@
 /* No comment provided by engineer. */
 "It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Cela peut arriver quand :\n1. Les messages ont expiré dans le client expéditeur après 2 jours ou sur le serveur après 30 jours.\n2. Le déchiffrement du message a échoué, car vous ou votre contact avez utilisé une ancienne sauvegarde de base de données.\n3. La connexion a été compromise.";

+/* No comment provided by engineer. */
+"It protects your IP address and connections." = "Il protège votre adresse IP et vos connexions.";
+
 /* No comment provided by engineer. */
 "It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Il semblerait que vous êtes déjà connecté via ce lien. Si ce n'est pas le cas, il y a eu une erreur (%@).";

@@ -2548,6 +2629,9 @@
 /* No comment provided by engineer. */
 "Keep" = "Conserver";

+/* No comment provided by engineer. */
+"Keep conversation" = "Garder la conversation";
+
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Garder l'application ouverte pour l'utiliser depuis le bureau";

@@ -2659,6 +2743,9 @@
 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Max 30 secondes, réception immédiate.";

+/* No comment provided by engineer. */
+"Media & file servers" = "Serveurs de fichiers et de médias";
+
 /* blur media */
 "Medium" = "Modéré";

@@ -2689,6 +2776,9 @@
 /* No comment provided by engineer. */
 "Menus" = "Menus";

+/* No comment provided by engineer. */
+"message" = "message";
+
 /* item status text */
 "Message delivery error" = "Erreur de distribution du message";

@@ -2725,6 +2815,9 @@
 /* No comment provided by engineer. */
 "Message reception" = "Réception de message";

+/* No comment provided by engineer. */
+"Message servers" = "Serveurs de messages";
+
 /* No comment provided by engineer. */
 "Message source remains private." = "La source du message reste privée.";

@@ -2833,6 +2926,9 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Différents profils de chat";

+/* No comment provided by engineer. */
+"mute" = "muet";
+
 /* swipe action */
 "Mute" = "Muet";

@@ -2866,6 +2962,9 @@
 /* No comment provided by engineer. */
 "New chat" = "Nouveau chat";

+/* No comment provided by engineer. */
+"New chat experience 🎉" = "Nouvelle expérience de discussion 🎉";
+
 /* notification */
 "New contact request" = "Nouvelle demande de contact";

@@ -2884,6 +2983,9 @@
 /* No comment provided by engineer. */
 "New in %@" = "Nouveautés de la %@";

+/* No comment provided by engineer. */
+"New media options" = "Nouvelles options de médias";
+
 /* No comment provided by engineer. */
 "New member role" = "Nouveau rôle";

@@ -3012,6 +3114,9 @@
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un **chiffrement de bout en bout à deux couches**.";

+/* No comment provided by engineer. */
+"Only delete conversation" = "Ne supprimer que la conversation";
+
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Seuls les propriétaires du groupe peuvent modifier les préférences du groupe.";

@@ -3168,6 +3273,12 @@
 /* No comment provided by engineer. */
 "PING interval" = "Intervalle de PING";

+/* No comment provided by engineer. */
+"Play from the chat list." = "Aperçu depuis la liste de conversation.";
+
+/* No comment provided by engineer. */
+"Please ask your contact to enable calls." = "Veuillez demander à votre contact d'autoriser les appels.";
+
 /* No comment provided by engineer. */
 "Please ask your contact to enable sending voice messages." = "Veuillez demander à votre contact de permettre l'envoi de messages vocaux.";

@@ -3348,6 +3459,9 @@
 /* No comment provided by engineer. */
 "Rate the app" = "Évaluer l'app";

+/* No comment provided by engineer. */
+"Reachable chat toolbar" = "Barre d'outils accessible";
+
 /* chat item menu */
 "React…" = "Réagissez…";

@@ -3535,6 +3649,9 @@
 /* No comment provided by engineer. */
 "Reset" = "Réinitialisation";

+/* No comment provided by engineer. */
+"Reset all hints" = "Rétablir tous les conseils";
+
 /* No comment provided by engineer. */
 "Reset all statistics" = "Réinitialiser toutes les statistiques";

@@ -3610,6 +3727,9 @@
 /* No comment provided by engineer. */
 "Save and notify group members" = "Enregistrer et en informer les membres du groupe";

+/* No comment provided by engineer. */
+"Save and reconnect" = "Sauvegarder et se reconnecter";
+
 /* No comment provided by engineer. */
 "Save and update group profile" = "Enregistrer et mettre à jour le profil du groupe";

@@ -3685,6 +3805,9 @@
 /* No comment provided by engineer. */
 "Scan server QR code" = "Scanner un code QR de serveur";

+/* No comment provided by engineer. */
+"search" = "rechercher";
+
 /* No comment provided by engineer. */
 "Search" = "Rechercher";

@@ -3710,7 +3833,7 @@
 "Secure queue" = "File d'attente sécurisée";

 /* No comment provided by engineer. */
-"Secured" = "Sécurisé";
+"Secured" = "Sécurisées";

 /* No comment provided by engineer. */
 "Security assessment" = "Évaluation de sécurité";
@@ -3764,11 +3887,14 @@
 "Send errors" = "Erreurs d'envoi";

 /* No comment provided by engineer. */
-"Send link previews" = "Envoi d'aperçus de liens";
+"Send link previews" = "Aperçu des liens";

 /* No comment provided by engineer. */
 "Send live message" = "Envoyer un message dynamique";

+/* No comment provided by engineer. */
+"Send message to enable calls." = "Envoyer un message pour activer les appels.";
+
 /* No comment provided by engineer. */
 "Send messages directly when IP address is protected and your or destination server does not support private routing." = "Envoyer les messages de manière directe lorsque l'adresse IP est protégée et que votre serveur ou le serveur de destination ne prend pas en charge le routage privé.";

@@ -3869,7 +3995,7 @@
 "Server requires authorization to create queues, check password" = "Le serveur requiert une autorisation pour créer des files d'attente, vérifiez le mot de passe";

 /* server test error */
-"Server requires authorization to upload, check password" = "Le serveur requiert une autorisation pour uploader, vérifiez le mot de passe";
+"Server requires authorization to upload, check password" = "Le serveur requiert une autorisation pour téléverser, vérifiez le mot de passe";

 /* No comment provided by engineer. */
 "Server test failed!" = "Échec du test du serveur !";
@@ -3949,6 +4075,9 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Partager l'adresse avec vos contacts ?";

+/* No comment provided by engineer. */
+"Share from other apps." = "Partager depuis d'autres applications.";
+
 /* No comment provided by engineer. */
 "Share link" = "Partager le lien";

@@ -3971,7 +4100,7 @@
 "Show developer options" = "Afficher les options pour les développeurs";

 /* No comment provided by engineer. */
-"Show last messages" = "Voir les derniers messages";
+"Show last messages" = "Aperçu des derniers messages";

 /* No comment provided by engineer. */
 "Show message status" = "Afficher le statut du message";
@@ -3980,7 +4109,7 @@
 "Show percentage" = "Afficher le pourcentage";

 /* No comment provided by engineer. */
-"Show preview" = "Afficher l'aperçu";
+"Show preview" = "Aperçu affiché";

 /* No comment provided by engineer. */
 "Show QR code" = "Afficher le code QR";
@@ -4054,9 +4183,15 @@
 /* blur media */
 "Soft" = "Léger";

+/* No comment provided by engineer. */
+"Some file(s) were not exported:" = "Certains fichiers n'ont pas été exportés :";
+
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.";

+/* No comment provided by engineer. */
+"Some non-fatal errors occurred during import:" = "L'importation a entraîné des erreurs non fatales :";
+
 /* notification title */
 "Somebody" = "Quelqu'un";

@@ -4130,7 +4265,7 @@
 "Submit" = "Soumettre";

 /* No comment provided by engineer. */
-"Subscribed" = "Inscrit";
+"Subscribed" = "Inscriptions";

 /* No comment provided by engineer. */
 "Subscription errors" = "Erreurs d'inscription";
@@ -4171,6 +4306,9 @@
 /* No comment provided by engineer. */
 "Tap to scan" = "Appuyez pour scanner";

+/* No comment provided by engineer. */
+"TCP connection" = "Connexion TCP";
+
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Délai de connexion TCP";

@@ -4363,9 +4501,15 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Pour vérifier le chiffrement de bout en bout avec votre contact, comparez (ou scannez) le code sur vos appareils.";

+/* No comment provided by engineer. */
+"Toggle chat list:" = "Afficher la liste des conversations :";
+
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Basculer en mode incognito lors de la connexion.";

+/* No comment provided by engineer. */
+"Toolbar opacity" = "Opacité de la barre d'outils";
+
 /* No comment provided by engineer. */
 "Total" = "Total";

@@ -4468,6 +4612,9 @@
 /* authentication reason */
 "Unlock app" = "Déverrouiller l'app";

+/* No comment provided by engineer. */
+"unmute" = "démuter";
+
 /* swipe action */
 "Unmute" = "Démute";

@@ -4489,6 +4636,9 @@
 /* No comment provided by engineer. */
 "Update network settings?" = "Mettre à jour les paramètres réseau ?";

+/* No comment provided by engineer. */
+"Update settings?" = "Mettre à jour les paramètres ?";
+
 /* rcv group event chat item */
 "updated group profile" = "mise à jour du profil de groupe";

@@ -4508,7 +4658,7 @@
 "Upload failed" = "Échec de l'envoi";

 /* server test step */
-"Upload file" = "Transférer le fichier";
+"Upload file" = "Téléverser le fichier";

 /* No comment provided by engineer. */
 "Uploaded" = "Téléversé";
@@ -4558,6 +4708,9 @@
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Utiliser l'application pendant l'appel.";

+/* No comment provided by engineer. */
+"Use the app with one hand." = "Utiliser l'application d'une main.";
+
 /* No comment provided by engineer. */
 "User profile" = "Profil d'utilisateur";

@@ -4612,6 +4765,9 @@
 /* No comment provided by engineer. */
 "Via secure quantum resistant protocol." = "Via un protocole sécurisé de cryptographie post-quantique.";

+/* No comment provided by engineer. */
+"video" = "vidéo";
+
 /* No comment provided by engineer. */
 "Video call" = "Appel vidéo";

@@ -4619,7 +4775,7 @@
 "video call (not e2e encrypted)" = "appel vidéo (sans chiffrement)";

 /* No comment provided by engineer. */
-"Video will be received when your contact completes uploading it." = "La vidéo ne sera reçue que lorsque votre contact aura fini de la transférer.";
+"Video will be received when your contact completes uploading it." = "La vidéo ne sera reçue que lorsque votre contact aura fini la mettre en ligne.";

 /* No comment provided by engineer. */
 "Video will be received when your contact is online, please wait or check later!" = "La vidéo ne sera reçue que lorsque votre contact sera en ligne. Veuillez patienter ou vérifier plus tard !";
@@ -4822,6 +4978,9 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Vous pouvez accepter des appels à partir de l'écran de verrouillage, sans authentification de l'appareil ou de l'application.";

+/* No comment provided by engineer. */
+"You can change it in Appearance settings." = "Vous pouvez choisir de le modifier dans les paramètres d'apparence.";
+
 /* No comment provided by engineer. */
 "You can create it later" = "Vous pouvez la créer plus tard";

@@ -4843,6 +5002,9 @@
 /* notification body */
 "You can now chat with %@" = "Vous pouvez maintenant envoyer des messages à %@";

+/* No comment provided by engineer. */
+"You can send messages to %@ from Archived contacts." = "Vous pouvez envoyer des messages à %@ à partir des contacts archivés.";
+
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Vous pouvez configurer l'aperçu des notifications sur l'écran de verrouillage via les paramètres.";

@@ -4858,6 +5020,9 @@
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "Vous pouvez lancer le chat via Paramètres / Base de données ou en redémarrant l'app";

+/* No comment provided by engineer. */
+"You can still view conversation with %@ in the list of chats." = "Vous pouvez toujours voir la conversation avec %@ dans la liste des discussions.";
+
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Vous pouvez activer SimpleX Lock dans les Paramètres.";

@@ -4909,9 +5074,18 @@
 /* snd group event chat item */
 "you left" = "vous avez quitté";

+/* No comment provided by engineer. */
+"You may migrate the exported database." = "Vous pouvez migrer la base de données exportée.";
+
+/* No comment provided by engineer. */
+"You may save the exported archive." = "Vous pouvez enregistrer l'archive exportée.";
+
 /* No comment provided by engineer. */
 "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Vous devez utiliser la version la plus récente de votre base de données de chat sur un seul appareil UNIQUEMENT, sinon vous risquez de ne plus recevoir les messages de certains contacts.";

+/* No comment provided by engineer. */
+"You need to allow your contact to call to be able to call them." = "Vous devez autoriser votre contact à appeler pour pouvoir l'appeler.";
+
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Vous devez autoriser votre contact à envoyer des messages vocaux pour pouvoir en envoyer.";

@@ -209,10 +209,10 @@
 "%lld members" = "%lld tag";

 /* No comment provided by engineer. */
-"%lld messages blocked" = "%lld üzenet blokkolva";
+"%lld messages blocked" = "%lld üzenet letiltva";

 /* No comment provided by engineer. */
-"%lld messages blocked by admin" = "%lld üzenet blokkolva az admin által";
+"%lld messages blocked by admin" = "%lld üzenet letiltva az admin által";

 /* No comment provided by engineer. */
 "%lld messages marked deleted" = "%lld törlésre megjelölt üzenet";
@@ -659,10 +659,10 @@
 "Bad desktop address" = "Hibás számítógép cím";

 /* integrity error chat item */
-"bad message hash" = "téves üzenet hash";
+"bad message hash" = "hibás az üzenet ellenőrzőösszege";

 /* No comment provided by engineer. */
-"Bad message hash" = "Téves üzenet hash";
+"Bad message hash" = "Hibás az üzenet ellenőrzőösszege";

 /* integrity error chat item */
 "bad message ID" = "téves üzenet ID";
@@ -683,28 +683,28 @@
 "Black" = "Fekete";

 /* No comment provided by engineer. */
-"Block" = "Blokkolás";
+"Block" = "Letiltás";

 /* No comment provided by engineer. */
 "Block for all" = "Letiltás mindenki számára";

 /* No comment provided by engineer. */
-"Block group members" = "Csoporttagok blokkolása";
+"Block group members" = "Csoporttagok letiltása";

 /* No comment provided by engineer. */
-"Block member" = "Tag blokkolása";
+"Block member" = "Tag letiltása";

 /* No comment provided by engineer. */
 "Block member for all?" = "Mindenki számára letiltja ezt a tagot?";

 /* No comment provided by engineer. */
-"Block member?" = "Tag blokkolása?";
+"Block member?" = "Tag letiltása?";

 /* marked deleted chat item preview text */
-"blocked" = "blokkolva";
+"blocked" = "letiltva";

 /* rcv group event chat item */
-"blocked %@" = "letiltotta őt: %@";
+"blocked %@" = "letiltotta %@-t";

 /* marked deleted chat item preview text */
 "blocked by admin" = "letiltva az admin által";
@@ -1432,7 +1432,7 @@
 "Delete link?" = "Hivatkozás törlése?";

 /* No comment provided by engineer. */
-"Delete member message?" = "Csoporttag üzenet törlése?";
+"Delete member message?" = "Csoporttag üzenetének törlése?";

 /* No comment provided by engineer. */
 "Delete message?" = "Üzenet törlése?";
@@ -1495,7 +1495,7 @@
 "Delivery receipts are disabled!" = "A kézbesítési jelentések ki vannak kapcsolva!";

 /* No comment provided by engineer. */
-"Delivery receipts!" = "Kézbesítési igazolások!";
+"Delivery receipts!" = "Üzenet kézbesítési jelentések!";

 /* No comment provided by engineer. */
 "Description" = "Leírás";
@@ -1828,10 +1828,10 @@
 "Enter this device name…" = "Eszköznév megadása…";

 /* placeholder */
-"Enter welcome message…" = "Üdvözlő üzenetet megadása…";
+"Enter welcome message…" = "Üdvözlő üzenet megadása…";

 /* placeholder */
-"Enter welcome message… (optional)" = "Üdvözlő üzenetet megadása… (opcionális)";
+"Enter welcome message… (optional)" = "Üdvözlő üzenet megadása… (opcionális)";

 /* No comment provided by engineer. */
 "Enter your name…" = "Adjon meg egy nevet…";
@@ -1999,7 +1999,7 @@
 "Error switching profile!" = "Hiba a profil váltásakor!";

 /* No comment provided by engineer. */
-"Error synchronizing connection" = "Hiba a kapcsolat szinkronizálása során";
+"Error synchronizing connection" = "Hiba a kapcsolat szinkronizálása közben";

 /* No comment provided by engineer. */
 "Error updating group link" = "Hiba a csoport hivatkozás frissítésekor";
@@ -2363,7 +2363,7 @@
 "ICE servers (one per line)" = "ICE-kiszolgálók (soronként egy)";

 /* No comment provided by engineer. */
-"If you can't meet in person, show QR code in a video call, or share the link." = "Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás során, vagy ossza meg a hivatkozást.";
+"If you can't meet in person, show QR code in a video call, or share the link." = "Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.";

 /* No comment provided by engineer. */
 "If you enter this passcode when opening the app, all app data will be irreversibly removed!" = "Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen törlődik!";
@@ -2783,7 +2783,7 @@
 "Message delivery error" = "Üzenetkézbesítési hiba";

 /* No comment provided by engineer. */
-"Message delivery receipts!" = "Üzenetkézbesítési bizonylatok!";
+"Message delivery receipts!" = "Üzenet kézbesítési jelentések!";

 /* item status text */
 "Message delivery warning" = "Üzenet kézbesítési figyelmeztetés";
@@ -2813,7 +2813,7 @@
 "message received" = "üzenet érkezett";

 /* No comment provided by engineer. */
-"Message reception" = "Üzenetjelentés";
+"Message reception" = "Üzenet kézbesítési jelentés";

 /* No comment provided by engineer. */
 "Message servers" = "Üzenetkiszolgálók";
@@ -3605,7 +3605,7 @@
 "removed" = "eltávolítva";

 /* rcv group event chat item */
-"removed %@" = "%@ eltávolítva";
+"removed %@" = "eltávolította őt: %@";

 /* profile update event chat item */
 "removed contact address" = "törölt kapcsolattartási cím";
@@ -3998,7 +3998,7 @@
 "Server requires authorization to upload, check password" = "A kiszolgálónak engedélyre van szüksége a várólisták feltöltéséhez, ellenőrizze jelszavát";

 /* No comment provided by engineer. */
-"Server test failed!" = "Sikertelen kiszolgáló-teszt!";
+"Server test failed!" = "Sikertelen kiszolgáló teszt!";

 /* No comment provided by engineer. */
 "Server type" = "Kiszolgáló típusa";
@@ -4187,10 +4187,10 @@
 "Some file(s) were not exported:" = "Néhány fájl nem került exportálásra:";

 /* No comment provided by engineer. */
-"Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.";
+"Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importálás közben – további részletekért a csevegési konzolban olvashat.";

 /* No comment provided by engineer. */
-"Some non-fatal errors occurred during import:" = "Néhány nem végzetes hiba történt az importálás során:";
+"Some non-fatal errors occurred during import:" = "Néhány nem végzetes hiba történt az importálás közben:";

 /* notification title */
 "Somebody" = "Valaki";
@@ -4373,7 +4373,7 @@
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "A titkosítás működik, és új titkosítási egyezményre nincs szükség. Ez kapcsolati hibákat eredményezhet!";

 /* No comment provided by engineer. */
-"The hash of the previous message is different." = "Az előző üzenet hash-e más.";
+"The hash of the previous message is different." = "Az előző üzenet ellenőrzőösszege különbözik.";

 /* No comment provided by engineer. */
 "The ID of the next message is incorrect (less or equal to the previous).\nIt can happen because of some bug or when the connection is compromised." = "A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.";
@@ -4394,7 +4394,7 @@
 "The next generation of private messaging" = "A privát üzenetküldés következő generációja";

 /* No comment provided by engineer. */
-"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem került eltávolításra az átköltöztetés során, így törölhető.";
+"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem került eltávolításra az átköltöztetés közben, így törölhető.";

 /* No comment provided by engineer. */
 "The profile is only shared with your contacts." = "Profilja csak az ismerőseivel kerül megosztásra.";
@@ -4553,7 +4553,7 @@
 "Unblock member?" = "Tag feloldása?";

 /* rcv group event chat item */
-"unblocked %@" = "%@ feloldva";
+"unblocked %@" = "feloldotta %@ letiltását";

 /* No comment provided by engineer. */
 "Unexpected migration state" = "Váratlan átköltöztetési állapot";
@@ -4973,7 +4973,7 @@
 "you are observer" = "megfigyelő szerep";

 /* snd group event chat item */
-"you blocked %@" = "blokkolta őt: %@";
+"you blocked %@" = "ön letiltotta %@-t";

 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Hívásokat fogadhat a lezárási képernyőről, eszköz- és alkalmazáshitelesítés nélkül.";
@@ -5105,7 +5105,7 @@
 "you shared one-time link incognito" = "egyszer használatos hivatkozást osztott meg inkognitóban";

 /* snd group event chat item */
-"you unblocked %@" = "feloldotta %@ blokkolását";
+"you unblocked %@" = "ön feloldotta %@ letiltását";

 /* No comment provided by engineer. */
 "You will be connected to group when the group host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";
@@ -1089,7 +1089,7 @@
 "Connection" = "Connessione";

 /* No comment provided by engineer. */
-"Connection and servers status." = "Stato di connessione e server.";
+"Connection and servers status." = "Stato della connessione e dei server.";

 /* No comment provided by engineer. */
 "Connection error" = "Errore di connessione";
@@ -4502,7 +4502,7 @@
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Per verificare la crittografia end-to-end con il tuo contatto, confrontate (o scansionate) il codice sui vostri dispositivi.";

 /* No comment provided by engineer. */
-"Toggle chat list:" = "Cambia elenco chat:";
+"Toggle chat list:" = "Cambia l'elenco delle chat:";

 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Attiva/disattiva l'incognito quando ti colleghi.";
@@ -2630,7 +2630,7 @@
 "Keep" = "Bewaar";

 /* No comment provided by engineer. */
-"Keep conversation" = "Blijf in gesprek";
+"Keep conversation" = "Behoud het gesprek";

 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Houd de app geopend om deze vanaf de desktop te gebruiken";
@@ -472,6 +472,9 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Zezwalaj na połączenia tylko wtedy, gdy Twój kontakt na to pozwala.";

+/* No comment provided by engineer. */
+"Allow calls?" = "Zezwolić na połączenia?";
+
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Zezwól na znikające wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli.";

@@ -493,6 +496,9 @@
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Zezwól na wysyłanie znikających wiadomości.";

+/* No comment provided by engineer. */
+"Allow sharing" = "Zezwól na udostępnianie";
+
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Zezwól na nieodwracalne usunięcie wysłanych wiadomości. (24 godziny)";

@@ -589,6 +595,12 @@
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiwizuj i prześlij";

+/* No comment provided by engineer. */
+"Archive contacts to chat later." = "Archiwizuj kontakty aby porozmawiać później.";
+
+/* No comment provided by engineer. */
+"Archived contacts" = "Zarchiwizowane kontakty";
+
 /* No comment provided by engineer. */
 "Archiving database" = "Archiwizowanie bazy danych";

@@ -664,6 +676,9 @@
 /* No comment provided by engineer. */
 "Better messages" = "Lepsze wiadomości";

+/* No comment provided by engineer. */
+"Better networking" = "Lepsze sieciowanie";
+
 /* No comment provided by engineer. */
 "Black" = "Czarny";

@@ -697,6 +712,12 @@
 /* No comment provided by engineer. */
 "Blocked by admin" = "Zablokowany przez admina";

+/* No comment provided by engineer. */
+"Blur for better privacy." = "Rozmycie dla lepszej prywatności.";
+
+/* No comment provided by engineer. */
+"Blur media" = "Rozmycie mediów";
+
 /* No comment provided by engineer. */
 "bold" = "pogrubiona";

@@ -721,6 +742,9 @@
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Według profilu czatu (domyślnie) lub [według połączenia](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";

+/* No comment provided by engineer. */
+"call" = "zadzwoń";
+
 /* No comment provided by engineer. */
 "Call already ended!" = "Połączenie już zakończone!";

@@ -736,15 +760,27 @@
 /* No comment provided by engineer. */
 "Calls" = "Połączenia";

+/* No comment provided by engineer. */
+"Calls prohibited!" = "Połączenia zakazane!";
+
 /* No comment provided by engineer. */
 "Camera not available" = "Kamera nie dostępna";

+/* No comment provided by engineer. */
+"Can't call contact" = "Nie można zadzwonić do kontaktu";
+
+/* No comment provided by engineer. */
+"Can't call member" = "Nie można zadzwonić do członka";
+
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Nie można zaprosić kontaktu!";

 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Nie można zaprosić kontaktów!";

+/* No comment provided by engineer. */
+"Can't message member" = "Nie można wysłać wiadomości do członka";
+
 /* No comment provided by engineer. */
 "Cancel" = "Anuluj";

@@ -830,6 +866,9 @@
 /* No comment provided by engineer. */
 "Chat database deleted" = "Baza danych czatu usunięta";

+/* No comment provided by engineer. */
+"Chat database exported" = "Wyeksportowano bazę danych czatu";
+
 /* No comment provided by engineer. */
 "Chat database imported" = "Zaimportowano bazę danych czatu";

@@ -842,6 +881,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." = "Czat został zatrzymany. Jeśli korzystałeś już z tej bazy danych na innym urządzeniu, powinieneś przenieść ją z powrotem przed rozpoczęciem czatu.";

+/* No comment provided by engineer. */
+"Chat list" = "Lista czatów";
+
 /* No comment provided by engineer. */
 "Chat migrated!" = "Czat zmigrowany!";

@@ -893,6 +935,9 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Wyczyść weryfikację";

+/* No comment provided by engineer. */
+"Color chats with the new themes." = "Koloruj czaty z nowymi motywami.";
+
 /* No comment provided by engineer. */
 "Color mode" = "Tryb koloru";

@@ -920,6 +965,9 @@
 /* No comment provided by engineer. */
 "Confirm" = "Potwierdź";

+/* No comment provided by engineer. */
+"Confirm contact deletion?" = "Potwierdzić usunięcie kontaktu?";
+
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Potwierdź aktualizacje bazy danych";

@@ -959,6 +1007,9 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "połącz się z deweloperami SimpleX Chat.";

+/* No comment provided by engineer. */
+"Connect to your friends faster." = "Szybciej łącz się ze znajomymi.";
+
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Połączyć się ze sobą?";

@@ -1025,6 +1076,9 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Łączenie z serwerem... (błąd: %@)";

+/* No comment provided by engineer. */
+"Connecting to contact, please wait or check later!" = "Łączenie z kontaktem, poczekaj lub sprawdź później!";
+
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Łączenie z komputerem";

@@ -1034,6 +1088,9 @@
 /* No comment provided by engineer. */
 "Connection" = "Połączenie";

+/* No comment provided by engineer. */
+"Connection and servers status." = "Stan połączenia i serwerów.";
+
 /* No comment provided by engineer. */
 "Connection error" = "Błąd połączenia";

@@ -1043,6 +1100,9 @@
 /* chat list item title (it should not be shown */
 "connection established" = "połączenie ustanowione";

+/* No comment provided by engineer. */
+"Connection notifications" = "Powiadomienia o połączeniu";
+
 /* No comment provided by engineer. */
 "Connection request sent!" = "Prośba o połączenie wysłana!";

@@ -1070,6 +1130,9 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Kontakt już istnieje";

+/* No comment provided by engineer. */
+"Contact deleted!" = "Kontakt usunięty!";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "kontakt posiada szyfrowanie e2e";

@@ -1082,12 +1145,18 @@
 /* notification */
 "Contact is connected" = "Kontakt jest połączony";

+/* No comment provided by engineer. */
+"Contact is deleted." = "Kontakt jest usunięty.";
+
 /* No comment provided by engineer. */
 "Contact name" = "Nazwa kontaktu";

 /* No comment provided by engineer. */
 "Contact preferences" = "Preferencje kontaktu";

+/* No comment provided by engineer. */
+"Contact will be deleted - this cannot be undone!" = "Kontakt zostanie usunięty – nie można tego cofnąć!";
+
 /* No comment provided by engineer. */
 "Contacts" = "Kontakty";

@@ -1097,6 +1166,9 @@
 /* No comment provided by engineer. */
 "Continue" = "Kontynuuj";

+/* No comment provided by engineer. */
+"Conversation deleted!" = "Rozmowa usunięta!";
+
 /* No comment provided by engineer. */
 "Copy" = "Kopiuj";

@@ -1281,6 +1353,9 @@
   swipe action */
 "Delete" = "Usuń";

+/* No comment provided by engineer. */
+"Delete %lld messages of members?" = "Usunąć %lld wiadomości członków?";
+
 /* No comment provided by engineer. */
 "Delete %lld messages?" = "Usunąć %lld wiadomości?";

@@ -1317,6 +1392,9 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Usuń kontakt";

+/* No comment provided by engineer. */
+"Delete contact?" = "Usunąć kontakt?";
+
 /* No comment provided by engineer. */
 "Delete database" = "Usuń bazę danych";

@@ -1380,9 +1458,15 @@
 /* server test step */
 "Delete queue" = "Usuń kolejkę";

+/* No comment provided by engineer. */
+"Delete up to 20 messages at once." = "Usuń do 20 wiadomości na raz.";
+
 /* No comment provided by engineer. */
 "Delete user profile?" = "Usunąć profil użytkownika?";

+/* No comment provided by engineer. */
+"Delete without notification" = "Usuń bez powiadomienia";
+
 /* deleted chat item */
 "deleted" = "usunięty";

@@ -1425,9 +1509,15 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Urządzenia komputerowe";

+/* No comment provided by engineer. */
+"Destination server address of %@ is incompatible with forwarding server %@ settings." = "Adres serwera docelowego %@ jest niekompatybilny z ustawieniami serwera przekazującego %@.";
+
 /* snd error text */
 "Destination server error: %@" = "Błąd docelowego serwera: %@";

+/* No comment provided by engineer. */
+"Destination server version of %@ is incompatible with forwarding server %@." = "Wersja serwera docelowego %@ jest niekompatybilna z serwerem przekierowującym %@.";
+
 /* No comment provided by engineer. */
 "Detailed statistics" = "Szczegółowe statystyki";

@@ -1437,6 +1527,9 @@
 /* No comment provided by engineer. */
 "Develop" = "Deweloperskie";

+/* No comment provided by engineer. */
+"Developer options" = "Opcje deweloperskie";
+
 /* No comment provided by engineer. */
 "Developer tools" = "Narzędzia deweloperskie";

@@ -1476,6 +1569,9 @@
 /* No comment provided by engineer. */
 "disabled" = "wyłączony";

+/* No comment provided by engineer. */
+"Disabled" = "Wyłączony";
+
 /* No comment provided by engineer. */
 "Disappearing message" = "Znikająca wiadomość";

@@ -1623,6 +1719,9 @@
 /* enabled status */
 "enabled" = "włączone";

+/* No comment provided by engineer. */
+"Enabled" = "Włączony";
+
 /* No comment provided by engineer. */
 "Enabled for" = "Włączony dla";

@@ -1764,6 +1863,9 @@
 /* No comment provided by engineer. */
 "Error changing setting" = "Błąd zmiany ustawienia";

+/* No comment provided by engineer. */
+"Error connecting to forwarding server %@. Please try later." = "Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.";
+
 /* No comment provided by engineer. */
 "Error creating address" = "Błąd tworzenia adresu";

@@ -2074,6 +2176,15 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Przekazane dalej od";

+/* No comment provided by engineer. */
+"Forwarding server %@ failed to connect to destination server %@. Please try later." = "Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.";
+
+/* No comment provided by engineer. */
+"Forwarding server address is incompatible with network settings: %@." = "Adres serwera przekierowującego jest niekompatybilny z ustawieniami sieciowymi: %@.";
+
+/* No comment provided by engineer. */
+"Forwarding server version is incompatible with network settings: %@." = "Wersja serwera przekierowującego jest niekompatybilna z ustawieniami sieciowymi: %@.";
+
 /* snd error text */
 "Forwarding server: %@\nDestination server error: %@" = "Serwer przekazujący: %1$@\nBłąd serwera docelowego: %2$@";

@@ -2425,6 +2536,9 @@
 /* group name */
 "invitation to group %@" = "zaproszenie do grupy %@";

+/* No comment provided by engineer. */
+"invite" = "zaproś";
+
 /* No comment provided by engineer. */
 "Invite friends" = "Zaproś znajomych";

@@ -2470,6 +2584,9 @@
 /* No comment provided by engineer. */
 "It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Może to nastąpić, gdy:\n1. Wiadomości wygasły w wysyłającym kliencie po 2 dniach lub na serwerze po 30 dniach.\n2. Odszyfrowanie wiadomości nie powiodło się, ponieważ Ty lub Twój kontakt użyliście starej kopii zapasowej bazy danych.\n3. Połączenie zostało skompromitowane.";

+/* No comment provided by engineer. */
+"It protects your IP address and connections." = "Chroni Twój adres IP i połączenia.";
+
 /* No comment provided by engineer. */
 "It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Wygląda na to, że jesteś już połączony przez ten link. Jeśli tak nie jest, wystąpił błąd (%@).";

@@ -2512,6 +2629,9 @@
 /* No comment provided by engineer. */
 "Keep" = "Zachowaj";

+/* No comment provided by engineer. */
+"Keep conversation" = "Zachowaj rozmowę";
+
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Zostaw aplikację otwartą i używaj ją z komputera";

@@ -2623,6 +2743,12 @@
 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Maksymalnie 30 sekund, odbierane natychmiast.";

+/* No comment provided by engineer. */
+"Media & file servers" = "Serwery mediów i plików";
+
+/* blur media */
+"Medium" = "Średni";
+
 /* member role */
 "member" = "członek";

@@ -2650,6 +2776,9 @@
 /* No comment provided by engineer. */
 "Menus" = "Menu";

+/* No comment provided by engineer. */
+"message" = "wiadomość";
+
 /* item status text */
 "Message delivery error" = "Błąd dostarczenia wiadomości";

@@ -2686,6 +2815,9 @@
 /* No comment provided by engineer. */
 "Message reception" = "Odebranie wiadomości";

+/* No comment provided by engineer. */
+"Message servers" = "Serwery wiadomości";
+
 /* No comment provided by engineer. */
 "Message source remains private." = "Źródło wiadomości pozostaje prywatne.";

@@ -2794,6 +2926,9 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Wiele profili czatu";

+/* No comment provided by engineer. */
+"mute" = "wycisz";
+
 /* swipe action */
 "Mute" = "Wycisz";

@@ -2827,6 +2962,9 @@
 /* No comment provided by engineer. */
 "New chat" = "Nowy czat";

+/* No comment provided by engineer. */
+"New chat experience 🎉" = "Nowe możliwości czatu 🎉";
+
 /* notification */
 "New contact request" = "Nowa prośba o kontakt";

@@ -2845,6 +2983,9 @@
 /* No comment provided by engineer. */
 "New in %@" = "Nowość w %@";

+/* No comment provided by engineer. */
+"New media options" = "Nowe opcje mediów";
+
 /* No comment provided by engineer. */
 "New member role" = "Nowa rola członka";

@@ -2914,6 +3055,9 @@
 /* No comment provided by engineer. */
 "Not compatible!" = "Nie kompatybilny!";

+/* No comment provided by engineer. */
+"Nothing selected" = "Nic nie jest zaznaczone";
+
 /* No comment provided by engineer. */
 "Notifications" = "Powiadomienia";

@@ -2970,6 +3114,9 @@
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Tylko urządzenia klienckie przechowują profile użytkowników, kontakty, grupy i wiadomości wysyłane za pomocą **2-warstwowego szyfrowania end-to-end**.";

+/* No comment provided by engineer. */
+"Only delete conversation" = "Usuń tylko rozmowę";
+
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Tylko właściciele grup mogą zmieniać preferencje grupy.";

@@ -3126,6 +3273,12 @@
 /* No comment provided by engineer. */
 "PING interval" = "Interwał PINGU";

+/* No comment provided by engineer. */
+"Play from the chat list." = "Odtwórz z listy czatów.";
+
+/* No comment provided by engineer. */
+"Please ask your contact to enable calls." = "Poproś kontakt o włącznie połączeń.";
+
 /* No comment provided by engineer. */
 "Please ask your contact to enable sending voice messages." = "Poproś Twój kontakt o włączenie wysyłania wiadomości głosowych.";

@@ -3306,6 +3459,9 @@
 /* No comment provided by engineer. */
 "Rate the app" = "Oceń aplikację";

+/* No comment provided by engineer. */
+"Reachable chat toolbar" = "Osiągalny pasek narzędzi czatu";
+
 /* chat item menu */
 "React…" = "Reaguj…";

@@ -3493,6 +3649,9 @@
 /* No comment provided by engineer. */
 "Reset" = "Resetuj";

+/* No comment provided by engineer. */
+"Reset all hints" = "Zresetuj wszystkie wskazówki";
+
 /* No comment provided by engineer. */
 "Reset all statistics" = "Resetuj wszystkie statystyki";

@@ -3568,6 +3727,9 @@
 /* No comment provided by engineer. */
 "Save and notify group members" = "Zapisz i powiadom członków grupy";

+/* No comment provided by engineer. */
+"Save and reconnect" = "Zapisz i połącz ponownie";
+
 /* No comment provided by engineer. */
 "Save and update group profile" = "Zapisz i zaktualizuj profil grupowy";

@@ -3643,6 +3805,9 @@
 /* No comment provided by engineer. */
 "Scan server QR code" = "Zeskanuj kod QR serwera";

+/* No comment provided by engineer. */
+"search" = "szukaj";
+
 /* No comment provided by engineer. */
 "Search" = "Szukaj";

@@ -3682,6 +3847,9 @@
 /* chat item action */
 "Select" = "Wybierz";

+/* No comment provided by engineer. */
+"Selected %lld" = "Zaznaczono %lld";
+
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Wybrane preferencje czatu zabraniają tej wiadomości.";

@@ -3724,6 +3892,9 @@
 /* No comment provided by engineer. */
 "Send live message" = "Wyślij wiadomość na żywo";

+/* No comment provided by engineer. */
+"Send message to enable calls." = "Wyślij wiadomość aby włączyć połączenia.";
+
 /* No comment provided by engineer. */
 "Send messages directly when IP address is protected and your or destination server does not support private routing." = "Wysyłaj wiadomości bezpośrednio, gdy adres IP jest chroniony i Twój lub docelowy serwer nie obsługuje prywatnego trasowania.";

@@ -3904,12 +4075,18 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Udostępnić adres kontaktom?";

+/* No comment provided by engineer. */
+"Share from other apps." = "Udostępnij z innych aplikacji.";
+
 /* No comment provided by engineer. */
 "Share link" = "Udostępnij link";

 /* No comment provided by engineer. */
 "Share this 1-time invite link" = "Udostępnij ten jednorazowy link";

+/* No comment provided by engineer. */
+"Share to SimpleX" = "Udostępnij do SimpleX";
+
 /* No comment provided by engineer. */
 "Share with contacts" = "Udostępnij kontaktom";

@@ -4003,9 +4180,18 @@
 /* No comment provided by engineer. */
 "SMP server" = "Serwer SMP";

+/* blur media */
+"Soft" = "Łagodny";
+
+/* No comment provided by engineer. */
+"Some file(s) were not exported:" = "Niektóre plik(i) nie zostały wyeksportowane:";
+
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.";

+/* No comment provided by engineer. */
+"Some non-fatal errors occurred during import:" = "Podczas importu wystąpiły niekrytyczne błędy:";
+
 /* notification title */
 "Somebody" = "Ktoś";

@@ -4072,6 +4258,9 @@
 /* No comment provided by engineer. */
 "strike" = "strajk";

+/* blur media */
+"Strong" = "Silne";
+
 /* No comment provided by engineer. */
 "Submit" = "Zatwierdź";

@@ -4117,6 +4306,9 @@
 /* No comment provided by engineer. */
 "Tap to scan" = "Dotknij, aby zeskanować";

+/* No comment provided by engineer. */
+"TCP connection" = "Połączenie TCP";
+
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Limit czasu połączenia TCP";

@@ -4192,6 +4384,12 @@
 /* No comment provided by engineer. */
 "The message will be marked as moderated for all members." = "Wiadomość zostanie oznaczona jako moderowana dla wszystkich członków.";

+/* No comment provided by engineer. */
+"The messages will be deleted for all members." = "Wiadomości zostaną usunięte dla wszystkich członków.";
+
+/* No comment provided by engineer. */
+"The messages will be marked as moderated for all members." = "Wiadomości zostaną oznaczone jako moderowane dla wszystkich członków.";
+
 /* No comment provided by engineer. */
 "The next generation of private messaging" = "Następna generacja prywatnych wiadomości";

@@ -4303,9 +4501,15 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Aby zweryfikować szyfrowanie end-to-end z Twoim kontaktem porównaj (lub zeskanuj) kod na waszych urządzeniach.";

+/* No comment provided by engineer. */
+"Toggle chat list:" = "Przełącz listę czatów:";
+
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Przełącz incognito przy połączeniu.";

+/* No comment provided by engineer. */
+"Toolbar opacity" = "Nieprzezroczystość paska narzędzi";
+
 /* No comment provided by engineer. */
 "Total" = "Łącznie";

@@ -4408,6 +4612,9 @@
 /* authentication reason */
 "Unlock app" = "Odblokuj aplikację";

+/* No comment provided by engineer. */
+"unmute" = "wyłącz wyciszenie";
+
 /* swipe action */
 "Unmute" = "Wyłącz wyciszenie";

@@ -4429,6 +4636,9 @@
 /* No comment provided by engineer. */
 "Update network settings?" = "Zaktualizować ustawienia sieci?";

+/* No comment provided by engineer. */
+"Update settings?" = "Zaktualizować ustawienia?";
+
 /* rcv group event chat item */
 "updated group profile" = "zaktualizowano profil grupy";

@@ -4498,6 +4708,9 @@
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Używaj aplikacji podczas połączenia.";

+/* No comment provided by engineer. */
+"Use the app with one hand." = "Korzystaj z aplikacji jedną ręką.";
+
 /* No comment provided by engineer. */
 "User profile" = "Profil użytkownika";

@@ -4552,6 +4765,9 @@
 /* No comment provided by engineer. */
 "Via secure quantum resistant protocol." = "Dzięki bezpiecznemu protokołowi odpornego kwantowo.";

+/* No comment provided by engineer. */
+"video" = "wideo";
+
 /* No comment provided by engineer. */
 "Video call" = "Połączenie wideo";

@@ -4762,6 +4978,9 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Możesz przyjmować połączenia z ekranu blokady, bez uwierzytelniania urządzenia i aplikacji.";

+/* No comment provided by engineer. */
+"You can change it in Appearance settings." = "Możesz to zmienić w ustawieniach wyglądu.";
+
 /* No comment provided by engineer. */
 "You can create it later" = "Możesz go utworzyć później";

@@ -4783,6 +5002,9 @@
 /* notification body */
 "You can now chat with %@" = "Możesz teraz wysyłać wiadomości do %@";

+/* No comment provided by engineer. */
+"You can send messages to %@ from Archived contacts." = "Możesz wysyłać wiadomości do %@ ze zarchiwizowanych kontaktów.";
+
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Podgląd powiadomień na ekranie blokady można ustawić w ustawieniach.";

@@ -4798,6 +5020,9 @@
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "Możesz rozpocząć czat poprzez Ustawienia aplikacji / Baza danych lub poprzez ponowne uruchomienie aplikacji";

+/* No comment provided by engineer. */
+"You can still view conversation with %@ in the list of chats." = "Nadal możesz przeglądać rozmowę z %@ na liście czatów.";
+
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Możesz włączyć blokadę SimpleX poprzez Ustawienia.";

@@ -4849,9 +5074,18 @@
 /* snd group event chat item */
 "you left" = "wyszedłeś";

+/* No comment provided by engineer. */
+"You may migrate the exported database." = "Możesz zmigrować wyeksportowaną bazy danych.";
+
+/* No comment provided by engineer. */
+"You may save the exported archive." = "Możesz zapisać wyeksportowane archiwum.";
+
 /* No comment provided by engineer. */
 "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Musisz używać najnowszej wersji bazy danych czatu TYLKO na jednym urządzeniu, w przeciwnym razie możesz przestać otrzymywać wiadomości od niektórych kontaktów.";

+/* No comment provided by engineer. */
+"You need to allow your contact to call to be able to call them." = "Aby móc dzwonić, musisz zezwolić kontaktowi na połączenia.";
+
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Musisz zezwolić Twojemu kontaktowi na wysyłanie wiadomości głosowych, aby móc je wysyłać.";

@@ -19,6 +19,7 @@ import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.*
 import chat.simplex.common.platform.*
+import chat.simplex.res.MR
 import kotlinx.coroutines.*
 import java.lang.ref.WeakReference

@@ -149,7 +150,12 @@ fun processIntent(intent: Intent?) {
    "android.intent.action.VIEW" -> {
      val uri = intent.data
      if (uri != null) {
-        chatModel.appOpenUrl.value = null to uri.toURI()
+        val transformedUri = uri.toURIOrNull()
+        if (transformedUri != null) {
+          chatModel.appOpenUrl.value = null to transformedUri
+        } else {
+          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_parsing_uri_title), generalGetString(MR.strings.error_parsing_uri_desc))
+        }
      }
    }
  }
@@ -18,5 +18,6 @@ val NotificationsMode.requiresIgnoringBattery
 lateinit var APPLICATION_ID: String

 fun Uri.toURI(): URI = URI(toString().replace("\n", ""))
+fun Uri.toURIOrNull(): URI? = try { toURI() } catch (e: Exception) { null }

 fun URI.toUri(): Uri = Uri.parse(toString())
@@ -15,13 +15,14 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.graphics.drawable.DrawableCompat
@@ -35,11 +36,12 @@ import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.views.chat.*
-import chat.simplex.common.views.helpers.SharedContent
-import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.filter
 import java.lang.reflect.Field
 import java.net.URI

@@ -52,6 +54,7 @@ actual fun PlatformTextField(
  showDeleteTextButton: MutableState<Boolean>,
  userIsObserver: Boolean,
  placeholder: String,
+  showVoiceButton: Boolean,
  onMessageChange: (String) -> Unit,
  onUpArrow: () -> Unit,
  onFilesPasted: (List<URI>) -> Unit,
@@ -82,7 +85,15 @@ actual fun PlatformTextField(
      freeFocus = true
    }
  }
+  LaunchedEffect(Unit) {
+    snapshotFlow { ModalManager.start.modalCount.value }
+      .filter { it > 0 }
+      .collect {
+        freeFocus = true
+      }
+  }

+  val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
  AndroidView(modifier = Modifier, factory = {
    val editText = @SuppressLint("AppCompatCustomView") object: EditText(it) {
      override fun setOnReceiveContentListener(
@@ -113,7 +124,8 @@ actual fun PlatformTextField(
    editText.setTextColor(textColor.toArgb())
    editText.textSize = textStyle.value.fontSize.value * appPrefs.fontScale.get()
    editText.background = ColorDrawable(Color.Transparent.toArgb())
-    editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
+    editText.textDirection = if (isRtl) EditText.TEXT_DIRECTION_LOCALE else EditText.TEXT_DIRECTION_ANY_RTL
+    editText.setPaddingRelative(paddingStart, paddingTop, paddingEnd, paddingBottom)
    editText.setText(cs.message)
    editText.hint = placeholder
    editText.setHintTextColor(hintColor.toArgb())
@@ -52,6 +52,9 @@ actual fun windowOrientation(): WindowOrientation = when (mainActivity.get()?.re
@Composable
 actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp

+@Composable
+actual fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
+
 actual fun desktopExpandWindowToWidth(width: Dp) {}

 actual fun isRtl(text: CharSequence): Boolean = BidiFormatter.getInstance().isRtl(text)
@@ -4,14 +4,21 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.views.helpers.*
+import kotlinx.coroutines.flow.filter
+import kotlin.math.absoluteValue

@Composable
 actual fun LazyColumnWithScrollBar(
  modifier: Modifier,
-  state: LazyListState,
+  state: LazyListState?,
  contentPadding: PaddingValues,
  reverseLayout: Boolean,
  verticalArrangement: Arrangement.Vertical,
@@ -20,7 +27,24 @@ actual fun LazyColumnWithScrollBar(
  userScrollEnabled: Boolean,
  content: LazyListScope.() -> Unit
 ) {
-  LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
+  val state = state ?: LocalAppBarHandler.current?.listState ?: rememberLazyListState()
+  val connection = LocalAppBarHandler.current?.connection
+  LaunchedEffect(Unit) {
+    snapshotFlow { state.firstVisibleItemScrollOffset }
+      .filter { state.firstVisibleItemIndex == 0 }
+      .collect { scrollPosition ->
+        val offset = connection?.appBarOffset
+        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
+          connection.appBarOffset = -scrollPosition.toFloat()
+//          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
+        }
+      }
+  }
+  if (connection != null) {
+    LazyColumn(modifier.nestedScroll(connection), state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
+  } else {
+    LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
+  }
 }

@Composable
@@ -28,8 +52,34 @@ actual fun ColumnWithScrollBar(
  modifier: Modifier,
  verticalArrangement: Arrangement.Vertical,
  horizontalAlignment: Alignment.Horizontal,
-  state: ScrollState,
-  content: @Composable ColumnScope.() -> Unit
+  state: ScrollState?,
+  maxIntrinsicSize: Boolean,
+  content: @Composable() (ColumnScope.() -> Unit)
 ) {
-  Column(modifier.verticalScroll(rememberScrollState()), verticalArrangement, horizontalAlignment, content)
+  val state = state ?: LocalAppBarHandler.current?.scrollState ?: rememberScrollState()
+  val connection = LocalAppBarHandler.current?.connection
+  LaunchedEffect(Unit) {
+    snapshotFlow { state.value }
+      .collect { scrollPosition ->
+        val offset = connection?.appBarOffset
+        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
+          connection.appBarOffset = -scrollPosition.toFloat()
+//          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
+        }
+      }
+  }
+  if (connection != null) {
+      Column(
+        if (maxIntrinsicSize) {
+          modifier.nestedScroll(connection).verticalScroll(state).height(IntrinsicSize.Max)
+        } else {
+          modifier.nestedScroll(connection).verticalScroll(state)
+        }, verticalArrangement, horizontalAlignment, content)
+  } else {
+      Column(if (maxIntrinsicSize) {
+        modifier.verticalScroll(state).height(IntrinsicSize.Max)
+      } else {
+        modifier.verticalScroll(state)
+      }, verticalArrangement, horizontalAlignment, content)
+  }
 }
@@ -457,7 +457,7 @@ private fun DisabledBackgroundCallsButton() {
    ) {
      Text(stringResource(MR.strings.system_restricted_background_in_call_title), color = WarningOrange)
      Spacer(Modifier.width(8.dp))
-      IconButton(onClick = { show = false }, Modifier.size(24.dp)) {
+      IconButton(onClick = { show = false }, Modifier.size(22.dp)) {
        Icon(painterResource(MR.images.ic_close), null, tint = WarningOrange)
      }
    }
@@ -539,7 +539,7 @@ fun CallPermissionsView(pipActive: Boolean, hasVideo: Boolean, cancel: () -> Uni
        Icon(
          painterResource(MR.images.ic_call_500),
          stringResource(MR.strings.permissions_record_audio),
-          Modifier.size(24.dp),
+          Modifier.size(22.dp),
          tint = Color(0xFFFFFFD8)
        )
      }
@@ -547,7 +547,7 @@ fun CallPermissionsView(pipActive: Boolean, hasVideo: Boolean, cancel: () -> Uni
        Icon(
          painterResource(MR.images.ic_videocam),
          stringResource(MR.strings.permissions_camera),
-          Modifier.size(24.dp),
+          Modifier.size(22.dp),
          tint = Color(0xFFFFFFD8)
        )
      }
@@ -241,10 +241,15 @@ private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int,
 }

 actual fun getFileName(uri: URI): String? {
-  return androidAppContext.contentResolver.query(uri.toUri(), null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    cursor.getString(nameIndex)
+  return try {
+    androidAppContext.contentResolver.query(uri.toUri(), null, null, null, null)?.use { cursor ->
+      val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+      cursor.moveToFirst()
+      // Can make an exception
+      cursor.getString(nameIndex)
+    }
+  } catch (e: Exception) {
+    null
  }
 }

@@ -13,12 +13,15 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.MaterialTheme.colors
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import dev.icerock.moko.resources.compose.stringResource
@@ -112,13 +115,13 @@ fun AppearanceScope.AppearanceLayout(
      }
    }

-    SectionDividerSpaced(maxTopPadding = true)
+    SectionDividerSpaced()
    ThemesSection(systemDarkTheme)

-    SectionDividerSpaced(maxTopPadding = true)
+    SectionDividerSpaced()
    ProfileImageSection()

-    SectionDividerSpaced()
+    SectionDividerSpaced(maxTopPadding = true)

    SectionView(stringResource(MR.strings.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
      LazyRow {
@@ -129,7 +132,8 @@ fun AppearanceScope.AppearanceLayout(
            contentDescription = "",
            contentScale = ContentScale.Fit,
            modifier = Modifier
-              .shadow(if (item == icon.value) 1.dp else 0.dp, ambientColor = colors.secondaryVariant)
+              .border(1.dp, color = if (item == icon.value) colors.secondaryVariant else Color.Transparent, RoundedCornerShape(percent = 22))
+              .clip(RoundedCornerShape(percent = 22))
              .size(70.dp)
              .clickable { changeIcon(item) }
              .padding(10.dp)
@@ -143,7 +147,7 @@ fun AppearanceScope.AppearanceLayout(
      }
    }

-    SectionDividerSpaced(maxBottomPadding = true)
+    SectionDividerSpaced(maxTopPadding = true)
    FontScaleSection()

    SectionBottomSpacer()
@@ -19,9 +19,9 @@ actual fun SettingsSectionApp(
  withAuth: (title: String, desc: String, block: () -> Unit) -> Unit
 ) {
  SectionView(stringResource(MR.strings.settings_section_title_app)) {
-    SettingsActionItem(painterResource(MR.images.ic_restart_alt), stringResource(MR.strings.settings_restart_app), ::restartApp, extraPadding = true)
-    SettingsActionItem(painterResource(MR.images.ic_power_settings_new), stringResource(MR.strings.settings_shutdown), { shutdownAppAlert(::shutdownApp) }, extraPadding = true)
-    SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) }, extraPadding = true)
+    SettingsActionItem(painterResource(MR.images.ic_restart_alt), stringResource(MR.strings.settings_restart_app), ::restartApp)
+    SettingsActionItem(painterResource(MR.images.ic_power_settings_new), stringResource(MR.strings.settings_shutdown), { shutdownAppAlert(::shutdownApp) })
+    SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) })
    AppVersionItem(showVersion)
  }
 }
@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})

 	target_link_libraries(app-lib rts simplex)
@@ -17,6 +17,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.views.usersettings.SetDeliveryReceiptsView
 import chat.simplex.common.model.*
@@ -50,6 +51,7 @@ data class SettingsViewState(

@Composable
 fun AppScreen() {
+  AppBarHandler.appBarMaxHeightPx = with(LocalDensity.current) { AppBarHeight.roundToPx() }
  SimpleXTheme {
    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
      Surface(color = MaterialTheme.colors.background, contentColor = LocalContentColor.current) {
@@ -333,7 +335,7 @@ fun StartPartOfScreen(settingsState: SettingsViewState) {
 fun CenterPartOfScreen() {
  val currentChatId = remember { ChatModel.chatId }
  LaunchedEffect(Unit) {
-    snapshotFlow { currentChatId }
+    snapshotFlow { currentChatId.value }
      .distinctUntilChanged()
      .collect {
        if (it != null) {
@@ -275,6 +275,11 @@ object ChatModel {
      }
    }
    suspend fun addChatItem(rhId: Long?, cInfo: ChatInfo, cItem: ChatItem) {
+      // mark chat non deleted
+      if (cInfo is ChatInfo.Direct && cInfo.chatDeleted) {
+        val updatedContact = cInfo.contact.copy(chatDeleted = false)
+        updateContact(rhId, updatedContact)
+      }
      // update previews
      val i = getChatIndex(rhId, cInfo.id)
      val chat: Chat
@@ -879,6 +884,11 @@ interface NamedChat {
  val localAlias: String
  val chatViewName: String
    get() = localAlias.ifEmpty { displayName + (if (fullName == "" || fullName == displayName) "" else " / $fullName") }
+
+  fun anyNameContains(searchAnyCase: String): Boolean {
+    val s = searchAnyCase.trim().lowercase()
+    return chatViewName.lowercase().contains(s) || displayName.lowercase().contains(s) || fullName.lowercase().contains(s)
+  }
 }

 interface SomeChat {
@@ -1482,21 +1492,23 @@ data class GroupMember (
  val memberContactId: Long? = null,
  val memberContactProfileId: Long,
  var activeConn: Connection? = null
-) {
+): NamedChat {
  val id: String get() = "#$groupId @$groupMemberId"
-  val displayName: String
+  override val displayName: String
    get() {
      val p = memberProfile
      val name = p.localAlias.ifEmpty { p.displayName }
      return pastMember(name)
    }
-  val fullName: String get() = memberProfile.fullName
-  val image: String? get() = memberProfile.image
+  override val fullName: String get() = memberProfile.fullName
+  override val image: String? get() = memberProfile.image
  val contactLink: String? = memberProfile.contactLink
  val verified get() = activeConn?.connectionCode != null
  val blocked get() = blockedByAdmin || !memberSettings.showMessages

-  val chatViewName: String
+  override val localAlias: String = memberProfile.localAlias
+
+  override val chatViewName: String
    get() {
      val p = memberProfile
      val name = p.localAlias.ifEmpty { p.displayName + (if (p.fullName == "" || p.fullName == p.displayName) "" else " / ${p.fullName}") }
@@ -2136,12 +2136,6 @@ object ChatController {
        val cInfo = r.chatItem.chatInfo
        val cItem = r.chatItem.chatItem
        if (active(r.user)) {
-          if (cInfo is ChatInfo.Direct && cInfo.chatDeleted) {
-            val updatedContact = cInfo.contact.copy(chatDeleted = false)
-            withChats {
-              updateContact(rhId, updatedContact)
-            }
-          }
          withChats {
            addChatItem(rhId, cInfo, cItem)
          }
@@ -2529,6 +2523,8 @@ object ChatController {
          ModalManager.fullscreen.closeModals()
          fun showAlert(chatError: ChatError) {
            when {
+              r.rcStopReason is RemoteCtrlStopReason.Disconnected ->
+                {}
              r.rcStopReason is RemoteCtrlStopReason.ConnectionFailed
                  && r.rcStopReason.chatError is ChatError.ChatErrorAgent
                  && r.rcStopReason.chatError.agentError is AgentErrorType.RCP
@@ -28,9 +28,6 @@ interface PlatformInterface {
  fun androidRestartNetworkObserver() {}
  @Composable fun androidLockPortraitOrientation() {}
  suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
-  @Composable fun desktopScrollBarComponents(): Triple<Animatable<Float, AnimationVector1D>, Modifier, MutableState<Job>> = remember { Triple(Animatable(0f), Modifier, mutableStateOf(Job())) }
-  @Composable fun desktopScrollBar(state: LazyListState, modifier: Modifier, scrollBarAlpha: Animatable<Float, AnimationVector1D>, scrollJob: MutableState<Job>, reversed: Boolean) {}
-  @Composable fun desktopScrollBar(state: ScrollState, modifier: Modifier, scrollBarAlpha: Animatable<Float, AnimationVector1D>, scrollJob: MutableState<Job>, reversed: Boolean) {}
  @Composable fun desktopShowAppUpdateNotice() {}
 }
 /**
@@ -15,6 +15,7 @@ expect fun PlatformTextField(
  showDeleteTextButton: MutableState<Boolean>,
  userIsObserver: Boolean,
  placeholder: String,
+  showVoiceButton: Boolean,
  onMessageChange: (String) -> Unit,
  onUpArrow: () -> Unit,
  onFilesPasted: (List<URI>) -> Unit,
@@ -30,6 +30,9 @@ expect fun windowOrientation(): WindowOrientation
@Composable
 expect fun windowWidth(): Dp

+@Composable
+expect fun windowHeight(): Dp
+
 expect fun desktopExpandWindowToWidth(width: Dp)

 expect fun isRtl(text: CharSequence): Boolean
@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp
@Composable
 expect fun LazyColumnWithScrollBar(
  modifier: Modifier = Modifier,
-  state: LazyListState = rememberLazyListState(),
+  state: LazyListState? = null,
  contentPadding: PaddingValues = PaddingValues(0.dp),
  reverseLayout: Boolean = false,
  verticalArrangement: Arrangement.Vertical =
@@ -29,6 +29,8 @@ expect fun ColumnWithScrollBar(
  modifier: Modifier = Modifier,
  verticalArrangement: Arrangement.Vertical = Arrangement.Top,
  horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-  state: ScrollState = rememberScrollState(),
+  state: ScrollState? = null,
+  // set true when you want to show something in the center with respected .fillMaxSize()
+  maxIntrinsicSize: Boolean = false,
  content: @Composable ColumnScope.() -> Unit
 )
@@ -607,6 +607,8 @@ val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
 val DEFAULT_BOTTOM_PADDING = 48.dp
 val DEFAULT_BOTTOM_BUTTON_PADDING = 20.dp
+val DEFAULT_MIN_SECTION_ITEM_HEIGHT = 50.dp
+val DEFAULT_MIN_SECTION_ITEM_PADDING_VERTICAL = 15.dp

 val DEFAULT_START_MODAL_WIDTH = 388.dp
 val DEFAULT_MIN_CENTER_MODAL_WIDTH = 590.dp
@@ -49,7 +49,9 @@ object ThemeManager {
      return perUserTheme
    }
    val defaultTheme = defaultActiveTheme(appSettingsTheme)
-    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper)
+    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper
+      // Situation when user didn't change global theme at all (it is not saved yet). Using defaults
+      ?: ThemeWallpaper.from(PresetWallpaper.SCHOOL.toType(CurrentColors.value.base), null, null))
  }

  fun currentColors(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ActiveTheme {
@@ -125,19 +125,13 @@ fun TerminalLayout(
  }
 }

-private var lazyListState = 0 to 0
-
@Composable
 fun TerminalLog() {
-  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
-  DisposableEffect(Unit) {
-    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
-  }
  val reversedTerminalItems by remember {
    derivedStateOf { chatModel.terminalItems.value.asReversed() }
  }
  val clipboard = LocalClipboardManager.current
-  LazyColumnWithScrollBar(state = listState, reverseLayout = true) {
+  LazyColumnWithScrollBar(reverseLayout = true) {
    items(reversedTerminalItems) { item ->
      val rhId = item.remoteHostId
      val rhIdStr = if (rhId == null) "" else "$rhId "
@@ -111,53 +111,59 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
  val scrollState = rememberScrollState()
  val keyboardState by getKeyboardState()
  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Column(
-      modifier = Modifier
-        .fillMaxSize()
-        .themedBackground(),
-      horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-      CloseSheetBar(close = {
-        if (chatModel.users.none { !it.user.hidden }) {
-          appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        } else {
-          close()
-        }
-      })
-      BackHandler(onBack = {
-        appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-      })
-
-      ColumnWithScrollBar(
-        modifier = if (appPlatform.isAndroid) Modifier.fillMaxSize() else Modifier.widthIn(max = 600.dp).fillMaxHeight(),
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
+  ) {
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      Column(
+        modifier = Modifier
+          .fillMaxSize()
+          .themedBackground(),
+        horizontalAlignment = Alignment.CenterHorizontally
      ) {
-        val displayName = rememberSaveable { mutableStateOf("") }
-        val focusRequester = remember { FocusRequester() }
-        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-          AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
-          ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
-          Spacer(Modifier.height(DEFAULT_PADDING))
-          ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-          ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-          OnboardingActionButton(
-            if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-            labelId = MR.strings.create_profile_button,
-            onboarding = null,
-            enabled = canCreateProfile(displayName.value),
-            onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
-          )
-          // Reserve space
-          TextButtonBelowOnboardingButton("", null)
-        }
+        CloseSheetBar(close = {
+          if (chatModel.users.none { !it.user.hidden }) {
+            appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+          } else {
+            close()
+          }
+        })
+        BackHandler(onBack = {
+          appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+        })

-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
+        ColumnWithScrollBar(
+          modifier = Modifier.fillMaxSize()
+        ) {
+          val displayName = rememberSaveable { mutableStateOf("") }
+          val focusRequester = remember { FocusRequester() }
+          Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally)) {
+            Box(Modifier.align(Alignment.CenterHorizontally)) {
+              AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING, withPadding = false)
+            }
+            ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
+            Spacer(Modifier.height(DEFAULT_PADDING))
+            ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+            ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+          }
+          Spacer(Modifier.fillMaxHeight().weight(1f))
+          Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+            OnboardingActionButton(
+              if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+              labelId = MR.strings.create_profile_button,
+              onboarding = null,
+              enabled = canCreateProfile(displayName.value),
+              onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
+            )
+            // Reserve space
+            TextButtonBelowOnboardingButton("", null)
+          }
+
+          LaunchedEffect(Unit) {
+            delay(300)
+            focusRequester.requestFocus()
+          }
        }
      }
      LaunchedEffect(Unit) {
@@ -599,7 +599,7 @@ fun ChatInfoLayout(
        }
      }
    }
-    SectionDividerSpaced()
+    SectionDividerSpaced(maxBottomPadding = false)

    val conn = contact.activeConn
    if (conn != null) {
@@ -616,7 +616,7 @@ fun ChatInfoLayout(
        ShareAddressButton { clipboard.shareText(simplexChatLink(contact.contactLink)) }
        SectionTextFooter(stringResource(MR.strings.you_can_share_this_address_with_your_contacts).format(contact.displayName))
      }
-      SectionDividerSpaced()
+      SectionDividerSpaced(maxTopPadding = true)
    }

    if (contact.ready && contact.active) {
@@ -650,7 +650,7 @@ fun ChatInfoLayout(
          }
        }
      }
-      SectionDividerSpaced()
+      SectionDividerSpaced(maxBottomPadding = false)
    }

    SectionView {
@@ -970,7 +970,7 @@ fun InfoViewActionButton(
          Icon(
            icon,
            contentDescription = null,
-            Modifier.size(24.dp * fontSizeSqrtMultiplier),
+            Modifier.size(22.dp * fontSizeSqrtMultiplier),
            tint = if (disabledLook) MaterialTheme.colors.secondary else MaterialTheme.colors.onPrimary
          )
        }
@@ -224,7 +224,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
    Row(
      Modifier
        .fillMaxWidth()
-        .sizeIn(minHeight = 46.dp)
+        .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT)
        .padding(PaddingValues(horizontal = DEFAULT_PADDING))
        .clickable { expanded.value = !expanded.value },
      horizontalArrangement = Arrangement.spacedBy(12.dp),
@@ -277,7 +277,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun HistoryTab() {
-    // LALAL SCROLLBAR DOESN'T WORK
    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
@@ -302,7 +301,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun QuoteTab(qi: CIQuote) {
-    // LALAL SCROLLBAR DOESN'T WORK
    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
@@ -316,7 +314,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun ForwardedFromTab(forwardedFromItem: AChatItem) {
-    // LALAL SCROLLBAR DOESN'T WORK
    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
@@ -379,7 +376,6 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun DeliveryTab(memberDeliveryStatuses: List<MemberDeliveryStatus>) {
-    // LALAL SCROLLBAR DOESN'T WORK
    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
@@ -10,7 +10,6 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
 import androidx.compose.ui.draw.drawWithCache
@@ -49,26 +48,17 @@ import kotlin.math.sign
 // staleChatId means the id that was before chatModel.chatId becomes null. It's needed for Android only to make transition from chat
 // to chat list smooth. Otherwise, chat view will become blank right before the transition starts
 fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -> Unit) {
-  val shouldReturn = remember { mutableStateOf(false) }
  val remoteHostId = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.remoteHostId } }
  val showSearch = rememberSaveable { mutableStateOf(false) }
-  val activeChatInfo = remember {
-    derivedStateOf {
-      val info = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatInfo
-      if (info == null) {
-        shouldReturn.value = true
-      }
-      return@derivedStateOf info ?: ChatInfo.Direct.sampleData
-    }
-  }
+  val activeChatInfo = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatInfo } }
  val user = chatModel.currentUser.value
-  if (shouldReturn.value || user == null) {
+  val chatInfo = activeChatInfo.value
+  if (chatInfo == null || user == null) {
    LaunchedEffect(Unit) {
      chatModel.chatId.value = null
      ModalManager.end.closeModals()
    }
  } else {
-    val chatInfo = activeChatInfo.value
    val searchText = rememberSaveable { mutableStateOf("") }
    val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
    val composeState = rememberSaveable(saver = ComposeState.saver()) {
@@ -96,21 +86,17 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
          .collect { chatId ->
            markUnreadChatAsRead(chatId)
            showSearch.value = false
+            selectedChatItems.value = null
          }
      }
    }
-    KeyChangeEffect(chatModel.chatId.value) {
-      if (chatModel.chatId.value != null) {
-        selectedChatItems.value = null
-      }
-    }
    val view = LocalMultiplatformView()
    val chatRh = remoteHostId.value
    // We need to have real unreadCount value for displaying it inside top right button
    // Having activeChat reloaded on every change in it is inefficient (UI lags)
    val unreadCount = remember {
      derivedStateOf {
-        chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }?.chatStats?.unreadCount ?: 0
+        chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == activeChatInfo.value?.id }?.chatStats?.unreadCount ?: 0
      }
    }
    val clipboard = LocalClipboardManager.current
@@ -267,9 +253,9 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
                }
              }
            },
-            loadPrevMessages = {
-              if (chatModel.chatId.value != activeChatInfo.value.id) return@ChatLayout
-              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
+            loadPrevMessages = { chatId ->
+              val c = chatModel.getChat(chatId)
+              if (chatModel.chatId.value != chatId) return@ChatLayout
              val firstId = chatModel.chatItems.value.firstOrNull()?.id
              if (c != null && firstId != null) {
                withBGApi {
@@ -279,7 +265,6 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            },
            deleteMessage = { itemId, mode ->
              withBGApi {
-                val cInfo = chatInfo
                val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
                val toModerate = toDeleteItem?.memberToModerate(chatInfo)
                val groupInfo = toModerate?.first
@@ -295,8 +280,8 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
                } else {
                  chatModel.controller.apiDeleteChatItems(
                    chatRh,
-                    type = cInfo.chatType,
-                    id = cInfo.apiId,
+                    type = chatInfo.chatType,
+                    id = chatInfo.apiId,
                    itemIds = listOf(itemId),
                    mode = mode
                  )
@@ -307,9 +292,9 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
                  toChatItem = deleted.toChatItem?.chatItem
                  withChats {
                    if (toChatItem != null) {
-                      upsertChatItem(chatRh, cInfo, toChatItem)
+                      upsertChatItem(chatRh, chatInfo, toChatItem)
                    } else {
-                      removeChatItem(chatRh, cInfo, deletedChatItem)
+                      removeChatItem(chatRh, chatInfo, deletedChatItem)
                    }
                  }
                }
@@ -472,7 +457,10 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            markRead = { range, unreadCountAfter ->
              withBGApi {
                withChats {
-                  markChatItemsRead(chatRh, chatInfo, range, unreadCountAfter)
+                  // It's important to call it on Main thread. Otherwise, composable crash occurs from time-to-time without useful stacktrace
+                  withContext(Dispatchers.Main) {
+                    markChatItemsRead(chatRh, chatInfo, range, unreadCountAfter)
+                  }
                  ntfManager.cancelNotificationsForChat(chatInfo.id)
                  chatModel.controller.apiChatRead(
                    chatRh,
@@ -486,8 +474,8 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            changeNtfsState = { enabled, currentValue -> toggleNotifications(chatRh, chatInfo, enabled, chatModel, currentValue) },
            onSearchValueChanged = { value ->
              if (searchText.value == value) return@ChatLayout
-              if (chatModel.chatId.value != activeChatInfo.value.id) return@ChatLayout
-              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
+              val c = chatModel.getChat(chatInfo.id) ?: return@ChatLayout
+              if (chatModel.chatId.value != chatInfo.id) return@ChatLayout
              withBGApi {
                apiFindMessages(c, chatModel, value)
                searchText.value = value
@@ -516,24 +504,34 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
      }
      is ChatInfo.ContactConnection -> {
        val close = { chatModel.chatId.value = null }
-        ModalView(close, showClose = appPlatform.isAndroid, content = {
-          ContactConnectionInfoView(chatModel, chatRh, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, false, close)
-        })
-        LaunchedEffect(chatInfo.id) {
-          onComposed(chatInfo.id)
-          ModalManager.end.closeModals()
-          chatModel.chatItems.clear()
+        val handler = remember { AppBarHandler() }
+        CompositionLocalProvider(
+          LocalAppBarHandler provides handler
+        ) {
+          ModalView(close, showClose = appPlatform.isAndroid, content = {
+            ContactConnectionInfoView(chatModel, chatRh, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, false, close)
+          })
+          LaunchedEffect(chatInfo.id) {
+            onComposed(chatInfo.id)
+            ModalManager.end.closeModals()
+            chatModel.chatItems.clear()
+          }
        }
      }
      is ChatInfo.InvalidJSON -> {
        val close = { chatModel.chatId.value = null }
-        ModalView(close, showClose = appPlatform.isAndroid, endButtons = { ShareButton { clipboard.shareText(chatInfo.json) } }, content = {
-          InvalidJSONView(chatInfo.json)
-        })
-        LaunchedEffect(chatInfo.id) {
-          onComposed(chatInfo.id)
-          ModalManager.end.closeModals()
-          chatModel.chatItems.clear()
+        val handler = remember { AppBarHandler() }
+        CompositionLocalProvider(
+          LocalAppBarHandler provides handler
+        ) {
+          ModalView(close, showClose = appPlatform.isAndroid, endButtons = { ShareButton { clipboard.shareText(chatInfo.json) } }, content = {
+            InvalidJSONView(chatInfo.json)
+          })
+          LaunchedEffect(chatInfo.id) {
+            onComposed(chatInfo.id)
+            ModalManager.end.closeModals()
+            chatModel.chatItems.clear()
+          }
        }
      }
      else -> {}
@@ -556,7 +554,7 @@ fun startChatCall(remoteHostId: Long?, chatInfo: ChatInfo, media: CallMediaType)
@Composable
 fun ChatLayout(
  remoteHostId: State<Long?>,
-  chatInfo: State<ChatInfo>,
+  chatInfo: State<ChatInfo?>,
  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
  composeView: (@Composable () -> Unit),
@@ -569,7 +567,7 @@ fun ChatLayout(
  back: () -> Unit,
  info: () -> Unit,
  showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: () -> Unit,
+  loadPrevMessages: (ChatId) -> Unit,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  deleteMessages: (List<Long>) -> Unit,
  receiveFile: (Long) -> Unit,
@@ -601,12 +599,11 @@ fun ChatLayout(
 ) {
  val scope = rememberCoroutineScope()
  val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
-
  Box(
    Modifier
      .fillMaxWidth()
      .desktopOnExternalDrag(
-        enabled = !attachmentDisabled.value && rememberUpdatedState(chatInfo.value).value.userCanSend,
+        enabled = remember(attachmentDisabled.value, chatInfo.value?.userCanSend) { mutableStateOf(!attachmentDisabled.value && chatInfo.value?.userCanSend == true) }.value,
        onFiles = { paths -> composeState.onFilesAttached(paths.map { it.toURI() }) },
        onImage = {
          // TODO: file is not saved anywhere?!
@@ -644,7 +641,10 @@ fun ChatLayout(
        Scaffold(
          topBar = {
            if (selectedChatItems.value == null) {
-              ChatInfoToolbar(chatInfo, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
+              val chatInfo = chatInfo.value
+              if (chatInfo != null) {
+                ChatInfoToolbar(chatInfo, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
+              }
            } else {
              SelectedItemsTopToolbar(selectedChatItems)
            }
@@ -669,13 +669,17 @@ fun ChatLayout(
              Modifier)
            .padding(contentPadding)
          ) {
-            ChatItemsList(
-              remoteHostId, chatInfo, unreadCount, composeState, searchValue,
-              useLinkPreviews, linkMode, selectedChatItems, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
-              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
-              updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
-            )
+            val remoteHostId = remember { remoteHostId }.value
+            val chatInfo = remember { chatInfo }.value
+            if (chatInfo != null) {
+              ChatItemsList(
+                remoteHostId, chatInfo, unreadCount, composeState, searchValue,
+                useLinkPreviews, linkMode, selectedChatItems, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
+                receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
+                updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
+                setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
+              )
+            }
          }
        }
      }
@@ -685,7 +689,7 @@ fun ChatLayout(

@Composable
 fun ChatInfoToolbar(
-  chatInfo: State<ChatInfo>,
+  chatInfo: ChatInfo,
  back: () -> Unit,
  info: () -> Unit,
  startCall: (CallMediaType) -> Unit,
@@ -710,7 +714,6 @@ fun ChatInfoToolbar(
  if (appPlatform.isAndroid) {
    BackHandler(onBack = onBackClicked)
  }
-  val chatInfo = chatInfo.value
  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
  val menuItems = arrayListOf<@Composable () -> Unit>()
  val activeCall by remember { chatModel.activeCall }
@@ -915,22 +918,10 @@ private fun ContactVerifiedShield() {
  Icon(painterResource(MR.images.ic_verified_user), null, Modifier.size(18.dp * fontSizeSqrtMultiplier).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
 }

-data class CIListState(val scrolled: Boolean, val itemCount: Int, val keyboardState: KeyboardState)
-
-val CIListStateSaver = run {
-  val scrolledKey = "scrolled"
-  val countKey = "itemCount"
-  val keyboardKey = "keyboardState"
-  mapSaver(
-    save = { mapOf(scrolledKey to it.scrolled, countKey to it.itemCount, keyboardKey to it.keyboardState) },
-    restore = { CIListState(it[scrolledKey] as Boolean, it[countKey] as Int, it[keyboardKey] as KeyboardState) }
-  )
-}
-
@Composable
 fun BoxWithConstraintsScope.ChatItemsList(
-  remoteHostId: State<Long?>,
-  chatInfo: State<ChatInfo>,
+  remoteHostId: Long?,
+  chatInfo: ChatInfo,
  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
  searchValue: State<String>,
@@ -938,7 +929,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
  linkMode: SimplexLinkMode,
  selectedChatItems: MutableState<Set<Long>?>,
  showMemberInfo: (GroupInfo, GroupMember) -> Unit,
-  loadPrevMessages: () -> Unit,
+  loadPrevMessages: (ChatId) -> Unit,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  deleteMessages: (List<Long>) -> Unit,
  receiveFile: (Long) -> Unit,
@@ -964,8 +955,6 @@ fun BoxWithConstraintsScope.ChatItemsList(
 ) {
  val listState = rememberLazyListState()
  val scope = rememberCoroutineScope()
-  val remoteHostId = remember { remoteHostId }.value
-  val chatInfo = remember { chatInfo }.value
  ScrollToBottom(chatInfo.id, listState, chatModel.chatItems)
  var prevSearchEmptiness by rememberSaveable { mutableStateOf(searchValue.value.isEmpty()) }
  // Scroll to bottom when search value changes from something to nothing and back
@@ -980,7 +969,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
    }
  }

-  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)
+  PreloadItems(chatInfo.id, listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)

  Spacer(Modifier.size(8.dp))
  val reversedChatItems by remember { derivedStateOf { chatModel.chatItems.asReversed() } }
@@ -991,6 +980,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
      scope.launch { listState.animateScrollToItem(kotlin.math.min(reversedChatItems.lastIndex, index + 1), -maxHeightRounded) }
    }
  }
+  // TODO: Having this block on desktop makes ChatItemsList() to recompose twice on chatModel.chatId update instead of once
  LaunchedEffect(chatInfo.id) {
    var stopListening = false
    snapshotFlow { listState.layoutInfo.visibleItemsInfo.lastIndex }
@@ -1343,14 +1333,17 @@ fun BoxWithConstraintsScope.FloatingButtons(

@Composable
 fun PreloadItems(
+  chatId: String,
  listState: LazyListState,
  remaining: Int = 10,
-  onLoadMore: () -> Unit,
+  onLoadMore: (ChatId) -> Unit,
 ) {
  // Prevent situation when initial load and load more happens one after another after selecting a chat with long scroll position from previous selection
  val allowLoad = remember { mutableStateOf(false) }
+  val chatId = rememberUpdatedState(chatId)
+  val onLoadMore = rememberUpdatedState(onLoadMore)
  LaunchedEffect(Unit) {
-    snapshotFlow { chatModel.chatId.value }
+    snapshotFlow { chatId.value }
      .filterNotNull()
      .collect {
        allowLoad.value = listState.layoutInfo.totalItemsCount == listState.layoutInfo.visibleItemsInfo.size
@@ -1370,7 +1363,7 @@ fun PreloadItems(
    }
      .filter { it > 0 }
      .collect {
-        onLoadMore()
+        onLoadMore.value(chatId.value)
      }
  }
 }
@@ -93,22 +93,22 @@ private fun ContactPreferencesLayout(
    TimedMessagesFeatureSection(featuresAllowed, contact.mergedPreferences.timedMessages, timedMessages, onTTLUpdated) { allowed, ttl ->
      applyPrefs(featuresAllowed.copy(timedMessagesAllowed = allowed, timedMessagesTTL = ttl ?: currentFeaturesAllowed.timedMessagesTTL))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionDividerSpaced(true)
    val allowFullDeletion: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.fullDelete) }
    FeatureSection(ChatFeature.FullDelete, user.fullPreferences.fullDelete.allow, contact.mergedPreferences.fullDelete, allowFullDeletion) {
      applyPrefs(featuresAllowed.copy(fullDelete = it))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionDividerSpaced(true)
    val allowReactions: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.reactions) }
    FeatureSection(ChatFeature.Reactions, user.fullPreferences.reactions.allow, contact.mergedPreferences.reactions, allowReactions) {
      applyPrefs(featuresAllowed.copy(reactions = it))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionDividerSpaced(true)
    val allowVoice: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.voice) }
    FeatureSection(ChatFeature.Voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, allowVoice) {
      applyPrefs(featuresAllowed.copy(voice = it))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionDividerSpaced(true)
    val allowCalls: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.calls) }
    FeatureSection(ChatFeature.Calls, user.fullPreferences.calls.allow, contact.mergedPreferences.calls, allowCalls) {
      applyPrefs(featuresAllowed.copy(calls = it))
@@ -66,7 +66,7 @@ fun SelectedItemsBottomToolbar(
        Icon(
          painterResource(MR.images.ic_delete),
          null,
-          Modifier.size(24.dp),
+          Modifier.size(22.dp),
          tint = if (!deleteEnabled.value || allButtonsDisabled.value) MaterialTheme.colors.secondary else MaterialTheme.colors.error
        )
      }
@@ -75,7 +75,7 @@ fun SelectedItemsBottomToolbar(
        Icon(
          painterResource(MR.images.ic_flag),
          null,
-          Modifier.size(24.dp),
+          Modifier.size(22.dp),
          tint = if (!moderateEnabled.value || allButtonsDisabled.value) MaterialTheme.colors.secondary else MaterialTheme.colors.error
        )
      }
@@ -84,7 +84,7 @@ fun SelectedItemsBottomToolbar(
        Icon(
          painterResource(MR.images.ic_share),
          null,
-          Modifier.size(24.dp),
+          Modifier.size(22.dp),
          tint = if (allButtonsDisabled.value) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
        )
      }
@@ -88,6 +88,7 @@ fun SendMsgView(
      showDeleteTextButton,
      userIsObserver,
      if (clicksOnTextFieldDisabled) "" else placeholder,
+      showVoiceButton,
      onMessageChange,
      editPrevMessage,
      onFilesPasted
@@ -4,6 +4,7 @@ import SectionBottomSpacer
 import SectionCustomFooter
 import SectionDividerSpaced
 import SectionItemView
+import SectionItemViewWithoutMinPadding
 import SectionSpacer
 import SectionView
 import androidx.compose.foundation.*
@@ -89,7 +90,8 @@ fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
    .map { it.chatInfo }
    .filterIsInstance<ChatInfo.Direct>()
    .map { it.contact }
-    .filter { c -> c.sendMsgEnabled && !c.nextSendGrpInv && c.contactId !in memberContactIds && c.chatViewName.lowercase().contains(s) }
+    .filter { c -> c.sendMsgEnabled && !c.nextSendGrpInv && c.contactId !in memberContactIds && c.anyNameContains(s)
+    }
    .sortedBy { it.displayName.lowercase() }
    .toList()
 }
@@ -176,7 +178,7 @@ fun AddGroupMembersLayout(
        InviteSectionFooter(selectedContactsCount = selectedContacts.size, allowModifyMembers, clearSelection)
      }
      SectionDividerSpaced(maxTopPadding = true)
-      SectionView(stringResource(MR.strings.select_contacts)) {
+      SectionView(stringResource(MR.strings.select_contacts).uppercase()) {
        SectionItemView(padding = PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF)) {
          SearchRowView(searchText)
        }
@@ -254,7 +256,8 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
      Text(
        String.format(generalGetString(MR.strings.num_contacts_selected), selectedContactsCount),
        color = MaterialTheme.colors.secondary,
-        fontSize = 12.sp
+        lineHeight = 18.sp,
+        fontSize = 14.sp
      )
      Box(
        Modifier.clickable { if (enabled) clearSelection() }
@@ -262,14 +265,16 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
        Text(
          stringResource(MR.strings.clear_contacts_selection_button),
          color = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-          fontSize = 12.sp
+          lineHeight = 18.sp,
+          fontSize = 14.sp,
        )
      }
    } else {
      Text(
        stringResource(MR.strings.no_contacts_selected),
        color = MaterialTheme.colors.secondary,
-        fontSize = 12.sp
+        lineHeight = 18.sp,
+        fontSize = 14.sp,
      )
    }
  }
@@ -317,7 +322,7 @@ fun ContactCheckRow(
    icon = painterResource(MR.images.ic_circle)
    iconColor = MaterialTheme.colors.secondary
  }
-  SectionItemView(
+  SectionItemViewWithoutMinPadding(
    click = if (enabled) {
      {
        if (prohibitedToInviteIncognito) {
@@ -278,8 +278,12 @@ fun GroupChatInfoLayout(
    scope.launch { listState.scrollToItem(0) }
  }
  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue()) }
-  val filteredMembers = remember(members) { derivedStateOf { members.filter { it.chatViewName.lowercase().contains(searchText.value.text.trim().lowercase()) } } }
-  // LALAL strange scrolling
+  val filteredMembers = remember(members) {
+    derivedStateOf {
+      val s = searchText.value.text.trim().lowercase()
+      if (s.isEmpty()) members else members.filter { m -> m.anyNameContains(s) }
+    }
+  }
  LazyColumnWithScrollBar(
    Modifier
      .fillMaxWidth(),
@@ -361,7 +365,7 @@ fun GroupChatInfoLayout(
            SearchRowView(searchText)
          }
        }
-        SectionItemView(minHeight = 54.dp) {
+        SectionItemView(minHeight = 54.dp, padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
          MemberRow(groupInfo.membership, user = true)
        }
      }
@@ -369,7 +373,7 @@ fun GroupChatInfoLayout(
    items(filteredMembers.value) { member ->
      Divider()
      val showMenu = remember { mutableStateOf(false) }
-      SectionItemViewLongClickable({ showMemberInfo(member) }, { showMenu.value = true }, minHeight = 54.dp) {
+      SectionItemViewLongClickable({ showMemberInfo(member) }, { showMenu.value = true }, minHeight = 54.dp, padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
        DropDownMenuForMember(chat.remoteHostId, member, groupInfo, showMenu)
        MemberRow(member, onClick = { showMemberInfo(member) })
      }
@@ -509,7 +513,7 @@ private fun MemberRow(member: GroupMember, user: Boolean = false, onClick: (() -
      verticalAlignment = Alignment.CenterVertically,
      horizontalArrangement = Arrangement.spacedBy(4.dp)
    ) {
-      MemberProfileImage(size = 46.dp, member)
+      MemberProfileImage(size = DEFAULT_MIN_SECTION_ITEM_HEIGHT, member)
      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
      Column {
        Row(verticalAlignment = Alignment.CenterVertically) {
@@ -133,13 +133,7 @@ private fun GroupWelcomeLayout(
      val clipboard = LocalClipboardManager.current
      CopyTextButton { clipboard.setText(AnnotatedString(wt.value)) }

-      Divider(
-        Modifier.padding(
-          start = DEFAULT_PADDING_HALF,
-          top = 8.dp,
-          end = DEFAULT_PADDING_HALF,
-          bottom = 8.dp)
-      )
+      SectionDividerSpaced(maxBottomPadding = false)

      SaveButton(
        save = save,
@@ -185,7 +185,14 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
    scaffoldState = scaffoldState,
    drawerContent = {
      tryOrShowError("Settings", error = { ErrorSettingsView() }) {
-        SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
+        val handler = remember { AppBarHandler() }
+        CompositionLocalProvider(
+          LocalAppBarHandler provides handler
+        ) {
+          ModalView(showClose = appPlatform.isDesktop, close = { scope.launch { scaffoldState.drawerState.close() } }) {
+            SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
+          }
+        }
      }
    },
    contentColor = LocalContentColor.current,
@@ -212,7 +219,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
          backgroundColor = if (!stopped) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
          contentColor = Color.White
        ) {
-          Icon(painterResource(MR.images.ic_edit_filled), stringResource(MR.strings.add_contact_or_create_group), Modifier.size(24.dp * fontSizeSqrtMultiplier))
+          Icon(painterResource(MR.images.ic_edit_filled), stringResource(MR.strings.add_contact_or_create_group), Modifier.size(22.dp * fontSizeSqrtMultiplier))
        }
      }
    }
@@ -421,7 +428,10 @@ fun SubscriptionStatusIndicator(click: (() -> Unit)) {
    }
  }

-  SimpleButtonFrame(click = click) {
+  SimpleButtonFrame(
+    click = click,
+    disabled = chatModel.chatRunning.value != true
+  ) {
    SubscriptionStatusIndicatorView(subs = subs, hasSess = hasSess)
  }
 }
@@ -510,7 +520,7 @@ private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState
    Icon(
      painterResource(MR.images.ic_search),
      contentDescription = null,
-      Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF).size(24.dp * fontSizeSqrtMultiplier),
+      Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF).size(22.dp * fontSizeSqrtMultiplier),
      tint = MaterialTheme.colors.secondary
    )
    SearchTextField(
@@ -698,7 +708,7 @@ private fun ChatList(chatModel: ChatModel, searchText: MutableState<TextFieldVal
  }
 }

-private fun filteredChats(
+fun filteredChats(
  showUnreadAndFavorites: Boolean,
  searchShowingSimplexLink: State<Boolean>,
  searchChatFilteredBySimplexLink: State<String?>,
@@ -719,18 +729,16 @@ private fun filteredChats(
            if (s.isEmpty()) {
              chat.id == chatModel.chatId.value || filtered(chat)
            } else {
-              (viewNameContains(cInfo, s) ||
-                      cInfo.contact.profile.displayName.lowercase().contains(s) ||
-                      cInfo.contact.fullName.lowercase().contains(s))
+              cInfo.anyNameContains(s)
            })
          is ChatInfo.Group -> if (s.isEmpty()) {
            chat.id == chatModel.chatId.value || filtered(chat) || cInfo.groupInfo.membership.memberStatus == GroupMemberStatus.MemInvited
          } else {
-            viewNameContains(cInfo, s)
+            cInfo.anyNameContains(s)
          }
-          is ChatInfo.Local -> s.isEmpty() || viewNameContains(cInfo, s)
-          is ChatInfo.ContactRequest -> s.isEmpty() || viewNameContains(cInfo, s)
-          is ChatInfo.ContactConnection -> (s.isNotEmpty() && cInfo.contactConnection.localAlias.lowercase().contains(s)) || (s.isEmpty() && chat.id == chatModel.chatId.value)
+          is ChatInfo.Local -> s.isEmpty() || cInfo.anyNameContains(s)
+          is ChatInfo.ContactRequest -> s.isEmpty() || cInfo.anyNameContains(s)
+          is ChatInfo.ContactConnection -> (s.isNotEmpty() && cInfo.anyNameContains(s)) || (s.isEmpty() && chat.id == chatModel.chatId.value)
          is ChatInfo.InvalidJSON -> chat.id == chatModel.chatId.value
        }
      }
@@ -742,6 +750,3 @@ private fun filtered(chat: Chat): Boolean =
  (chat.chatInfo.chatSettings?.favorite ?: false) ||
      chat.chatStats.unreadChat ||
      (chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0)
-
-private fun viewNameContains(cInfo: ChatInfo, s: String): Boolean =
-  cInfo.chatViewName.lowercase().contains(s.lowercase())
@@ -546,15 +546,19 @@ fun XFTPServerSummaryLayout(summary: XFTPServerSummary, statsStartedAt: Instant,
      }) {
        Text(generalGetString(MR.strings.open_server_settings_button))
      }
+      if (summary.stats != null || summary.sessions != null) {
+        SectionDividerSpaced()
+      }
    }

    if (summary.stats != null) {
-      SectionDividerSpaced()
      XFTPStatsView(stats = summary.stats, rh = rh, statsStartedAt = statsStartedAt)
+      if (summary.sessions != null) {
+        SectionDividerSpaced(maxTopPadding = true)
+      }
    }

    if (summary.sessions != null) {
-      SectionDividerSpaced()
      ServerSessionsView(summary.sessions)
    }
  }
@@ -581,20 +585,24 @@ fun SMPServerSummaryLayout(summary: SMPServerSummary, statsStartedAt: Instant, r
      }) {
        Text(generalGetString(MR.strings.open_server_settings_button))
      }
+      SectionDividerSpaced()
    }

    if (summary.stats != null) {
-      SectionDividerSpaced()
      SMPStatsView(stats = summary.stats, remoteHostInfo = rh, statsStartedAt = statsStartedAt)
+      if (summary.subs != null || summary.sessions != null) {
+        SectionDividerSpaced(maxTopPadding = true)
+      }
    }

    if (summary.subs != null) {
-      SectionDividerSpaced()
      SMPSubscriptionsSection(subs = summary.subs, summary = summary, rh = rh)
+      if (summary.sessions != null) {
+        SectionDividerSpaced()
+      }
    }

    if (summary.sessions != null) {
-      SectionDividerSpaced()
      ServerSessionsView(summary.sessions)
    }
  }
@@ -615,14 +623,12 @@ fun ModalData.SMPServerSummaryView(
    ColumnWithScrollBar(
      Modifier.fillMaxSize(),
    ) {
-      Box(contentAlignment = Alignment.Center) {
-        val bottomPadding = DEFAULT_PADDING
-        AppBarTitle(
-          stringResource(MR.strings.smp_server),
-          hostDevice(rh?.remoteHostId),
-          bottomPadding = bottomPadding
-        )
-      }
+      val bottomPadding = DEFAULT_PADDING
+      AppBarTitle(
+        stringResource(MR.strings.smp_server),
+        hostDevice(rh?.remoteHostId),
+        bottomPadding = bottomPadding
+      )
      SMPServerSummaryLayout(summary, statsStartedAt, rh)
    }
  }
@@ -709,7 +715,7 @@ fun ModalData.XFTPServerSummaryView(

@Composable
 fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableState<PresentedServersSummary?>) {
-  Column(
+  ColumnWithScrollBar(
    Modifier.fillMaxSize(),
  ) {
    var showUserSelection by remember { mutableStateOf(false) }
@@ -760,14 +766,12 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
    Column(
      Modifier.fillMaxSize(),
    ) {
-      Box(contentAlignment = Alignment.Center) {
-        val bottomPadding = DEFAULT_PADDING
-        AppBarTitle(
-          stringResource(MR.strings.servers_info),
-          hostDevice(rh?.remoteHostId),
-          bottomPadding = bottomPadding
-        )
-      }
+      val bottomPadding = DEFAULT_PADDING
+      AppBarTitle(
+        stringResource(MR.strings.servers_info),
+        hostDevice(rh?.remoteHostId),
+        bottomPadding = bottomPadding
+      )
      if (serversSummary.value == null) {
        Box(
          modifier = Modifier
@@ -827,7 +831,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
          verticalAlignment = Alignment.Top,
          userScrollEnabled = appPlatform.isAndroid
        ) { index ->
-          ColumnWithScrollBar(
+          Column(
            Modifier
              .fillMaxSize(),
            verticalArrangement = Arrangement.Top
@@ -858,7 +862,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
                  val statsStartedAt = it.statsStartedAt

                  SMPStatsView(totals.stats, statsStartedAt, rh)
-                  SectionDividerSpaced()
+                  SectionDividerSpaced(maxTopPadding = true)
                  SMPSubscriptionsSection(totals)
                  SectionDividerSpaced()

@@ -890,7 +894,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
                      footer = generalGetString(MR.strings.servers_info_proxied_servers_section_footer),
                      rh = rh
                    )
-                    SectionDividerSpaced()
+                    SectionDividerSpaced(maxTopPadding = true)
                  }

                  ServerSessionsView(totals.sessions)
@@ -907,7 +911,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
                  val previouslyUsedXFTPServers = xftpSummary.previouslyUsedXFTPServers

                  XFTPStatsView(totals.stats, statsStartedAt, rh)
-                  SectionDividerSpaced()
+                  SectionDividerSpaced(maxTopPadding = true)

                  if (currentlyUsedXFTPServers.isNotEmpty()) {
                    XFTPServersListView(
@@ -934,7 +938,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta
              }
            }

-            SectionDividerSpaced()
+            SectionDividerSpaced(maxBottomPadding = false)

            SectionView {
              ReconnectAllServersButton(rh)
@@ -203,12 +203,8 @@ private fun ShareList(
  val oneHandUI = remember { appPrefs.oneHandUI.state }
  val chats by remember(search) {
    derivedStateOf {
-      val sorted = chatModel.chats.value.toList().sortedByDescending { it.chatInfo is ChatInfo.Local }
-      if (search.isEmpty()) {
-        sorted.filter { it.chatInfo.ready }
-      } else {
-        sorted.filter { it.chatInfo.ready && it.chatInfo.chatViewName.lowercase().contains(search.lowercase()) }
-      }
+      val sorted = chatModel.chats.value.toList().filter { it.chatInfo.ready }.sortedByDescending { it.chatInfo is ChatInfo.Local }
+      filteredChats(false, mutableStateOf(false), mutableStateOf(null), search, sorted)
    }
  }
  LazyColumnWithScrollBar(
@@ -262,7 +262,7 @@ fun UserProfilePickerItem(
  Row(
    Modifier
      .fillMaxWidth()
-      .sizeIn(minHeight = 46.dp)
+      .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT)
      .combinedClickable(
        enabled = enabled,
        onClick = if (u.activeUser) openSettings else onClick,
@@ -330,7 +330,7 @@ fun RemoteHostPickerItem(h: RemoteHostInfo, onLongClick: () -> Unit = {}, action
    Modifier
      .fillMaxWidth()
      .background(color = if (h.activeHost) MaterialTheme.colors.surface.mixWith(MaterialTheme.colors.onBackground, 0.95f) else Color.Unspecified)
-      .sizeIn(minHeight = 46.dp)
+      .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT)
      .combinedClickable(
        onClick = onClick,
        onLongClick = onLongClick
@@ -373,7 +373,7 @@ fun LocalDevicePickerItem(active: Boolean, onLongClick: () -> Unit = {}, onClick
    Modifier
      .fillMaxWidth()
      .background(color = if (active) MaterialTheme.colors.surface.mixWith(MaterialTheme.colors.onBackground, 0.95f) else Color.Unspecified)
-      .sizeIn(minHeight = 46.dp)
+      .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT)
      .combinedClickable(
        onClick = if (active) {{}} else onClick,
        onLongClick = onLongClick,
@@ -61,9 +61,6 @@ fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>, showDel
                        ContactType.CHAT_DELETED -> {
                            withApi {
                                openChat(rhId, chat.chatInfo, chatModel)
-                                withChats {
-                                    updateContact(rhId, chat.chatInfo.contact.copy(chatDeleted = false))
-                                }
                                ModalManager.start.closeModals()
                            }
                        }
@@ -107,101 +107,104 @@ fun DatabaseEncryptionLayout(
  migration: Boolean,
  onConfirmEncrypt: () -> Unit,
 ) {
-  val (scrollBarAlpha, scrollModifier, scrollJob) = platform.desktopScrollBarComponents()
-  val scrollState = rememberScrollState()
-  Column(
-    if (!migration) Modifier.fillMaxWidth().verticalScroll(scrollState).then(if (appPlatform.isDesktop) scrollModifier else Modifier) else Modifier.fillMaxWidth(),
-  ) {
-    if (!migration) {
-      AppBarTitle(stringResource(MR.strings.database_passphrase))
-    } else {
-      ChatStoppedView()
-      SectionSpacer()
-    }
-    SectionView(if (migration) generalGetString(MR.strings.database_passphrase).uppercase() else null) {
-      SavePassphraseSetting(
-        useKeychain.value,
-        initialRandomDBPassphrase.value,
-        storedKey.value,
-        enabled = (!initialRandomDBPassphrase.value && !progressIndicator.value) || migration
-      ) { checked ->
-        if (checked) {
-          setUseKeychain(true, useKeychain, migration)
-        } else if (storedKey.value && !migration) {
-          // Don't show in migration process since it will remove the key after successful encryption
-          removePassphraseAlert {
-            removePassphraseFromKeyChain(useKeychain, storedKey, false)
-          }
-        } else {
-          setUseKeychain(false, useKeychain, migration)
-        }
+  @Composable
+  fun Layout() {
+    Column {
+      if (!migration) {
+        AppBarTitle(stringResource(MR.strings.database_passphrase))
+      } else {
+        ChatStoppedView()
+        SectionSpacer()
      }
+      SectionView(if (migration) generalGetString(MR.strings.database_passphrase).uppercase() else null) {
+        SavePassphraseSetting(
+          useKeychain.value,
+          initialRandomDBPassphrase.value,
+          storedKey.value,
+          enabled = (!initialRandomDBPassphrase.value && !progressIndicator.value) || migration
+        ) { checked ->
+          if (checked) {
+            setUseKeychain(true, useKeychain, migration)
+          } else if (storedKey.value && !migration) {
+            // Don't show in migration process since it will remove the key after successful encryption
+            removePassphraseAlert {
+              removePassphraseFromKeyChain(useKeychain, storedKey, false)
+            }
+          } else {
+            setUseKeychain(false, useKeychain, migration)
+          }
+        }
+
+        if (!initialRandomDBPassphrase.value && chatDbEncrypted == true) {
+          PassphraseField(
+            currentKey,
+            generalGetString(MR.strings.current_passphrase),
+            modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
+            isValid = ::validKey,
+            keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
+          )
+        }

-      if (!initialRandomDBPassphrase.value && chatDbEncrypted == true) {
        PassphraseField(
-          currentKey,
-          generalGetString(MR.strings.current_passphrase),
+          newKey,
+          generalGetString(MR.strings.new_passphrase),
          modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
+          showStrength = true,
          isValid = ::validKey,
          keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
        )
-      }
-
-      PassphraseField(
-        newKey,
-        generalGetString(MR.strings.new_passphrase),
-        modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
-        showStrength = true,
-        isValid = ::validKey,
-        keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
-      )
-      val onClickUpdate = {
-        // Don't do things concurrently. Shouldn't be here concurrently, just in case
-        if (!progressIndicator.value) {
-          if (currentKey.value == "") {
-            if (useKeychain.value)
-              encryptDatabaseSavedAlert(onConfirmEncrypt)
-            else
-              encryptDatabaseAlert(onConfirmEncrypt)
-          } else {
-            if (useKeychain.value)
-              changeDatabaseKeySavedAlert(onConfirmEncrypt)
-            else
-              changeDatabaseKeyAlert(onConfirmEncrypt)
+        val onClickUpdate = {
+          // Don't do things concurrently. Shouldn't be here concurrently, just in case
+          if (!progressIndicator.value) {
+            if (currentKey.value == "") {
+              if (useKeychain.value)
+                encryptDatabaseSavedAlert(onConfirmEncrypt)
+              else
+                encryptDatabaseAlert(onConfirmEncrypt)
+            } else {
+              if (useKeychain.value)
+                changeDatabaseKeySavedAlert(onConfirmEncrypt)
+              else
+                changeDatabaseKeyAlert(onConfirmEncrypt)
+            }
          }
        }
+        val disabled = currentKey.value == newKey.value ||
+            newKey.value != confirmNewKey.value ||
+            newKey.value.isEmpty() ||
+            !validKey(currentKey.value) ||
+            !validKey(newKey.value) ||
+            progressIndicator.value
+
+        PassphraseField(
+          confirmNewKey,
+          generalGetString(MR.strings.confirm_new_passphrase),
+          modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
+          isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
+          keyboardActions = KeyboardActions(onDone = {
+            if (!disabled) onClickUpdate()
+            defaultKeyboardAction(ImeAction.Done)
+          }),
+        )
+
+        SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled, minHeight = TextFieldDefaults.MinHeight) {
+          Text(generalGetString(if (migration) MR.strings.set_passphrase else MR.strings.update_database_passphrase), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+        }
      }
-      val disabled = currentKey.value == newKey.value ||
-          newKey.value != confirmNewKey.value ||
-          newKey.value.isEmpty() ||
-          !validKey(currentKey.value) ||
-          !validKey(newKey.value) ||
-          progressIndicator.value

-      PassphraseField(
-        confirmNewKey,
-        generalGetString(MR.strings.confirm_new_passphrase),
-        modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
-        isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
-        keyboardActions = KeyboardActions(onDone = {
-          if (!disabled) onClickUpdate()
-          defaultKeyboardAction(ImeAction.Done)
-        }),
-      )
-
-      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled, minHeight = TextFieldDefaults.MinHeight) {
-        Text(generalGetString(if (migration) MR.strings.set_passphrase else MR.strings.update_database_passphrase), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Column {
+        DatabaseEncryptionFooter(useKeychain, chatDbEncrypted, storedKey, initialRandomDBPassphrase, migration)
      }
+      SectionBottomSpacer()
    }
-
-    Column {
-      DatabaseEncryptionFooter(useKeychain, chatDbEncrypted, storedKey, initialRandomDBPassphrase, migration)
-    }
-    SectionBottomSpacer()
  }
-  if (appPlatform.isDesktop && !migration) {
-    Box(Modifier.fillMaxSize()) {
-      platform.desktopScrollBar(scrollState, Modifier.align(Alignment.CenterEnd).fillMaxHeight(), scrollBarAlpha, scrollJob, false)
+  if (migration) {
+    Column(Modifier.fillMaxWidth()) {
+      Layout()
+    }
+  } else {
+    ColumnWithScrollBar(Modifier.fillMaxWidth(), maxIntrinsicSize = true) {
+      Layout()
    }
  }
 }
--- a/Show More
+++ b/Show More