core: deduplicate list of members to forward group message to

5.8-beta.3: ios 220, android 214, desktop 49
ui: show UI for additional group preferences (SimpleX links and per-role permissions)
2024-12-17 17:20:21 +01:00 · 2024-05-27 11:40:47 +04:00 · 2024-05-25 20:57:07 +01:00 · 2024-05-25 19:54:05 +01:00 · 2024-05-25 18:55:15 +01:00 · 2024-05-25 17:22:25 +01:00
248 changed files with 8119 additions and 2184 deletions
@@ -65,6 +65,11 @@ jobs:
            asset_name: simplex-chat-ubuntu-22_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
+            ghc: "9.6.3"
+            cache_path: ~/.cabal/store
+            asset_name: simplex-chat-macos-aarch64
+            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
+          - os: macos-13
            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
@@ -107,18 +112,36 @@ jobs:
        if: matrix.os == 'macos-latest'
        shell: bash
        run: |
-          echo "ignore-project: False"                                      >> cabal.project.local
-          echo "package direct-sqlcipher"                                   >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                        >> cabal.project.local
+          echo "ignore-project: False"                                         >> cabal.project.local
+          echo "package simplexmq"                                             >> cabal.project.local
+          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo ""                                                              >> cabal.project.local
+          echo "package direct-sqlcipher"                                      >> cabal.project.local
+          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                           >> cabal.project.local
+
+      - name: Unix prepare cabal.project.local for Mac
+        if: matrix.os == 'macos-13'
+        shell: bash
+        run: |
+          echo "ignore-project: False"                                         >> cabal.project.local
+          echo "package simplexmq"                                             >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
+          echo ""                                                              >> cabal.project.local
+          echo "package direct-sqlcipher"                                      >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
+          echo "    flags: +openssl"                                           >> cabal.project.local

      - name: Install AppImage dependencies
        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
        run: sudo apt install -y desktop-file-utils

      - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
        run: brew install pkg-config

      - name: Unix prepare cabal.project.local for Ubuntu
@@ -190,7 +213,7 @@ jobs:

      - name: Mac build desktop
        id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
        shell: bash
        env:
          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -241,7 +264,7 @@ jobs:
            ${{ steps.linux_appimage_build.outputs.appimage_hash }}

      - name: Mac upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -250,7 +273,7 @@ jobs:
          tag: ${{ github.ref }}

      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,5 +1,6 @@
 ---
 layout: layouts/privacy.html
+permalink: /privacy/index.html
 ---

 # SimpleX Chat Privacy Policy and Conditions of Use
@@ -10,7 +11,7 @@ SimpleX Chat communication protocol is the first protocol that has no user profi

 Double ratchet algorithm has such important properties as [forward secrecy](/docs/GLOSSARY.md#forward-secrecy), sender [repudiation](/docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](/docs/GLOSSARY.md#post-compromise-security)).

-If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).

 ## Privacy Policy

@@ -78,7 +79,7 @@ When you choose to use instant push notifications in SimpleX iOS app, because th

 Preset notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who sends messages to you. Apple push notifications servers can only observe how many notifications are sent to you, but not from how many contacts, or from which messaging relays, as notifications are delivered to your device end-to-end encrypted by one of the preset notification servers - these notifications only contain end-to-end encrypted metadata, not even encrypted message content, and they look completely random to Apple push notification servers.

-You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).

 #### Another information stored on the servers

@@ -115,7 +116,7 @@ We will update this Privacy Policy as needed so that it is current, accurate, an

 Please also read our Conditions of Use of Software and Infrastructure below.

-If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you have questions about our Privacy Policy please contact us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).

 ## Conditions of Use of Software and Infrastructure

@@ -74,7 +74,7 @@ Messages not following these rules will be deleted, the right to send messages m

 You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)

-There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FvYCRjIflKNMGYlfTkuHe4B40qSlQ0439%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAHNdcqNbzXZhyMoSBjT2R0-Eb1EPaLyUg3KZjn-kmM1w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22PD20tcXjw7IpkkMCfR6HLA%3D%3D%22%7D) for developers who build on SimpleX platform:

 - chat bots and automations
 - integrations with other apps
@@ -341,8 +341,8 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64) async -> ChatItem? {
-    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId)
+func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
+    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
    return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
 }

@@ -927,14 +927,19 @@ func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationF
    }
 }

-func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get(), auto: auto) {
+func receiveFile(user: any UserLike, fileId: Int64, userApprovedRelays: Bool = false, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(
+        fileId: fileId,
+        userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
+        encrypted: privacyEncryptLocalFilesGroupDefault.get(),
+        auto: auto
+    ) {
        await chatItemSimpleUpdate(user, chatItem)
    }
 }

-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
    let am = AlertManager.shared
    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
    if case .rcvFileAcceptedSndCancelled = r {
@@ -947,19 +952,50 @@ func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: B
        }
    } else if let networkErrorAlert = networkErrorAlert(r) {
        logger.error("apiReceiveFile network error: \(String(describing: r))")
-        am.showAlert(networkErrorAlert)
+        if !auto {
+            am.showAlert(networkErrorAlert)
+        }
    } else {
        switch chatError(r) {
        case .fileCancelled:
            logger.debug("apiReceiveFile ignoring fileCancelled error")
        case .fileAlreadyReceiving:
            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
+        case let .fileNotApproved(fileId, unknownServers):
+            logger.debug("apiReceiveFile fileNotApproved error")
+            if !auto {
+                let srvs = unknownServers.map { s in
+                    if let srv = parseServerAddress(s), !srv.hostnames.isEmpty {
+                        srv.hostnames[0]
+                    } else {
+                        serverHost(s)
+                    }
+                }
+                am.showAlert(Alert(
+                    title: Text("Unknown servers!"),
+                    message: Text("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs.sorted().joined(separator: ", "))."),
+                    primaryButton: .default(
+                        Text("Download"),
+                        action: {
+                            Task {
+                                logger.debug("apiReceiveFile fileNotApproved alert - in Task")
+                                if let user = ChatModel.shared.currentUser {
+                                    await receiveFile(user: user, fileId: fileId, userApprovedRelays: true)
+                                }
+                            }
+                        }
+                    ),
+                    secondaryButton: .cancel()
+                ))
+            }
        default:
            logger.error("apiReceiveFile error: \(String(describing: r))")
-            am.showAlertMsg(
-                title: "Error receiving file",
-                message: "Error: \(String(describing: r))"
-            )
+            if !auto {
+                am.showAlertMsg(
+                    title: "Error receiving file",
+                    message: "Error: \(String(describing: r))"
+                )
+            }
        }
    }
    return nil
@@ -1849,21 +1885,35 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case .chatSuspended:
        chatSuspended()
-    case let .contactSwitch(_, contact, switchProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+    case let .contactSwitch(user, contact, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+            }
        }
-    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+    case let .groupMemberSwitch(user, groupInfo, member, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+            }
        }
-    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+    case let .contactRatchetSync(user, contact, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+            }
        }
-    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+    case let .groupMemberRatchetSync(user, groupInfo, member, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+            }
+        }
+    case let .contactDisabled(user, contact):
+        if active(user) {
+            await MainActor.run {
+                m.updateContact(contact)
+            }
        }
    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
        await MainActor.run {
@@ -49,7 +49,7 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
    }
 }

-private func serverHost(_ s: String) -> String {
+func serverHost(_ s: String) -> String {
    if let i = s.range(of: "@")?.lowerBound {
        return String(s[i...].dropFirst())
    } else {
@@ -60,6 +60,7 @@ struct CIFileView: View {
            case .rcvInvitation: return true
            case .rcvAccepted: return true
            case .rcvTransfer: return false
+            case .rcvAborted: return true
            case .rcvComplete: return true
            case .rcvCancelled: return false
            case .rcvError: return false
@@ -73,10 +74,10 @@ struct CIFileView: View {
        logger.debug("CIFileView fileAction")
        if let file = file {
            switch (file.fileStatus) {
-            case .rcvInvitation:
+            case .rcvInvitation, .rcvAborted:
                if fileSizeValid(file) {
                    Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
                        if let user = m.currentUser {
                            await receiveFile(user: user, fileId: file.fileId)
                        }
@@ -148,6 +149,8 @@ struct CIFileView: View {
                } else {
                    progressView()
                }
+            case .rcvAborted:
+                fileIcon("doc.fill", color: .accentColor, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
            case .rcvComplete: fileIcon("doc.fill")
            case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
@@ -21,6 +21,8 @@ struct CIGroupInvitationView: View {
    @State private var inProgress = false
    @State private var progressByTimeout = false

+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
    var body: some View {
        let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
        let v = ZStack(alignment: .bottomTrailing) {
@@ -43,7 +45,7 @@ struct CIGroupInvitationView: View {
                                    .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
                                    .font(.callout)
                                + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false)
+                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                            )
                            .overlay(DetermineWidth())
                        }
@@ -51,7 +53,7 @@ struct CIGroupInvitationView: View {
                        (
                            groupInvitationText()
                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false)
+                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                        )
                        .overlay(DetermineWidth())
                    }
@@ -17,7 +17,6 @@ struct CIImageView: View {
    let maxWidth: CGFloat
    @Binding var imgWidth: CGFloat?
    @State var scrollProxy: ScrollViewProxy?
-    @State var metaColor: Color
    @State private var showFullScreenImage = false

    var body: some View {
@@ -38,7 +37,7 @@ struct CIImageView: View {
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                Task {
                                    if let user = m.currentUser {
                                        await receiveFile(user: user, fileId: file.fileId)
@@ -103,6 +102,7 @@ struct CIImageView: View {
            case .rcvInvitation: fileIcon("arrow.down", 10, 13)
            case .rcvAccepted: fileIcon("ellipsis", 14, 11)
            case .rcvTransfer: progressView()
+            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
@@ -116,7 +116,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(metaColor)
+            .foregroundColor(.white)
            .padding(padding)
    }

@@ -17,6 +17,8 @@ struct CIMetaView: View {
    var showStatus = true
    var showEdited = true

+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
    var body: some View {
        if chatItem.isDeletedContent {
            chatItem.timestampText.font(.caption).foregroundColor(metaColor)
@@ -27,24 +29,24 @@ struct CIMetaView: View {
            switch meta.itemStatus {
            case let .sndSent(sndProgress):
                switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                }
            case let .sndRcvd(_, sndProgress):
                switch sndProgress {
                case .complete:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                    }
                case .partial:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                    }
                }
            default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
            }
        }
    }
@@ -64,7 +66,8 @@ func ciMetaText(
    transparent: Bool = false,
    sent: SentCheckmark? = nil,
    showStatus: Bool = true,
-    showEdited: Bool = true
+    showEdited: Bool = true,
+    showViaProxy: Bool
 ) -> Text {
    var r = Text("")
    if showEdited, meta.itemEdited {
@@ -78,6 +81,9 @@ func ciMetaText(
        }
        r = r + Text(" ")
    }
+    if showViaProxy, meta.sentViaProxy == true {
+        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
+    }
    if showStatus {
        if let (icon, statusColor) = meta.statusIcon(color) {
            let t = Text(Image(systemName: icon)).font(.caption2)
@@ -19,6 +19,8 @@ struct CIRcvDecryptionError: View {
    var chatItem: ChatItem
    @State private var alert: CIRcvDecryptionErrorAlert?

+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
    enum CIRcvDecryptionErrorAlert: Identifiable {
        case syncAllowedAlert(_ syncConnection: () -> Void)
        case syncNotSupportedContactAlert
@@ -119,7 +121,7 @@ struct CIRcvDecryptionError: View {
                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
                )
            }
            .padding(.horizontal, 12)
@@ -140,7 +142,7 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
            }
            .padding(.horizontal, 12)
            CIMetaView(chat: chat, chatItem: chatItem)
@@ -69,7 +69,7 @@ struct CIVideoView: View {
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -95,7 +95,7 @@ struct CIVideoView: View {
                }
                durationProgress()
            }
-            if let file = file, case .rcvInvitation = file.fileStatus {
+            if let file = file, showDownloadButton(file.fileStatus) {
                Button {
                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                } label: {
@@ -105,6 +105,14 @@ struct CIVideoView: View {
        }
    }

+    private func showDownloadButton(_ fileStatus: CIFileStatus) -> Bool {
+        switch fileStatus {
+        case .rcvInvitation: true
+        case .rcvAborted: true
+        default: false
+        }
+    }
+
    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
@@ -280,6 +288,7 @@ struct CIVideoView: View {
                } else {
                    progressView()
                }
+            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
@@ -318,10 +327,10 @@ struct CIVideoView: View {
    }

    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
        Task {
            if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false)
+                await receiveFile(user, file.fileId, false, false)
            }
        }
    }
@@ -139,9 +139,10 @@ struct VoiceMessagePlayer: View {
                case .sndComplete: playbackButton()
                case .sndCancelled: playbackButton()
                case .sndError: playbackButton()
-                case .rcvInvitation: downloadButton(recordingFile)
+                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
                case .rcvAccepted: loadingIcon()
                case .rcvTransfer: loadingIcon()
+                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -217,7 +218,7 @@ struct VoiceMessagePlayer: View {
        }
    }

-    private func downloadButton(_ recordingFile: CIFile) -> some View {
+    private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
        Button {
            Task {
                if let user = chatModel.currentUser {
@@ -225,7 +226,7 @@ struct VoiceMessagePlayer: View {
                }
            }
        } label: {
-            playPauseIcon("play.fill")
+            playPauseIcon(icon)
        }
    }

@@ -87,12 +87,17 @@ struct FramedItemView: View {
            .cornerRadius(18)
            .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }

-        switch chatItem.meta.itemStatus {
-        case .sndErrorAuth:
-            v.onTapGesture { msgDeliveryError("Most likely this contact has deleted the connection with you.") }
-        case let .sndError(agentError):
-            v.onTapGesture { msgDeliveryError("Unexpected error: \(agentError)") }
-        default: v
+        if let (title, text) = chatItem.meta.itemStatus.statusInfo {
+            v.onTapGesture {
+                AlertManager.shared.showAlert(
+                    Alert(
+                        title: Text(title),
+                        message: Text(text)
+                    )
+                )
+            }
+        } else {
+            v
        }
    }

@@ -110,7 +115,7 @@ struct FramedItemView: View {
        } else {
            switch (chatItem.content.msgContent) {
            case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
                    .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
@@ -157,13 +162,6 @@ struct FramedItemView: View {
            }
        }
    }
-    
-    private func msgDeliveryError(_ err: LocalizedStringKey) {
-        AlertManager.shared.showAlertMsg(
-            title: "Message delivery error",
-            message: err
-        )
-    }

    @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text, pad: Bool = false) -> some View {
        let v = HStack(spacing: 6) {
@@ -248,7 +246,10 @@ struct FramedItemView: View {
        Group {
            if let sender = qi.getSender(membership()) {
                VStack(alignment: .leading, spacing: 2) {
-                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    Text(sender)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                        .lineLimit(1)
                    ciQuotedMsgTextView(qi, lines: 2)
                }
            } else {
@@ -35,6 +35,8 @@ struct MsgContentView: View {
    @State private var typingIdx = 0
    @State private var timer: Timer?

+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+
    var body: some View {
        if meta?.isLive == true {
            msgContentView()
@@ -81,7 +83,7 @@ struct MsgContentView: View {
    }

    private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
    }
 }

@@ -383,7 +383,7 @@ struct ChatItemInfoView: View {
            let mss = membersStatuses(memberDeliveryStatuses)
            if !mss.isEmpty {
                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
                }
            } else {
                Text("No delivery information")
@@ -392,23 +392,27 @@ struct ChatItemInfoView: View {
        }
    }

-    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus, Bool?)] {
        memberDeliveryStatuses.compactMap({ mds in
            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
-                return (mem.wrapped, mds.memberDeliveryStatus)
+                return (mem.wrapped, mds.memberDeliveryStatus, mds.sentViaProxy)
            } else {
                return nil
            }
        })
    }

-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus, _ sentViaProxy: Bool?) -> some View {
        HStack{
            ProfileImage(imageStr: member.image, size: 30)
                .padding(.trailing, 2)
            Text(member.chatViewName)
                .lineLimit(1)
            Spacer()
+            if sentViaProxy == true {
+                Image(systemName: "arrow.forward")
+                    .foregroundColor(.secondary).opacity(0.67)
+            }
            let v = Group {
                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
                    switch status {
@@ -593,6 +593,7 @@ struct ChatView: View {
                            Text(memberNames(member, prevMember, memCount))
                                .font(.caption)
                                .foregroundStyle(.secondary)
+                                .lineLimit(2)
                                .padding(.leading, memberImageSize + 14)
                                .padding(.top, 7)
                        }
@@ -712,9 +712,9 @@ struct ComposeView: View {
        if chat.chatInfo.contact?.nextSendGrpInv ?? false {
            await sendMemberContactInvitation()
        } else if case let .forwardingItem(ci, fromChatInfo) = composeState.contextItem {
-            sent = await forwardItem(ci, fromChatInfo)
+            sent = await forwardItem(ci, fromChatInfo, ttl)
            if !composeState.message.isEmpty {
-                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: nil)
+                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
            }
        } else if case let .editingItem(ci) = composeState.contextItem {
            sent = await updateMessage(ci, live: live)
@@ -890,13 +890,14 @@ struct ComposeView: View {
            return nil
        }

-        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo) async -> ChatItem? {
+        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
            if let chatItem = await apiForwardChatItem(
                toChatType: chat.chatInfo.chatType,
                toChatId: chat.chatInfo.apiId,
                fromChatType: fromChatInfo.chatType,
                fromChatId: fromChatInfo.apiId,
-                itemId: forwardedItem.id
+                itemId: forwardedItem.id,
+                ttl: ttl
            ) {
                await MainActor.run {
                    chatModel.addChatItem(chat.chatInfo, chatItem)
@@ -224,8 +224,7 @@ struct SendMessageView: View {

    @ViewBuilder private func sendButtonContextMenuItems() -> some View {
        if composeState.liveMessage == nil,
-           !composeState.editing,
-           !composeState.forwarding {
+           !composeState.editing {
            if case .noContextItem = composeState.contextItem,
               !composeState.voicePreview,
               let send = sendLiveMessage,
@@ -34,8 +34,7 @@ struct GroupPreferencesView: View {
                featureSection(.reactions, $preferences.reactions.enable)
                featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
                featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                // TODO enable simplexLinks preference in 5.8
-                // featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
                featureSection(.history, $preferences.history.enable)

                if groupInfo.canEdit {
@@ -102,8 +101,6 @@ struct GroupPreferencesView: View {
                        }
                    }
                    .frame(height: 36)
-                    // remove in v5.8
-                    .disabled(true)
                }
            } else {
                settingsRow(icon, color: color) {
@@ -240,14 +240,14 @@ struct ChatPreviewView: View {

    private func itemStatusMark(_ cItem: ChatItem) -> Text {
        switch cItem.meta.itemStatus {
-        case .sndErrorAuth:
+        case .sndErrorAuth, .sndError:
            return Text(Image(systemName: "multiply"))
                .font(.caption)
                .foregroundColor(.red) + Text(" ")
-        case .sndError:
+        case .sndWarning:
            return Text(Image(systemName: "exclamationmark.triangle.fill"))
                .font(.caption)
-                .foregroundColor(.yellow) + Text(" ")
+                .foregroundColor(.orange) + Text(" ")
        default: return Text("")
        }
    }
@@ -51,10 +51,10 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 25_000000, 35_000000, 50_000000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
-                    intSettingPicker("Receiving concurrency", selection: $netCfg.rcvConcurrency, values: [1, 2, 4, 8, 12, 16, 24], label: "")
+                    // intSettingPicker("Receiving concurrency", selection: $netCfg.rcvConcurrency, values: [1, 2, 4, 8, 12, 16, 24], label: "")
                    timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                    intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                    Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)
@@ -23,6 +23,7 @@ extension AppSettings {
            setNetCfg(val)
        }
        if let val = privacyEncryptLocalFiles { privacyEncryptLocalFilesGroupDefault.set(val) }
+        if let val = privacyAskToApproveRelays { privacyAskToApproveRelaysGroupDefault.set(val) }
        if let val = privacyAcceptImages {
            privacyAcceptImagesGroupDefault.set(val)
            def.setValue(val, forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
@@ -50,6 +51,7 @@ extension AppSettings {
        var c = AppSettings.defaults
        c.networkConfig = getNetCfg()
        c.privacyEncryptLocalFiles = privacyEncryptLocalFilesGroupDefault.get()
+        c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
        c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()
        c.privacyLinkPreviews = def.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
        c.privacyShowChatPreviews = def.bool(forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS)
@@ -12,12 +12,16 @@ import SimpleXChat
 private enum NetworkAlert: Identifiable {
    case updateOnionHosts(hosts: OnionHosts)
    case updateSessionMode(mode: TransportSessionMode)
+    case updateSMPProxyMode(proxyMode: SMPProxyMode)
+    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
    case error(err: String)

    var id: String {
        switch self {
        case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
        case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
+        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
+        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
        case let .error(err): return "error \(err)"
        }
    }
@@ -26,11 +30,14 @@ private enum NetworkAlert: Identifiable {
 struct NetworkAndServers: View {
    @EnvironmentObject var m: ChatModel
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = true
    @State private var cfgLoaded = false
    @State private var currentNetCfg = NetCfg.defaults
    @State private var netCfg = NetCfg.defaults
    @State private var onionHosts: OnionHosts = .no
    @State private var sessionMode: TransportSessionMode = .user
+    @State private var proxyMode: SMPProxyMode = .never
+    @State private var proxyFallback: SMPProxyFallback = .allow
    @State private var alert: NetworkAlert?

    var body: some View {
@@ -75,6 +82,30 @@ struct NetworkAndServers: View {
                    Text("Using .onion hosts requires compatible VPN provider.")
                }

+                Section {
+                    Picker("Private routing", selection: $proxyMode) {
+                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+
+                    Picker("Allow downgrade", selection: $proxyFallback) {
+                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
+                    }
+                    .disabled(proxyMode == .never)
+                    .frame(height: 36)
+
+                    Toggle("Show message status", isOn: $showSentViaProxy)
+                } header: {
+                    Text("Private message routing")
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
+                        if showSentViaProxy {
+                            Text("Show → on messages sent via private routing.")
+                        }
+                    }
+                }
+
                Section("Calls") {
                    NavigationLink {
                        RTCServers()
@@ -99,14 +130,24 @@ struct NetworkAndServers: View {
            currentNetCfg = getNetCfg()
            resetNetCfgView()
        }
-        .onChange(of: onionHosts) { _ in
-            if onionHosts != OnionHosts(netCfg: currentNetCfg) {
-                alert = .updateOnionHosts(hosts: onionHosts)
+        .onChange(of: onionHosts) { hosts in
+            if hosts != OnionHosts(netCfg: currentNetCfg) {
+                alert = .updateOnionHosts(hosts: hosts)
            }
        }
-        .onChange(of: sessionMode) { _ in
-            if sessionMode != netCfg.sessionMode {
-                alert = .updateSessionMode(mode: sessionMode)
+        .onChange(of: sessionMode) { mode in
+            if mode != netCfg.sessionMode {
+                alert = .updateSessionMode(mode: mode)
+            }
+        }
+        .onChange(of: proxyMode) { mode in
+            if mode != netCfg.smpProxyMode {
+                alert = .updateSMPProxyMode(proxyMode: mode)
+            }
+        }
+        .onChange(of: proxyFallback) { fallbackMode in
+            if fallbackMode != netCfg.smpProxyFallback {
+                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
            }
        }
        .alert(item: $alert) { a in
@@ -137,6 +178,30 @@ struct NetworkAndServers: View {
                        resetNetCfgView()
                    }
                )
+            case let .updateSMPProxyMode(proxyMode):
+                return Alert(
+                    title: Text("Message routing mode"),
+                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyMode = proxyMode
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .updateSMPProxyFallback(proxyFallback):
+                return Alert(
+                    title: Text("Message routing fallback"),
+                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyFallback = proxyFallback
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
            case let .error(err):
                return Alert(
                    title: Text("Error updating settings"),
@@ -166,6 +231,8 @@ struct NetworkAndServers: View {
        netCfg = currentNetCfg
        onionHosts = OnionHosts(netCfg: netCfg)
        sessionMode = netCfg.sessionMode
+        proxyMode = netCfg.smpProxyMode
+        proxyFallback = netCfg.smpProxyFallback
    }

    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
@@ -182,6 +249,23 @@ struct NetworkAndServers: View {
        case .entity: return "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."
        }
    }
+    
+    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
+        switch mode {
+        case .always: return "Always use private routing."
+        case .unknown: return "Use private routing with unknown servers."
+        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
+        case .never: return "Do NOT use private routing."
+        }
+    }
+
+    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
+        switch proxyFallback {
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
+        }
+    }
 }

 struct NetworkServersView_Previews: PreviewProvider {
@@ -16,6 +16,7 @@ struct PrivacySettings: View {
    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
+    @AppStorage(GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS, store: groupDefaults) private var askToApproveRelays = true
    @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -64,18 +65,6 @@ struct PrivacySettings: View {
                }

                Section {
-                    settingsRow("lock.doc") {
-                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                            .onChange(of: encryptLocalFiles) {
-                                setEncryptLocalFiles($0)
-                            }
-                    }
-                    settingsRow("photo") {
-                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
-                            .onChange(of: autoAcceptImages) {
-                                privacyAcceptImagesGroupDefault.set($0)
-                            }
-                    }
                    settingsRow("network") {
                        Toggle("Send link previews", isOn: $useLinkPreviews)
                    }
@@ -108,6 +97,32 @@ struct PrivacySettings: View {
                    Text("Chats")
                }

+                Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                            .onChange(of: encryptLocalFiles) {
+                                setEncryptLocalFiles($0)
+                            }
+                    }
+                    settingsRow("photo") {
+                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
+                            .onChange(of: autoAcceptImages) {
+                                privacyAcceptImagesGroupDefault.set($0)
+                            }
+                    }
+                    settingsRow("network.badge.shield.half.filled") {
+                        Toggle("Protect IP address", isOn: $askToApproveRelays)
+                    }
+                } header: {
+                    Text("Files")
+                } footer: {
+                    if askToApproveRelays {
+                        Text("The app will ask to confirm downloads from unknown file servers (except .onion).")
+                    } else {
+                        Text("Without Tor or VPN, your IP address will be visible to file servers.")
+                    }
+                }
+
                Section {
                    settingsRow("person") {
                        Toggle("Contacts", isOn: $contactReceipts)
@@ -60,6 +60,7 @@ let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
+let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"

 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"

@@ -99,6 +100,7 @@ let appDefaults: [String: Any] = [
    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
+    DEFAULT_SHOW_SENT_VIA_RPOXY: false,
    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue
 ]

@@ -2805,6 +2805,7 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
+        <target>Препращане и запазване на съобщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3174,6 +3175,7 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="In-call sounds" xml:space="preserve">
        <source>In-call sounds</source>
+        <target>Звуци по време на разговор</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
@@ -3653,6 +3655,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
+        <target>Източникът на съобщението остава скрит.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3772,6 +3775,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="More reliable network connection." xml:space="preserve">
        <source>More reliable network connection.</source>
+        <target>По-надеждна мрежова връзка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -3816,6 +3820,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
+        <target>Управление на мрежата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
@@ -4371,6 +4376,7 @@ Error: %@</source>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Профилни изображения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -5195,6 +5201,7 @@ Error: %@</source>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Променете формата на профилните изображения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5364,6 +5371,7 @@ Error: %@</source>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Квадрат, кръг или нещо между тях.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -6244,6 +6252,7 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
        <source>When connecting audio and video calls.</source>
+        <target>При свързване на аудио и видео разговори.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
@@ -6263,6 +6272,7 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
        <source>Will be enabled in direct chats!</source>
+        <target>Ще бъде активирано в личните чатове!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wired ethernet" xml:space="preserve">
@@ -4376,6 +4376,7 @@ Fehler: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Profil-Bilder</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -5200,6 +5201,7 @@ Fehler: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Form der Profil-Bilder</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5369,6 +5371,7 @@ Fehler: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Quadratisch, kreisförmig oder irgendetwas dazwischen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -6029,7 +6032,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
      </trans-unit>
      <trans-unit id="Use current profile" xml:space="preserve">
        <source>Use current profile</source>
-        <target>Nutzen Sie das aktuelle Profil</target>
+        <target>Das aktuelle Profil nutzen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
@@ -4376,6 +4376,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Imágenes del perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -5200,6 +5201,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Dar forma a las imágenes de perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5369,6 +5371,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Cuadrada, circular o cualquier forma intermedia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -745,6 +745,7 @@
      </trans-unit>
      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
        <source>Allow to send SimpleX links.</source>
+        <target>Autorise l'envoi de liens SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -1089,6 +1090,7 @@
      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
+        <target>Cellulaire</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Change" xml:space="preserve">
@@ -2088,6 +2090,7 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
+        <target>Télécharger</target>
        <note>chat item action</note>
      </trans-unit>
      <trans-unit id="Download failed" xml:space="preserve">
@@ -2202,6 +2205,7 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="Enabled for" xml:space="preserve">
        <source>Enabled for</source>
+        <target>Activé pour</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Encrypt" xml:space="preserve">
@@ -2726,6 +2730,7 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="Files and media not allowed" xml:space="preserve">
        <source>Files and media not allowed</source>
+        <target>Fichiers et médias non autorisés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
@@ -2795,18 +2800,22 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="Forward" xml:space="preserve">
        <source>Forward</source>
+        <target>Transférer</target>
        <note>chat item action</note>
      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
+        <target>Transférer et sauvegarder des messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
+        <target>Transféré</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded from" xml:space="preserve">
        <source>Forwarded from</source>
+        <target>Transféré depuis</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
@@ -2921,6 +2930,7 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
        <source>Group members can send SimpleX links.</source>
+        <target>Les membres du groupe peuvent envoyer des liens SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -3165,6 +3175,7 @@ Cette opération ne peut être annulée !</target>
      </trans-unit>
      <trans-unit id="In-call sounds" xml:space="preserve">
        <source>In-call sounds</source>
+        <target>Sons d'appel</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
@@ -3644,6 +3655,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
+        <target>La source du message reste privée.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3763,6 +3775,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="More reliable network connection." xml:space="preserve">
        <source>More reliable network connection.</source>
+        <target>Connexion réseau plus fiable.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -3802,10 +3815,12 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Network connection" xml:space="preserve">
        <source>Network connection</source>
+        <target>Connexion au réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
+        <target>Gestion du réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
@@ -3920,6 +3935,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="No network connection" xml:space="preserve">
        <source>No network connection</source>
+        <target>Pas de connexion au réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -4138,6 +4154,7 @@ Voici votre lien pour le groupe %@ !</target>
      </trans-unit>
      <trans-unit id="Other" xml:space="preserve">
        <source>Other</source>
+        <target>Autres</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -4359,6 +4376,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Images de profil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -4403,6 +4421,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
        <source>Prohibit sending SimpleX links.</source>
+        <target>Interdire l'envoi de liens SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -4537,6 +4556,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Receiving concurrency" xml:space="preserve">
        <source>Receiving concurrency</source>
+        <target>Réception simultanée</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -4556,6 +4576,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Recipient(s) can't see who this message is from." xml:space="preserve">
        <source>Recipient(s) can't see who this message is from.</source>
+        <target>Le(s) destinataire(s) ne peut(vent) pas voir de qui provient ce message.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
@@ -4860,6 +4881,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
+        <target>Enregistré</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Saved WebRTC ICE servers will be removed" xml:space="preserve">
@@ -4869,6 +4891,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Saved from" xml:space="preserve">
        <source>Saved from</source>
+        <target>Enregistré depuis</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Saved message" xml:space="preserve">
@@ -5178,6 +5201,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Images de profil modelable</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5302,10 +5326,12 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
        <source>SimpleX links are prohibited in this group.</source>
+        <target>Les liens SimpleX sont interdits dans ce groupe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
        <source>SimpleX links not allowed</source>
+        <target>Les liens SimpleX ne sont pas autorisés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
@@ -5345,6 +5371,7 @@ Erreur : %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Carré, circulaire, ou toute autre forme intermédiaire.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -6150,6 +6177,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="Voice messages not allowed" xml:space="preserve">
        <source>Voice messages not allowed</source>
+        <target>Les messages vocaux ne sont pas autorisés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -6224,6 +6252,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
        <source>When connecting audio and video calls.</source>
+        <target>Lors des appels audio et vidéo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
@@ -6238,14 +6267,17 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      </trans-unit>
      <trans-unit id="WiFi" xml:space="preserve">
        <source>WiFi</source>
+        <target>WiFi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
        <source>Will be enabled in direct chats!</source>
+        <target>Activé dans les discussions directes !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wired ethernet" xml:space="preserve">
        <source>Wired ethernet</source>
+        <target>Ethernet câblé</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="With encrypted files and media." xml:space="preserve">
@@ -6733,6 +6765,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="admins" xml:space="preserve">
        <source>admins</source>
+        <target>admins</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
@@ -6747,6 +6780,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="all members" xml:space="preserve">
        <source>all members</source>
+        <target>tous les membres</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -7081,6 +7115,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="forwarded" xml:space="preserve">
        <source>forwarded</source>
+        <target>transféré</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
@@ -7292,6 +7327,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="owners" xml:space="preserve">
        <source>owners</source>
+        <target>propriétaires</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="peer-to-peer" xml:space="preserve">
@@ -7346,10 +7382,12 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
+        <target>enregistré</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="saved from %@" xml:space="preserve">
        <source>saved from %@</source>
+        <target>enregistré à partir de %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
@@ -7494,6 +7532,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
      </trans-unit>
      <trans-unit id="you" xml:space="preserve">
        <source>you</source>
+        <target>vous</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="you are invited to group" xml:space="preserve">
@@ -94,17 +94,17 @@
      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
-        <target>%@ és %@ csatlakozott</target>
+        <target>%@ és %@ kapcsolódott</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ at %@:" xml:space="preserve">
        <source>%1$@ at %2$@:</source>
-        <target>%1$@ %2$@-kor:</target>
+        <target>%1$@ ekkor: %2$@</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
      <trans-unit id="%@ connected" xml:space="preserve">
        <source>%@ connected</source>
-        <target>%@ csatlakozott</target>
+        <target>%@ kapcsolódott</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ downloaded" xml:space="preserve">
@@ -114,7 +114,7 @@
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
-        <target>%@ csatlakozott!</target>
+        <target>%@ kapcsolódott!</target>
        <note>notification title</note>
      </trans-unit>
      <trans-unit id="%@ is not verified" xml:space="preserve">
@@ -139,7 +139,7 @@
      </trans-unit>
      <trans-unit id="%@ wants to connect!" xml:space="preserve">
        <source>%@ wants to connect!</source>
-        <target>%@ csatlakozni szeretne!</target>
+        <target>%@ kapcsolódni szeretne!</target>
        <note>notification title</note>
      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -149,7 +149,7 @@
      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ és további %lld tag csatlakozott</target>
+        <target>%@, %@ és további %lld tag kapcsolódott</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
@@ -319,7 +319,7 @@
      </trans-unit>
      <trans-unit id="(this device v%@)" xml:space="preserve">
        <source>(this device v%@)</source>
-        <target>(ez az eszköz v%@)</target>
+        <target>(ez az eszköz: v%@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
@@ -329,7 +329,7 @@
      </trans-unit>
      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
-        <target>**Ismerős hozzáadása**: új meghívó hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő csatlakozáshoz.</target>
+        <target>**Ismerős hozzáadása**: új meghívó hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
@@ -585,7 +585,7 @@
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
-        <target>Azonosító hozzáadása a profilhoz, hogy az ismerősök megoszthassák másokkal. A profilfrissítés elküldésre kerül ismerősők számára.</target>
+        <target>Azonosító hozzáadása a profilhoz, hogy az ismerősei megoszthassák másokkal. A profilfrissítés elküldésre kerül az ismerősei számára.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Add contact" xml:space="preserve">
@@ -640,7 +640,7 @@
      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
        <source>Admins can create the links to join groups.</source>
-        <target>Az adminok hivatkozásokat hozhatnak létre a csoportokhoz való csatlakozáshoz.</target>
+        <target>Az adminok hivatkozásokat hozhatnak létre a csoportokhoz való kapcsolódáshoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Advanced network settings" xml:space="preserve">
@@ -665,7 +665,7 @@
      </trans-unit>
      <trans-unit id="All group members will remain connected." xml:space="preserve">
        <source>All group members will remain connected.</source>
-        <target>Minden csoporttag csatlakoztatva marad.</target>
+        <target>Minden csoporttag kapcsolódva marad.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve">
@@ -685,7 +685,7 @@
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
-        <target>Minden ismerős csatlakoztatva marad.</target>
+        <target>Minden ismerős kapcsolódva marad.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve">
@@ -795,7 +795,7 @@
      </trans-unit>
      <trans-unit id="Already connected?" xml:space="preserve">
        <source>Already connected?</source>
-        <target>Csatlakoztatva?</target>
+        <target>Már kapcsolódott?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Already connecting!" xml:space="preserve">
@@ -805,7 +805,7 @@
      </trans-unit>
      <trans-unit id="Already joining the group!" xml:space="preserve">
        <source>Already joining the group!</source>
-        <target>Csatlakozás folyamatban!</target>
+        <target>A csatlakozás folyamatban van a csoporthoz!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
@@ -920,7 +920,7 @@
      </trans-unit>
      <trans-unit id="Authentication is required before the call is connected, but you may miss calls." xml:space="preserve">
        <source>Authentication is required before the call is connected, but you may miss calls.</source>
-        <target>A hívás csatlakoztatása előtt hitelesítésre van szükség, de előfordulhat, hogy nem tud hívásokat fogadni.</target>
+        <target>A hívás összekapcsolása előtt hitelesítésre van szükség, de előfordulhat, hogy lemarad a hívásokról.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Authentication unavailable" xml:space="preserve">
@@ -1070,12 +1070,12 @@
      </trans-unit>
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
-        <target>Megszakítás</target>
+        <target>Mégse</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
-        <target>Átköltöztetés megszakítása</target>
+        <target>Átköltöztetés visszavonása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
@@ -1350,17 +1350,17 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Connect via contact address" xml:space="preserve">
        <source>Connect via contact address</source>
-        <target>Csatlakozás ismerős azonosítója által</target>
+        <target>Kapcsolódás a kapcsolattartási azonosítón keresztül</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
        <source>Connect via link</source>
-        <target>Csatlakozás egy hivatkozáson keresztül</target>
+        <target>Kapcsolódás egy hivatkozáson keresztül</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
-        <target>Csatlakozás egyszer használatos hivatkozáson keresztül</target>
+        <target>Kapcsolódás egyszer használatos hivatkozáson keresztül</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect with %@" xml:space="preserve">
@@ -1440,12 +1440,12 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Contact is connected" xml:space="preserve">
        <source>Contact is connected</source>
-        <target>Ismerős csatlakozott</target>
+        <target>Ismerőse kapcsolódott</target>
        <note>notification</note>
      </trans-unit>
      <trans-unit id="Contact is not connected yet!" xml:space="preserve">
        <source>Contact is not connected yet!</source>
-        <target>Az ismerős még nem csatlakozott!</target>
+        <target>Az ismerőse még nem kapcsolódott!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact name" xml:space="preserve">
@@ -2570,7 +2570,7 @@ Ez a művelet nem vonható vissza!</target>
      </trans-unit>
      <trans-unit id="Error stopping chat" xml:space="preserve">
        <source>Error stopping chat</source>
-        <target>Hiba a csevegés megszakításakor</target>
+        <target>Hiba a csevegés megállításakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
@@ -2700,12 +2700,12 @@ Ez a művelet nem vonható vissza!</target>
      </trans-unit>
      <trans-unit id="File will be received when your contact completes uploading it." xml:space="preserve">
        <source>File will be received when your contact completes uploading it.</source>
-        <target>A fájl akkor érkezik meg, amikor ismerőse befejezte annak feltöltést.</target>
+        <target>A fájl akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File will be received when your contact is online, please wait or check later!" xml:space="preserve">
        <source>File will be received when your contact is online, please wait or check later!</source>
-        <target>A fájl akkor érkezik meg, amint ismerőse online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>A fájl akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="File: %@" xml:space="preserve">
@@ -3105,12 +3105,12 @@ Ez a művelet nem vonható vissza!</target>
      </trans-unit>
      <trans-unit id="Image will be received when your contact completes uploading it." xml:space="preserve">
        <source>Image will be received when your contact completes uploading it.</source>
-        <target>A kép akkor érkezik meg, amikor ismerőse befejezte annak feltöltését.</target>
+        <target>A kép akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Image will be received when your contact is online, please wait or check later!" xml:space="preserve">
        <source>Image will be received when your contact is online, please wait or check later!</source>
-        <target>A kép akkor érkezik meg, amikor ismerős elérhető lesz, várjon vagy ellenőrizze később!</target>
+        <target>A kép akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Immediately" xml:space="preserve">
@@ -3368,7 +3368,7 @@ Ez a művelet nem vonható vissza!</target>
      </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">
        <source>It seems like you are already connected via this link. If it is not the case, there was an error (%@).</source>
-        <target>Úgy tűnik, már csatlakozott ezen a hivatkozáson keresztül. Ha ez nem így van, akkor hiba történt (%@).</target>
+        <target>Úgy tűnik, már kapcsolódott ezen a hivatkozáson keresztül. Ha ez nem így van, akkor hiba történt (%@).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Italian interface" xml:space="preserve">
@@ -4004,17 +4004,17 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve">
        <source>Onion hosts will be required for connection. Requires enabling VPN.</source>
-        <target>A csatlakozáshoz Onion host-okra lesz szükség. VPN engedélyezése szükséges.</target>
+        <target>A kapcsolódáshoz Onion kiszolgálókra lesz szükség. VPN engedélyezése szükséges.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
        <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target>Onion host-ok használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.</target>
+        <target>Onion kiszolgálók használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Onion hosts will not be used." xml:space="preserve">
        <source>Onion hosts will not be used.</source>
-        <target>Onion host-ok nem lesznek használva.</target>
+        <target>Onion kiszolgálók nem lesznek használva.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." xml:space="preserve">
@@ -4214,7 +4214,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Paste link to connect!" xml:space="preserve">
        <source>Paste link to connect!</source>
-        <target>Hivatkozás beillesztése a csatlakozáshoz!</target>
+        <target>Hivatkozás beillesztése a kapcsolódáshoz!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Paste the link you received" xml:space="preserve">
@@ -4376,6 +4376,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Profilképek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -4585,12 +4586,12 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
-        <target>Az összes csatlakoztatott kiszolgáló újrakapcsolása az üzenetek kézbesítésének kikényszerítéséhez. Ez további forgalmat használ.</target>
+        <target>Újrakapcsolódás az összes kiszolgálóhoz az üzenetek kézbesítésének kikényszerítéséhez. Ez további forgalmat használ.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reconnect servers?" xml:space="preserve">
        <source>Reconnect servers?</source>
-        <target>Kiszolgálók újracsatlakoztatása?</target>
+        <target>Újrakapcsolódás a kiszolgálókhoz?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
@@ -5000,7 +5001,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Send direct message to connect" xml:space="preserve">
        <source>Send direct message to connect</source>
-        <target>Közvetlen üzenet küldése a csatlakozáshoz</target>
+        <target>Közvetlen üzenet küldése a kapcsolódáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -5200,6 +5201,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Profilkép alakzat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5219,7 +5221,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Share address with contacts?" xml:space="preserve">
        <source>Share address with contacts?</source>
-        <target>Megosztja az azonosítót az ismerősökkel?</target>
+        <target>Megosztja az azonosítót az ismerőseivel?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share link" xml:space="preserve">
@@ -5304,7 +5306,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="SimpleX contact address" xml:space="preserve">
        <source>SimpleX contact address</source>
-        <target>SimpleX ismerős azonosítója</target>
+        <target>SimpleX kapcsolattartási azonosító</target>
        <note>simplex link type</note>
      </trans-unit>
      <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve">
@@ -5369,6 +5371,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Négyzet, kör vagy bármi a kettő között.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -5388,62 +5391,62 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Stop" xml:space="preserve">
        <source>Stop</source>
-        <target>Megszakítás</target>
+        <target>Megállítás</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop SimpleX" xml:space="preserve">
        <source>Stop SimpleX</source>
-        <target>A SimpleX megszakítása</target>
+        <target>SimpleX megállítása</target>
        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Stop chat" xml:space="preserve">
        <source>Stop chat</source>
-        <target>Csevegési szolgáltatás megszakítása</target>
+        <target>Csevegési szolgáltatás megállítása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
        <source>Stop chat to enable database actions</source>
-        <target>Csevegés megszakítása az adatbázis-műveletek engedélyezéséhez</target>
+        <target>Csevegés megállítása az adatbázis-műveletek engedélyezéséhez</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." xml:space="preserve">
        <source>Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped.</source>
-        <target>A csevegés megszakítása a csevegőadatbázis exportálásához, importálásához vagy törléséhez. A csevegés megszakítása alatt nem tud üzeneteket fogadni és küldeni.</target>
+        <target>A csevegés megállítása a csevegő adatbázis exportálásához, importálásához vagy törléséhez. A csevegés megállítása alatt nem tud üzeneteket fogadni és küldeni.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop chat?" xml:space="preserve">
        <source>Stop chat?</source>
-        <target>Csevegési szolgáltatás megszakítása?</target>
+        <target>Csevegési szolgáltatás megállítása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop file" xml:space="preserve">
        <source>Stop file</source>
-        <target>Fájl megszakítása</target>
+        <target>Fájl megállítása</target>
        <note>cancel file action</note>
      </trans-unit>
      <trans-unit id="Stop receiving file?" xml:space="preserve">
        <source>Stop receiving file?</source>
-        <target>Fájl fogadás megszakítása?</target>
+        <target>Fájl fogadás megállítása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop sending file?" xml:space="preserve">
        <source>Stop sending file?</source>
-        <target>Fájl küldés megszakítása?</target>
+        <target>Fájl küldés megállítása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop sharing" xml:space="preserve">
        <source>Stop sharing</source>
-        <target>Megosztás megszakítása</target>
+        <target>Megosztás megállítása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stop sharing address?" xml:space="preserve">
        <source>Stop sharing address?</source>
-        <target>Címmegosztás megszakítása?</target>
+        <target>Címmegosztás megállítása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Stopping chat" xml:space="preserve">
        <source>Stopping chat</source>
-        <target>Csevegés megszakítása</target>
+        <target>Csevegés megállítása folyamatban</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Submit" xml:space="preserve">
@@ -5498,7 +5501,7 @@ Hiba: %@</target>
      </trans-unit>
      <trans-unit id="Tap to Connect" xml:space="preserve">
        <source>Tap to Connect</source>
-        <target>Koppintson a csatlakozáshoz</target>
+        <target>Koppintson a kapcsolódáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
@@ -5600,7 +5603,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve">
        <source>The contact you shared this link with will NOT be able to connect!</source>
-        <target>Ismerőse NEM fog tudni csatlakozni, akivel megosztotta ezt a hivatkozást!</target>
+        <target>Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The created archive is available via app Settings / Database / Old database archive." xml:space="preserve">
@@ -5640,7 +5643,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
        <source>The profile is only shared with your contacts.</source>
-        <target>Profilja csak az ismerősök számára kerül megosztásra.</target>
+        <target>Profilja csak az ismerőseivel kerül megosztásra.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
@@ -5745,7 +5748,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="To connect, your contact can scan QR code or use the link in the app." xml:space="preserve">
        <source>To connect, your contact can scan QR code or use the link in the app.</source>
-        <target>A csatlakozáshoz az ismerős beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</target>
+        <target>A kapcsolódáshoz az ismerőse beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="To hide unwanted messages." xml:space="preserve">
@@ -5797,7 +5800,7 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
      </trans-unit>
      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
        <source>Toggle incognito when connecting.</source>
-        <target>Inkognító mód csatlakozáskor.</target>
+        <target>Inkognitó mód kapcsolódáskor.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Transport isolation" xml:space="preserve">
@@ -5807,12 +5810,12 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
      </trans-unit>
      <trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
        <source>Trying to connect to the server used to receive messages from this contact (error: %@).</source>
-        <target>Csatlakozási kísérlet a kapcsolat üzeneteinek fogadására használt kiszolgálóhoz (hiba: %@).</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál (hiba: %@).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Trying to connect to the server used to receive messages from this contact." xml:space="preserve">
        <source>Trying to connect to the server used to receive messages from this contact.</source>
-        <target>Csatlakozási kísérlet a kapcsolat üzeneteinek fogadására használt kiszolgálóhoz ettől az ismerőstől.</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Turkish interface" xml:space="preserve">
@@ -5918,8 +5921,8 @@ A funkció engedélyezése előtt a rendszer felszólítja a hitelesítés befej
      <trans-unit id="Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.&#10;To connect, please ask your contact to create another connection link and check that you have a stable network connection." xml:space="preserve">
        <source>Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.
 To connect, please ask your contact to create another connection link and check that you have a stable network connection.</source>
-        <target>Hacsak az ismerős nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, hiba lehet – kérjük, jelentse.
-A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
+        <target>Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, lehet hogy ez egy hiba – jelentse a problémát.
+A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unlink" xml:space="preserve">
@@ -5964,7 +5967,7 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="Update .onion hosts setting?" xml:space="preserve">
        <source>Update .onion hosts setting?</source>
-        <target>Tor .onion host beállítások frissítése?</target>
+        <target>Tor .onion kiszolgálók beállításainak frissítése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Update database passphrase" xml:space="preserve">
@@ -5989,7 +5992,7 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="Updating this setting will re-connect the client to all servers." xml:space="preserve">
        <source>Updating this setting will re-connect the client to all servers.</source>
-        <target>A beállítás frissítésével a kliens újracsatlakozik az összes kiszolgálóhoz.</target>
+        <target>A beállítás frissítésével a kliens újrakapcsolódik az összes kiszolgálóhoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Upgrade and open chat" xml:space="preserve">
@@ -6014,7 +6017,7 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="Use .onion hosts" xml:space="preserve">
        <source>Use .onion hosts</source>
-        <target>Tor .onion hostok használata</target>
+        <target>Tor .onion kiszolgálók használata</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
@@ -6074,7 +6077,7 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="Using .onion hosts requires compatible VPN provider." xml:space="preserve">
        <source>Using .onion hosts requires compatible VPN provider.</source>
-        <target>A .onion hosztok használatához kompatibilis VPN szolgáltatóra van szükség.</target>
+        <target>A .onion kiszolgálók használatához kompatibilis VPN szolgáltatóra van szükség.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
@@ -6134,12 +6137,12 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </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>A videó akkor érkezik meg, amikor az ismerőse befejezte annak feltöltését.</target>
+        <target>A videó akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</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">
        <source>Video will be received when your contact is online, please wait or check later!</source>
-        <target>A videó akkor érkezik meg, amikor az ismerős elérhető, várjon, vagy ellenőrizze később!</target>
+        <target>A videó akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Videos and files up to 1gb" xml:space="preserve">
@@ -6254,7 +6257,7 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
        <source>When people request to connect, you can accept or reject it.</source>
-        <target>Csatlakozási kérelmek esetében, elfogadhatja vagy elutasíthatja azokat.</target>
+        <target>Amikor az emberek kapcsolódást kérelmeznek, ön elfogadhatja vagy elutasíthatja azokat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." xml:space="preserve">
@@ -6339,12 +6342,12 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="You are already connecting to %@." xml:space="preserve">
        <source>You are already connecting to %@.</source>
-        <target>Már folyamatban van a csatlakozás ehhez: %@.</target>
+        <target>Már folyamatban van a kapcsolódás ehhez: %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
        <source>You are already connecting via this one-time link!</source>
-        <target>Már csatlakozik ezen az egyszer használatos hivatkozáson keresztül!</target>
+        <target>A kapcsolódás már folyamatban van ezen az egyszer használatos hivatkozáson keresztül!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already in group %@." xml:space="preserve">
@@ -6354,17 +6357,17 @@ A csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsola
      </trans-unit>
      <trans-unit id="You are already joining the group %@." xml:space="preserve">
        <source>You are already joining the group %@.</source>
-        <target>Már folyamatban van a csatlakozás a csoporthoz %@.</target>
+        <target>A csatlakozás már folyamatban van a(z) %@ csoporthoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
        <source>You are already joining the group via this link!</source>
-        <target>Már csatlakozott a csoporthoz ezen a hivatkozáson keresztül!</target>
+        <target>A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
        <source>You are already joining the group via this link.</source>
-        <target>Ezen a hivatkozáson keresztül már csatlakozik a csoporthoz.</target>
+        <target>A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
@@ -6376,7 +6379,7 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
-        <target>Kiszolgálóhoz történő csatlakozás, mely az adott ismerőstől érkező üzenetek fogadására szolgál.</target>
+        <target>Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are invited to group" xml:space="preserve">
@@ -6436,12 +6439,12 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You can share this address with your contacts to let them connect with **%@**." xml:space="preserve">
        <source>You can share this address with your contacts to let them connect with **%@**.</source>
-        <target>Megoszthatja ezt a hivatkozást ismerőseivel, hogy kapcsolatba léphessenek önnel a **%@** nevű profilján keresztül.</target>
+        <target>Megoszthatja ezt az azonosítót az ismerőseivel, hogy kapcsolatba léphessenek önnel a **%@** nevű profilján keresztül.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can share your address as a link or QR code - anybody can connect to you." xml:space="preserve">
        <source>You can share your address as a link or QR code - anybody can connect to you.</source>
-        <target>Megoszthatja azonosítóját hivatkozásként vagy QR-kódként – így bárki csatlakozhat önhöz.</target>
+        <target>Megoszthatja azonosítóját hivatkozásként vagy QR-kódként – így bárki kapcsolódhat önhöz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can start chat via app Settings / Database or by restarting the app" xml:space="preserve">
@@ -6481,13 +6484,13 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
        <source>You have already requested connection via this address!</source>
-        <target>Már kért egy csatlakozást ezen az azonosítón keresztül!</target>
+        <target>Már kért egy kapcsolódási kérelmet ezen az azonosítón keresztül!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
        <source>You have already requested connection!
 Repeat connection request?</source>
-        <target>Már kérelmezte a csatlakozást!
+        <target>Már kért egy kapcsolódási kérelmet!
 Kapcsolódási kérés megismétlése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -6538,22 +6541,22 @@ Kapcsolódási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You will be connected to group when the group host's device is online, please wait or check later!" xml:space="preserve">
        <source>You will be connected to group when the group host's device is online, please wait or check later!</source>
-        <target>Akkor tud csatlakozni a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>Akkor lesz csatlakoztatva, amikor a csoportos hivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva, amikor a csoportos hivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your connection request is accepted, please wait or check later!</source>
-        <target>Akkor lesz csatlakoztatva, ha a csatlakozási kérelme elfogadásra került, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva, ha a kapcsolódási kérelme elfogadásra kerül, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will be connected when your contact's device is online, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your contact's device is online, please wait or check later!</source>
-        <target>Akkor csatlakozik, amikor az ismerős eszköze online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor le kapcsolódva, amikor az ismerőse eszköze online lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will be required to authenticate when you start or resume the app after 30 seconds in background." xml:space="preserve">
@@ -6563,7 +6566,7 @@ Kapcsolódási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You will connect to all group members." xml:space="preserve">
        <source>You will connect to all group members.</source>
-        <target>Csatlakozni fog a csoport összes tagjához.</target>
+        <target>Kapcsolódni fog a csoport összes tagjához.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -6578,7 +6581,7 @@ Kapcsolódási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You won't lose your contacts if you later delete your address." xml:space="preserve">
        <source>You won't lose your contacts if you later delete your address.</source>
-        <target>Nem veszíti el ismerőseit, ha később törli az azonosítóját.</target>
+        <target>Nem veszíti el az ismerőseit, ha később törli az azonosítóját.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile" xml:space="preserve">
@@ -6655,7 +6658,7 @@ Megszakíthatja ezt a kapcsolatfelvételt és törölheti az ismerőst (ezt kés
      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
-        <target>Az ismerősök továbbra is csatlakoztatva maradnak.</target>
+        <target>Az ismerősei továbbra is kapcsolódva maradnak.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
@@ -6857,7 +6860,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="changed role of %@ to %@" xml:space="preserve">
        <source>changed role of %1$@ to %2$@</source>
-        <target>%1$@ szerepköre megváltozott erre: %2$@</target>
+        <target>%1$@ szerepkörét megváltoztatta erre: %2$@</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="changed your role to %@" xml:space="preserve">
@@ -6887,7 +6890,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="connect to SimpleX Chat developers." xml:space="preserve">
        <source>connect to SimpleX Chat developers.</source>
-        <target>Csatlakozás a SimpleX Chat fejlesztőkhöz.</target>
+        <target>Kapcsolódás a SimpleX Chat fejlesztőkhöz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="connected" xml:space="preserve">
@@ -6922,7 +6925,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="connecting (introduction invitation)" xml:space="preserve">
        <source>connecting (introduction invitation)</source>
-        <target>csatlakozás (bemutatkozás meghívás)</target>
+        <target>kapcsolódás (bemutatkozó meghívó)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="connecting call" xml:space="preserve">
@@ -6947,7 +6950,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="contact %@ changed to %@" xml:space="preserve">
        <source>contact %1$@ changed to %2$@</source>
-        <target>%1$@ ismerősének neve megváltozott erre: %2$@</target>
+        <target>%1$@ megváltoztatta a nevét erre: %2$@</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="contact has e2e encryption" xml:space="preserve">
@@ -7207,7 +7210,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="join as %@" xml:space="preserve">
        <source>join as %@</source>
-        <target>csatlakozás mint %@</target>
+        <target>csatlakozás mint: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="left" xml:space="preserve">
@@ -7227,12 +7230,12 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="member %@ changed to %@" xml:space="preserve">
        <source>member %1$@ changed to %2$@</source>
-        <target>%1$@ tag megváltoztatta a nevét erre: %2$@</target>
+        <target>%1$@ megváltoztatta a nevét erre: %2$@</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="member connected" xml:space="preserve">
        <source>connected</source>
-        <target>kapcsolódva</target>
+        <target>kapcsolódott</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="message received" xml:space="preserve">
@@ -7364,7 +7367,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="removed contact address" xml:space="preserve">
        <source>removed contact address</source>
-        <target>törölt csatlakozási cím</target>
+        <target>törölt kapcsolattartási azonosító</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="removed profile picture" xml:space="preserve">
@@ -7404,7 +7407,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="security code changed" xml:space="preserve">
        <source>security code changed</source>
-        <target>biztonsági kód megváltozott</target>
+        <target>a biztonsági kód megváltozott</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="send direct message" xml:space="preserve">
@@ -7414,7 +7417,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="set new contact address" xml:space="preserve">
        <source>set new contact address</source>
-        <target>új kapcsolattartási cím beállítása</target>
+        <target>új kapcsolattartási azonosító beállítása</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="set new profile picture" xml:space="preserve">
@@ -7479,7 +7482,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="via contact address link" xml:space="preserve">
        <source>via contact address link</source>
-        <target>ismerős azonosítójának hivatkozásán keresztül</target>
+        <target>kapcsolattartási azonosító-hivatkozáson keresztül</target>
        <note>chat list item description</note>
      </trans-unit>
      <trans-unit id="via group link" xml:space="preserve">
@@ -7564,7 +7567,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="you changed role of %@ to %@" xml:space="preserve">
        <source>you changed role of %1$@ to %2$@</source>
-        <target>megváltoztatta %1$@ szerepkörét erre: %@</target>
+        <target>%1$@ szerepkörét megváltoztatta erre: %@</target>
        <note>snd group event chat item</note>
      </trans-unit>
      <trans-unit id="you left" xml:space="preserve">
@@ -7616,7 +7619,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="NSCameraUsageDescription" xml:space="preserve">
        <source>SimpleX needs camera access to scan QR codes to connect to other users and for video calls.</source>
-        <target>A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy csatlakozhasson más felhasználókhoz és videohívásokhoz.</target>
+        <target>A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.</target>
        <note>Privacy - Camera Usage Description</note>
      </trans-unit>
      <trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
@@ -2805,6 +2805,7 @@ Non è reversibile!</target>
      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
+        <target>Inoltra e salva i messaggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3174,6 +3175,7 @@ Non è reversibile!</target>
      </trans-unit>
      <trans-unit id="In-call sounds" xml:space="preserve">
        <source>In-call sounds</source>
+        <target>Suoni nelle chiamate</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
@@ -3653,6 +3655,7 @@ Questo è il tuo link per il gruppo %@!</target>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
+        <target>La fonte del messaggio resta privata.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3772,6 +3775,7 @@ Questo è il tuo link per il gruppo %@!</target>
      </trans-unit>
      <trans-unit id="More reliable network connection." xml:space="preserve">
        <source>More reliable network connection.</source>
+        <target>Connessione di rete più affidabile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -3816,6 +3820,7 @@ Questo è il tuo link per il gruppo %@!</target>
      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
+        <target>Gestione della rete</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
@@ -4371,6 +4376,7 @@ Errore: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Immagini del profilo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -5195,6 +5201,7 @@ Errore: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Forma delle immagini del profilo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5364,6 +5371,7 @@ Errore: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Quadrata, circolare o qualsiasi forma tra le due.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -6244,6 +6252,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
      </trans-unit>
      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
        <source>When connecting audio and video calls.</source>
+        <target>Quando si connettono le chiamate audio e video.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
@@ -6263,6 +6272,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
      </trans-unit>
      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
        <source>Will be enabled in direct chats!</source>
+        <target>Viene attivata nelle chat dirette!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wired ethernet" xml:space="preserve">
@@ -379,12 +379,12 @@
      </trans-unit>
      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
        <source>**e2e encrypted** audio call</source>
-        <target>**e2e 暗号化**音声通話</target>
+        <target>**エンドツーエンド暗号化済み**の音声通話</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**e2e encrypted** video call" xml:space="preserve">
        <source>**e2e encrypted** video call</source>
-        <target>**e2e暗号化**ビデオ通話</target>
+        <target>**エンドツーエンド暗号化済み**の テレビ電話 通話</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="*bold*" xml:space="preserve">
@@ -434,6 +434,7 @@
      </trans-unit>
      <trans-unit id="0 sec" xml:space="preserve">
        <source>0 sec</source>
+        <target>0 秒</target>
        <note>time to disappear</note>
      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
@@ -684,6 +685,7 @@
      </trans-unit>
      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target>すべての連絡先、会話、ファイルは安全に暗号化され、設定されたXFTPリレーに分割でアップロードされます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
@@ -733,6 +735,7 @@
      </trans-unit>
      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
        <source>Allow to send SimpleX links.</source>
+        <target>SimpleXリンクの送信を許可。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -787,10 +790,12 @@
      </trans-unit>
      <trans-unit id="Already connecting!" xml:space="preserve">
        <source>Already connecting!</source>
+        <target>既に接続中です！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Already joining the group!" xml:space="preserve">
        <source>Already joining the group!</source>
+        <target>すでにグループに参加しています！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
@@ -815,6 +820,7 @@
      </trans-unit>
      <trans-unit id="App data migration" xml:space="preserve">
        <source>App data migration</source>
+        <target>アプリデータの移行</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
@@ -4376,6 +4376,7 @@ Fout: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Profiel afbeeldingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -5200,6 +5201,7 @@ Fout: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Vorm profiel afbeeldingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5369,6 +5371,7 @@ Fout: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Vierkant, cirkel of iets daartussenin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -745,6 +745,7 @@
      </trans-unit>
      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
        <source>Allow to send SimpleX links.</source>
+        <target>Zezwól na wysyłanie linków SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -1089,6 +1090,7 @@
      </trans-unit>
      <trans-unit id="Cellular" xml:space="preserve">
        <source>Cellular</source>
+        <target>Sieć komórkowa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Change" xml:space="preserve">
@@ -2088,6 +2090,7 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
+        <target>Pobierz</target>
        <note>chat item action</note>
      </trans-unit>
      <trans-unit id="Download failed" xml:space="preserve">
@@ -2202,6 +2205,7 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="Enabled for" xml:space="preserve">
        <source>Enabled for</source>
+        <target>Włączony dla</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Encrypt" xml:space="preserve">
@@ -2726,6 +2730,7 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="Files and media not allowed" xml:space="preserve">
        <source>Files and media not allowed</source>
+        <target>Pliki i multimedia nie są dozwolone</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
@@ -2795,18 +2800,22 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="Forward" xml:space="preserve">
        <source>Forward</source>
+        <target>Przekaż dalej</target>
        <note>chat item action</note>
      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
+        <target>Przesyłaj dalej i zapisuj wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
+        <target>Przekazane dalej</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded from" xml:space="preserve">
        <source>Forwarded from</source>
+        <target>Przekazane dalej od</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
@@ -2921,6 +2930,7 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
        <source>Group members can send SimpleX links.</source>
+        <target>Członkowie grupy mogą wysyłać linki SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -3165,6 +3175,7 @@ To nie może być cofnięte!</target>
      </trans-unit>
      <trans-unit id="In-call sounds" xml:space="preserve">
        <source>In-call sounds</source>
+        <target>Dźwięki w rozmowie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
@@ -3644,6 +3655,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
+        <target>Źródło wiadomości pozostaje prywatne.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
@@ -3763,6 +3775,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="More reliable network connection." xml:space="preserve">
        <source>More reliable network connection.</source>
+        <target>Bardziej niezawodne połączenia sieciowe.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
@@ -3802,10 +3815,12 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Network connection" xml:space="preserve">
        <source>Network connection</source>
+        <target>Połączenie z siecią</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network management" xml:space="preserve">
        <source>Network management</source>
+        <target>Zarządzenie sieciowe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
@@ -3920,6 +3935,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="No network connection" xml:space="preserve">
        <source>No network connection</source>
+        <target>Brak połączenia z siecią</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
@@ -4138,6 +4154,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Other" xml:space="preserve">
        <source>Other</source>
+        <target>Inne</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -4359,6 +4376,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Zdjęcia profilowe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -4403,6 +4421,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
        <source>Prohibit sending SimpleX links.</source>
+        <target>Zabroń wysyłania linków SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -4537,6 +4556,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Receiving concurrency" xml:space="preserve">
        <source>Receiving concurrency</source>
+        <target>Konkurencyjne odbieranie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -4556,6 +4576,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Recipient(s) can't see who this message is from." xml:space="preserve">
        <source>Recipient(s) can't see who this message is from.</source>
+        <target>Odbiorca/y nie mogą zobaczyć od kogo jest ta wiadomość.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
@@ -4860,6 +4881,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
+        <target>Zapisane</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Saved WebRTC ICE servers will be removed" xml:space="preserve">
@@ -4869,6 +4891,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Saved from" xml:space="preserve">
        <source>Saved from</source>
+        <target>Zapisane od</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Saved message" xml:space="preserve">
@@ -5178,6 +5201,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Kształtuj obrazy profilowe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5302,10 +5326,12 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
        <source>SimpleX links are prohibited in this group.</source>
+        <target>Linki SimpleX są zablokowane na tej grupie.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
        <source>SimpleX links not allowed</source>
+        <target>Linki SimpleX są niedozwolone</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
@@ -5345,6 +5371,7 @@ Błąd: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Kwadrat, okrąg lub cokolwiek pomiędzy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -6150,6 +6177,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="Voice messages not allowed" xml:space="preserve">
        <source>Voice messages not allowed</source>
+        <target>Wiadomości głosowe są niedozwolone</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
@@ -6224,6 +6252,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
        <source>When connecting audio and video calls.</source>
+        <target>Podczas łączenia połączeń audio i wideo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
@@ -6238,14 +6267,17 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      </trans-unit>
      <trans-unit id="WiFi" xml:space="preserve">
        <source>WiFi</source>
+        <target>WiFi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
        <source>Will be enabled in direct chats!</source>
+        <target>Zostanie włączone w czatach bezpośrednich!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Wired ethernet" xml:space="preserve">
        <source>Wired ethernet</source>
+        <target>Połączenie ethernet (po kablu)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="With encrypted files and media." xml:space="preserve">
@@ -6733,6 +6765,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="admins" xml:space="preserve">
        <source>admins</source>
+        <target>administratorzy</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
@@ -6747,6 +6780,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="all members" xml:space="preserve">
        <source>all members</source>
+        <target>wszyscy członkowie</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
@@ -7081,6 +7115,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="forwarded" xml:space="preserve">
        <source>forwarded</source>
+        <target>przekazane dalej</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
@@ -7292,6 +7327,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="owners" xml:space="preserve">
        <source>owners</source>
+        <target>właściciele</target>
        <note>feature role</note>
      </trans-unit>
      <trans-unit id="peer-to-peer" xml:space="preserve">
@@ -7346,10 +7382,12 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="saved" xml:space="preserve">
        <source>saved</source>
+        <target>zapisane</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="saved from %@" xml:space="preserve">
        <source>saved from %@</source>
+        <target>zapisane od %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
@@ -7494,6 +7532,7 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
      </trans-unit>
      <trans-unit id="you" xml:space="preserve">
        <source>you</source>
+        <target>Ty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="you are invited to group" xml:space="preserve">
@@ -4376,6 +4376,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Profile images" xml:space="preserve">
        <source>Profile images</source>
+        <target>Profil resimleri</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
@@ -4525,7 +4526,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Receipts are disabled" xml:space="preserve">
        <source>Receipts are disabled</source>
-        <target>Makbuzlar devre dışı bırakıldı</target>
+        <target>Gönderildi bilgisi devre dışı bırakıldı</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
@@ -5065,7 +5066,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
        <source>Sending delivery receipts will be enabled for all contacts.</source>
-        <target>Teslimat makbuzlarının gönderilmesi tüm kişiler için etkinleştirilecektir.</target>
+        <target>Gönderildi bilgisi tüm kişiler için etkinleştirilecektir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
@@ -5200,6 +5201,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
+        <target>Profil resimlerini şekillendir</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
@@ -5369,6 +5371,7 @@ Hata: %@</target>
      </trans-unit>
      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
        <source>Square, circle, or anything in between.</source>
+        <target>Kare,daire, veya aralarında herhangi bir şey.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
@@ -696,14 +696,16 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
 }

 func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
-    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+    let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
+    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
    logger.error("receiveFile error: \(responseError(r))")
    return nil
 }

 func apiSetFileToReceive(fileId: Int64, encrypted: Bool) {
-    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, encrypted: encrypted))
+    let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
+    let r = sendSimpleXCmd(.setFileToReceive(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted))
    if case .cmdOk = r { return }
    logger.error("setFileToReceive error: \(responseError(r))")
 }
@@ -68,11 +68,6 @@
 		5C9329412929248A0090FFF9 /* ScanProtocolServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */; };
 		5C971E1D27AEBEF600C8A3CE /* ChatInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */; };
 		5C971E2127AEBF8300C8A3CE /* ChatInfoImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C971E2027AEBF8300C8A3CE /* ChatInfoImage.swift */; };
-		5C9731F72BDC0C4F000538F2 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9731F22BDC0C4F000538F2 /* libffi.a */; };
-		5C9731F82BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9731F32BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a */; };
-		5C9731F92BDC0C4F000538F2 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9731F42BDC0C4F000538F2 /* libgmpxx.a */; };
-		5C9731FA2BDC0C4F000538F2 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9731F52BDC0C4F000538F2 /* libgmp.a */; };
-		5C9731FB2BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9731F62BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a */; };
 		5C9A5BDB2871E05400A5B906 /* SetNotificationsMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9A5BDA2871E05400A5B906 /* SetNotificationsMode.swift */; };
 		5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9C2DA42894777E00CC63B1 /* GroupProfileView.swift */; };
 		5C9C2DA7289957AE00CC63B1 /* AdvancedNetworkSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9C2DA6289957AE00CC63B1 /* AdvancedNetworkSettings.swift */; };
@@ -144,6 +139,11 @@
 		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 */; };
+		5CEE87942C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE878F2C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a */; };
+		5CEE87952C024F4F00583B8A /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE87902C024F4F00583B8A /* libgmp.a */; };
+		5CEE87962C024F4F00583B8A /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE87912C024F4F00583B8A /* libgmpxx.a */; };
+		5CEE87972C024F4F00583B8A /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE87922C024F4F00583B8A /* libffi.a */; };
+		5CEE87982C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CEE87932C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
@@ -346,11 +346,6 @@
 		5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanProtocolServer.swift; sourceTree = "<group>"; };
 		5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoView.swift; sourceTree = "<group>"; };
 		5C971E2027AEBF8300C8A3CE /* ChatInfoImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoImage.swift; sourceTree = "<group>"; };
-		5C9731F22BDC0C4F000538F2 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5C9731F32BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a"; sourceTree = "<group>"; };
-		5C9731F42BDC0C4F000538F2 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C9731F52BDC0C4F000538F2 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C9731F62BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a"; sourceTree = "<group>"; };
 		5C9A5BDA2871E05400A5B906 /* SetNotificationsMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNotificationsMode.swift; sourceTree = "<group>"; };
 		5C9C2DA42894777E00CC63B1 /* GroupProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupProfileView.swift; sourceTree = "<group>"; };
 		5C9C2DA6289957AE00CC63B1 /* AdvancedNetworkSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedNetworkSettings.swift; sourceTree = "<group>"; };
@@ -440,6 +435,11 @@
 		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>"; };
+		5CEE878F2C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5CEE87902C024F4F00583B8A /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CEE87912C024F4F00583B8A /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CEE87922C024F4F00583B8A /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5CEE87932C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a"; sourceTree = "<group>"; };
 		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
 		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
@@ -529,13 +529,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5CEE87942C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a in Frameworks */,
+				5CEE87972C024F4F00583B8A /* libffi.a in Frameworks */,
+				5CEE87962C024F4F00583B8A /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C9731F92BDC0C4F000538F2 /* libgmpxx.a in Frameworks */,
-				5C9731F82BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a in Frameworks */,
-				5C9731F72BDC0C4F000538F2 /* libffi.a in Frameworks */,
-				5C9731FA2BDC0C4F000538F2 /* libgmp.a in Frameworks */,
+				5CEE87952C024F4F00583B8A /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C9731FB2BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a in Frameworks */,
+				5CEE87982C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -601,11 +601,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C9731F22BDC0C4F000538F2 /* libffi.a */,
-				5C9731F52BDC0C4F000538F2 /* libgmp.a */,
-				5C9731F42BDC0C4F000538F2 /* libgmpxx.a */,
-				5C9731F62BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB-ghc9.6.3.a */,
-				5C9731F32BDC0C4F000538F2 /* libHSsimplex-chat-5.7.0.5-KRbIOKUzDlJ3qPYhEOgsVB.a */,
+				5CEE87922C024F4F00583B8A /* libffi.a */,
+				5CEE87902C024F4F00583B8A /* libgmp.a */,
+				5CEE87912C024F4F00583B8A /* libgmpxx.a */,
+				5CEE878F2C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G-ghc9.6.3.a */,
+				5CEE87932C024F4F00583B8A /* libHSsimplex-chat-5.8.0.3-3OkzEeUKATkEGDdUZR1g6G.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1552,7 +1552,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1577,7 +1577,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1601,7 +1601,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1626,7 +1626,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1687,7 +1687,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1702,7 +1702,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1724,7 +1724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1739,7 +1739,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1761,7 +1761,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1787,7 +1787,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1812,7 +1812,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 212;
+				CURRENT_PROJECT_VERSION = 220;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1838,7 +1838,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.7;
+				MARKETING_VERSION = 5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -48,7 +48,7 @@ public enum ChatCommand {
    case apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode)
    case apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64)
    case apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction)
-    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64)
+    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?)
    case apiGetNtfToken
    case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
    case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
@@ -123,8 +123,8 @@ public enum ChatCommand {
    case apiGetNetworkStatuses
    case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
    case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
-    case receiveFile(fileId: Int64, encrypted: Bool?, inline: Bool?)
-    case setFileToReceive(fileId: Int64, encrypted: Bool?)
+    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
+    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
    case cancelFile(fileId: Int64)
    // remote desktop commands
    case setLocalDeviceName(displayName: String)
@@ -192,7 +192,9 @@ public enum ChatCommand {
            case let .apiDeleteChatItem(type, id, itemId, mode): return "/_delete item \(ref(type, id)) \(itemId) \(mode.rawValue)"
            case let .apiDeleteMemberChatItem(groupId, groupMemberId, itemId): return "/_delete member item #\(groupId) \(groupMemberId) \(itemId)"
            case let .apiChatItemReaction(type, id, itemId, add, reaction): return "/_reaction \(ref(type, id)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
-            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId): return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId)"
+            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl):
+                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
+                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId) ttl=\(ttlStr)"
            case .apiGetNtfToken: return "/_ntf get "
            case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
            case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
@@ -280,8 +282,8 @@ public enum ChatCommand {
            case .apiGetNetworkStatuses: return "/_network_statuses"
            case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
            case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
-            case let .receiveFile(fileId, encrypt, inline): return "/freceive \(fileId)\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
-            case let .setFileToReceive(fileId, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("encrypt", encrypt))"
+            case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
+            case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
            case let .cancelFile(fileId): return "/fcancel \(fileId)"
            case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
            case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
@@ -639,6 +641,7 @@ public enum ChatResponse: Decodable, Error {
    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
+    case contactDisabled(user: UserRef, contact: Contact)
    // remote desktop responses/events
    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
    case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo, ctrlAppInfo_: CtrlAppInfo?, appVersion: String, compatible: Bool)
@@ -796,6 +799,7 @@ public enum ChatResponse: Decodable, Error {
            case .ntfMessages: return "ntfMessages"
            case .ntfMessage: return "ntfMessage"
            case .contactConnectionDeleted: return "contactConnectionDeleted"
+            case .contactDisabled: return "contactDisabled"
            case .remoteCtrlList: return "remoteCtrlList"
            case .remoteCtrlFound: return "remoteCtrlFound"
            case .remoteCtrlConnecting: return "remoteCtrlConnecting"
@@ -953,6 +957,7 @@ public enum ChatResponse: Decodable, Error {
            case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
+            case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
            case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
            case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
@@ -1242,9 +1247,12 @@ public struct ServerAddress: Decodable {

 public struct NetCfg: Codable, Equatable {
    public var socksProxy: String? = nil
+    var socksMode: SocksMode = .always
    public var hostMode: HostMode = .publicHost
    public var requiredHostMode = true
    public var sessionMode: TransportSessionMode
+    public var smpProxyMode: SMPProxyMode = .never
+    public var smpProxyFallback: SMPProxyFallback = .allow
    public var tcpConnectTimeout: Int // microseconds
    public var tcpTimeout: Int // microseconds
    public var tcpTimeoutPerKb: Int // microseconds
@@ -1289,6 +1297,49 @@ public enum HostMode: String, Codable {
    case publicHost = "public"
 }

+public enum SocksMode: String, Codable {
+    case always = "always"
+    case onion = "onion"
+}
+
+public enum SMPProxyMode: String, Codable {
+    case always = "always"
+    case unknown = "unknown"
+    case unprotected = "unprotected"
+    case never = "never"
+
+    public var text: LocalizedStringKey {
+        switch self {
+        case .always: return "always"
+        case .unknown: return "unknown relays"
+        case .unprotected: return "unprotected"
+        case .never: return "never"
+        }
+    }
+
+    public var id: SMPProxyMode { self }
+
+    public static let values: [SMPProxyMode] = [.always, .unknown, .unprotected, .never]
+}
+
+public enum SMPProxyFallback: String, Codable {
+    case allow = "allow"
+    case allowProtected = "allowProtected"
+    case prohibit = "prohibit"
+
+    public var text: LocalizedStringKey {
+        switch self {
+        case .allow: return "yes"
+        case .allowProtected: return "when IP hidden"
+        case .prohibit: return "no"
+        }
+    }
+
+    public var id: SMPProxyFallback { self }
+
+    public static let values: [SMPProxyFallback] = [.allow, .allowProtected, .prohibit]
+}
+
 public enum OnionHosts: String, Identifiable {
    case no
    case prefer
@@ -1709,6 +1760,7 @@ public enum ChatErrorType: Decodable {
    case fileImageType(filePath: String)
    case fileImageSize(filePath: String)
    case fileNotReceived(fileId: Int64)
+    case fileNotApproved(fileId: Int64, unknownServers: [String])
    // case xFTPRcvFile
    // case xFTPSndFile
    case fallbackToSMPProhibited(fileId: Int64)
@@ -1987,6 +2039,7 @@ public struct MigrationFileLinkData: Codable {
 public struct AppSettings: Codable, Equatable {
    public var networkConfig: NetCfg? = nil
    public var privacyEncryptLocalFiles: Bool? = nil
+    public var privacyAskToApproveRelays: Bool? = nil
    public var privacyAcceptImages: Bool? = nil
    public var privacyLinkPreviews: Bool? = nil
    public var privacyShowChatPreviews: Bool? = nil
@@ -2010,6 +2063,7 @@ public struct AppSettings: Codable, Equatable {
        let def = AppSettings.defaults
        if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
        if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
+        if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
        if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
        if privacyLinkPreviews != def.privacyLinkPreviews { empty.privacyLinkPreviews = privacyLinkPreviews }
        if privacyShowChatPreviews != def.privacyShowChatPreviews { empty.privacyShowChatPreviews = privacyShowChatPreviews }
@@ -2034,6 +2088,7 @@ public struct AppSettings: Codable, Equatable {
        AppSettings (
            networkConfig: NetCfg.defaults,
            privacyEncryptLocalFiles: true,
+            privacyAskToApproveRelays: true,
            privacyAcceptImages: true,
            privacyLinkPreviews: true,
            privacyShowChatPreviews: true,
@@ -23,9 +23,12 @@ public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
 public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
+public let GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS = "privacyAskToApproveRelays"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
+let GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE = "networkSMPProxyMode"
+let GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK = "networkSMPProxyFallback"
 let GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT = "networkTCPConnectTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT = "networkTCPTimeout"
 let GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB = "networkTCPTimeoutPerKb"
@@ -53,6 +56,8 @@ public func registerGroupDefaults() {
        GROUP_DEFAULT_NTF_ENABLE_PERIODIC: false,
        GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS: OnionHosts.no.rawValue,
        GROUP_DEFAULT_NETWORK_SESSION_MODE: TransportSessionMode.user.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.never.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allow.rawValue,
        GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT: NetCfg.defaults.tcpConnectTimeout,
        GROUP_DEFAULT_NETWORK_TCP_TIMEOUT: NetCfg.defaults.tcpTimeout,
        GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB: NetCfg.defaults.tcpTimeoutPerKb,
@@ -69,6 +74,7 @@ public func registerGroupDefaults() {
        GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
        GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false,
        GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES: true,
+        GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS: true,
        GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
        GROUP_DEFAULT_CALL_KIT_ENABLED: true,
        GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED: false,
@@ -177,6 +183,8 @@ public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults

 public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)

+public let privacyAskToApproveRelaysGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS)
+
 public let ntfBadgeCountGroupDefault = IntDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_BADGE_COUNT)

 public let networkUseOnionHostsGroupDefault = EnumDefault<OnionHosts>(
@@ -191,6 +199,18 @@ public let networkSessionModeGroupDefault = EnumDefault<TransportSessionMode>(
    withDefault: .user
 )

+public let networkSMPProxyModeGroupDefault = EnumDefault<SMPProxyMode>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE,
+    withDefault: .never
+)
+
+public let networkSMPProxyFallbackGroupDefault = EnumDefault<SMPProxyFallback>(
+    defaults: groupDefaults,
+    forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK,
+    withDefault: .allow
+)
+
 public let storeDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_STORE_DB_PASSPHRASE)

 public let initialRandomDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE)
@@ -275,6 +295,8 @@ public func getNetCfg() -> NetCfg {
    let onionHosts = networkUseOnionHostsGroupDefault.get()
    let (hostMode, requiredHostMode) = onionHosts.hostMode
    let sessionMode = networkSessionModeGroupDefault.get()
+    let smpProxyMode = networkSMPProxyModeGroupDefault.get()
+    let smpProxyFallback = networkSMPProxyFallbackGroupDefault.get()
    let tcpConnectTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
    let tcpTimeout = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
    let tcpTimeoutPerKb = groupDefaults.integer(forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
@@ -295,6 +317,8 @@ public func getNetCfg() -> NetCfg {
        hostMode: hostMode,
        requiredHostMode: requiredHostMode,
        sessionMode: sessionMode,
+        smpProxyMode: smpProxyMode,
+        smpProxyFallback: smpProxyFallback,
        tcpConnectTimeout: tcpConnectTimeout,
        tcpTimeout: tcpTimeout,
        tcpTimeoutPerKb: tcpTimeoutPerKb,
@@ -309,6 +333,8 @@ public func getNetCfg() -> NetCfg {
 public func setNetCfg(_ cfg: NetCfg) {
    networkUseOnionHostsGroupDefault.set(OnionHosts(netCfg: cfg))
    networkSessionModeGroupDefault.set(cfg.sessionMode)
+    networkSMPProxyModeGroupDefault.set(cfg.smpProxyMode)
+    networkSMPProxyFallbackGroupDefault.set(cfg.smpProxyFallback)
    groupDefaults.set(cfg.tcpConnectTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
    groupDefaults.set(cfg.tcpTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
    groupDefaults.set(cfg.tcpTimeoutPerKb, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
@@ -1510,7 +1510,12 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    public var ready: Bool { get { activeConn?.connStatus == .ready } }
    public var active: Bool { get { contactStatus == .active } }
    public var sendMsgEnabled: Bool { get {
-        (ready && active && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false))
+        (
+            ready
+            && active
+            && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false)
+            && !(activeConn?.connDisabled ?? true)
+        )
        || nextSendGrpInv
    } }
    public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
@@ -1601,15 +1606,20 @@ public struct Connection: Decodable {
    public var pqEncryption: Bool
    public var pqSndEnabled: Bool?
    public var pqRcvEnabled: Bool?
+    public var authErrCounter: Int

    public var connectionStats: ConnectionStats? = nil

    private enum CodingKeys: String, CodingKey {
-        case connId, agentConnId, peerChatVRange, connStatus, connLevel, viaGroupLink, customUserProfileId, connectionCode, pqSupport, pqEncryption, pqSndEnabled, pqRcvEnabled
+        case connId, agentConnId, peerChatVRange, connStatus, connLevel, viaGroupLink, customUserProfileId, connectionCode, pqSupport, pqEncryption, pqSndEnabled, pqRcvEnabled, authErrCounter
    }

    public var id: ChatId { get { ":\(connId)" } }

+    public var connDisabled: Bool {
+        authErrCounter >= 10 // authErrDisableCount in core
+    }
+
    public var connPQEnabled: Bool {
        pqSndEnabled == true && pqRcvEnabled == true
    }
@@ -1622,7 +1632,8 @@ public struct Connection: Decodable {
        connLevel: 0,
        viaGroupLink: false,
        pqSupport: false,
-        pqEncryption: false
+        pqEncryption: false,
+        authErrCounter: 0
    )
 }

@@ -2621,6 +2632,7 @@ public struct CIMeta: Decodable {
    public var itemTs: Date
    var itemText: String
    public var itemStatus: CIStatus
+    public var sentViaProxy: Bool?
    public var createdAt: Date
    public var updatedAt: Date
    public var itemForwarded: CIForwardedFrom?
@@ -2710,7 +2722,8 @@ public enum CIStatus: Decodable {
    case sndSent(sndProgress: SndCIStatusProgress)
    case sndRcvd(msgRcptStatus: MsgReceiptStatus, sndProgress: SndCIStatusProgress)
    case sndErrorAuth
-    case sndError(agentError: String)
+    case sndError(agentError: SndError)
+    case sndWarning(agentError: SndError)
    case rcvNew
    case rcvRead
    case invalid(text: String)
@@ -2722,6 +2735,7 @@ public enum CIStatus: Decodable {
        case .sndRcvd: return "sndRcvd"
        case .sndErrorAuth: return "sndErrorAuth"
        case .sndError: return "sndError"
+        case .sndWarning: return "sndWarning"
        case .rcvNew: return "rcvNew"
        case .rcvRead: return "rcvRead"
        case .invalid: return "invalid"
@@ -2738,7 +2752,8 @@ public enum CIStatus: Decodable {
            case .badMsgHash: return ("checkmark", .red)
            }
        case .sndErrorAuth: return ("multiply", .red)
-        case .sndError: return ("exclamationmark.triangle.fill", .yellow)
+        case .sndError: return ("multiply", .red)
+        case .sndWarning: return ("exclamationmark.triangle.fill", .orange)
        case .rcvNew: return ("circlebadge.fill", Color.accentColor)
        case .rcvRead: return nil
        case .invalid: return ("questionmark", metaColor)
@@ -2756,7 +2771,11 @@ public enum CIStatus: Decodable {
            )
        case let .sndError(agentError): return (
                NSLocalizedString("Message delivery error", comment: "item status text"),
-                String.localizedStringWithFormat(NSLocalizedString("Unexpected error: %@", comment: "item status description"), agentError)
+                agentError.errorInfo
+            )
+        case let .sndWarning(agentError): return (
+                NSLocalizedString("Message delivery warning", comment: "item status text"),
+                agentError.errorInfo
            )
        case .rcvNew: return nil
        case .rcvRead: return nil
@@ -2768,6 +2787,42 @@ public enum CIStatus: Decodable {
    }
 }

+public enum SndError: Decodable {
+    case auth
+    case quota
+    case expired
+    case relay(srvError: SrvError)
+    case proxy(proxyServer: String, srvError: SrvError)
+    case proxyRelay(proxyServer: String, srvError: SrvError)
+    case other(sndError: String)
+
+    public var errorInfo: String {
+        switch self {
+        case .auth: NSLocalizedString("Wrong key or unknown connection - most likely this connection is deleted.", comment: "snd error text")
+        case .quota: NSLocalizedString("Capacity exceeded - recipient did not receive previously sent messages.", comment: "snd error text")
+        case .expired: NSLocalizedString("Network issues - message expired after many attempts to send it.", comment: "snd error text")
+        case let .relay(srvError): String.localizedStringWithFormat(NSLocalizedString("Destination server error: %@", comment: "snd error text"), srvError.errorInfo)
+        case let .proxy(proxyServer, srvError): String.localizedStringWithFormat(NSLocalizedString("Forwarding server: %@\nError: %@", comment: "snd error text"), proxyServer, srvError.errorInfo)
+        case let .proxyRelay(proxyServer, srvError): String.localizedStringWithFormat(NSLocalizedString("Forwarding server: %@\nDestination server error: %@", comment: "snd error text"), proxyServer, srvError.errorInfo)
+        case let .other(sndError): String.localizedStringWithFormat(NSLocalizedString("Error: %@", comment: "snd error text"), sndError)
+        }
+    }
+}
+
+public enum SrvError: Decodable {
+    case host
+    case version
+    case other(srvError: String)
+
+    public var errorInfo: String {
+        switch self {
+        case .host: NSLocalizedString("Server address is incompatible with network settings.", comment: "srv error text.")
+        case .version: NSLocalizedString("Server version is incompatible with network settings.", comment: "srv error text")
+        case let .other(srvError): srvError
+        }
+    }
+}
+
 public enum MsgReceiptStatus: String, Decodable {
    case ok
    case badMsgHash
@@ -3119,6 +3174,7 @@ public struct CIFile: Decodable {
            case .rcvInvitation: return false
            case .rcvAccepted: return false
            case .rcvTransfer: return false
+            case .rcvAborted: return false
            case .rcvCancelled: return false
            case .rcvComplete: return true
            case .rcvError: return false
@@ -3143,6 +3199,7 @@ public struct CIFile: Decodable {
            case .rcvInvitation: return nil
            case .rcvAccepted: return rcvCancelAction
            case .rcvTransfer: return rcvCancelAction
+            case .rcvAborted: return nil
            case .rcvCancelled: return nil
            case .rcvComplete: return nil
            case .rcvError: return nil
@@ -3257,6 +3314,7 @@ public enum CIFileStatus: Decodable, Equatable {
    case rcvInvitation
    case rcvAccepted
    case rcvTransfer(rcvProgress: Int64, rcvTotal: Int64)
+    case rcvAborted
    case rcvComplete
    case rcvCancelled
    case rcvError
@@ -3272,6 +3330,7 @@ public enum CIFileStatus: Decodable, Equatable {
        case .rcvInvitation: return "rcvInvitation"
        case .rcvAccepted: return "rcvAccepted"
        case let .rcvTransfer(rcvProgress, rcvTotal): return "rcvTransfer \(rcvProgress) \(rcvTotal)"
+        case .rcvAborted: return "rcvAborted"
        case .rcvComplete: return "rcvComplete"
        case .rcvCancelled: return "rcvCancelled"
        case .rcvError: return "rcvError"
@@ -3886,4 +3945,5 @@ public struct ChatItemVersion: Decodable {
 public struct MemberDeliveryStatus: Decodable {
    public var groupMemberId: Int64
    public var memberDeliveryStatus: CIStatus
+    public var sentViaProxy: Bool?
 }
@@ -1893,6 +1893,9 @@
 /* chat item action */
 "Forward" = "Препрати";

+/* No comment provided by engineer. */
+"Forward and save messages" = "Препращане и запазване на съобщения";
+
 /* No comment provided by engineer. */
 "forwarded" = "препратено";

@@ -2124,6 +2127,9 @@
 /* No comment provided by engineer. */
 "In reply to" = "В отговор на";

+/* No comment provided by engineer. */
+"In-call sounds" = "Звуци по време на разговор";
+
 /* No comment provided by engineer. */
 "Incognito" = "Инкогнито";

@@ -2469,6 +2475,9 @@
 /* notification */
 "message received" = "получено съобщение";

+/* No comment provided by engineer. */
+"Message source remains private." = "Източникът на съобщението остава скрит.";
+
 /* No comment provided by engineer. */
 "Message text" = "Текст на съобщението";

@@ -2553,6 +2562,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Очаквайте скоро още подобрения!";

+/* No comment provided by engineer. */
+"More reliable network connection." = "По-надеждна мрежова връзка.";
+
 /* item status description */
 "Most likely this connection is deleted." = "Най-вероятно тази връзка е изтрита.";

@@ -2577,6 +2589,9 @@
 /* No comment provided by engineer. */
 "Network connection" = "Мрежова връзка";

+/* No comment provided by engineer. */
+"Network management" = "Управление на мрежата";
+
 /* No comment provided by engineer. */
 "Network settings" = "Мрежови настройки";

@@ -2945,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Профилно изображение";

+/* No comment provided by engineer. */
+"Profile images" = "Профилни изображения";
+
 /* No comment provided by engineer. */
 "Profile name" = "Име на профила";

@@ -3488,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Настройки";

+/* No comment provided by engineer. */
+"Shape profile images" = "Променете формата на профилните изображения";
+
 /* chat item action */
 "Share" = "Сподели";

@@ -3590,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Някой";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Квадрат, кръг или нещо между тях.";
+
 /* chat item text */
 "standard end-to-end encryption" = "стандартно криптиране от край до край";

@@ -4172,6 +4196,9 @@
 /* No comment provided by engineer. */
 "When available" = "Когато са налични";

+/* No comment provided by engineer. */
+"When connecting audio and video calls." = "При свързване на аудио и видео разговори.";
+
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Когато хората искат да се свържат с вас, можете да ги приемете или отхвърлите.";

@@ -4181,6 +4208,9 @@
 /* No comment provided by engineer. */
 "WiFi" = "WiFi";

+/* No comment provided by engineer. */
+"Will be enabled in direct chats!" = "Ще бъде активирано в личните чатове!";
+
 /* No comment provided by engineer. */
 "Wired ethernet" = "Кабелен Ethernet";

@@ -2960,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Profilbild";

+/* No comment provided by engineer. */
+"Profile images" = "Profil-Bilder";
+
 /* No comment provided by engineer. */
 "Profile name" = "Profilname";

@@ -3503,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Einstellungen";

+/* No comment provided by engineer. */
+"Shape profile images" = "Form der Profil-Bilder";
+
 /* chat item action */
 "Share" = "Teilen";

@@ -3605,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Jemand";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Quadratisch, kreisförmig oder irgendetwas dazwischen.";
+
 /* chat item text */
 "standard end-to-end encryption" = "Standard-Ende-zu-Ende-Verschlüsselung";

@@ -4020,7 +4029,7 @@
 "Use chat" = "Verwenden Sie Chat";

 /* No comment provided by engineer. */
-"Use current profile" = "Nutzen Sie das aktuelle Profil";
+"Use current profile" = "Das aktuelle Profil nutzen";

 /* No comment provided by engineer. */
 "Use for new connections" = "Für neue Verbindungen nutzen";
@@ -2960,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Imagen del perfil";

+/* No comment provided by engineer. */
+"Profile images" = "Imágenes del perfil";
+
 /* No comment provided by engineer. */
 "Profile name" = "Nombre del perfil";

@@ -3503,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Configuración";

+/* No comment provided by engineer. */
+"Shape profile images" = "Dar forma a las imágenes de perfil";
+
 /* chat item action */
 "Share" = "Compartir";

@@ -3605,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Alguien";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Cuadrada, circular o cualquier forma intermedia.";
+
 /* chat item text */
 "standard end-to-end encryption" = "cifrado estándar de extremo a extremo";

@@ -389,6 +389,9 @@
 /* member role */
 "admin" = "admin";

+/* feature role */
+"admins" = "admins";
+
 /* No comment provided by engineer. */
 "Admins can block a member for all." = "Les admins peuvent bloquer un membre pour tous.";

@@ -416,6 +419,9 @@
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Tous les membres du groupe resteront connectés.";

+/* feature role */
+"all members" = "tous les membres";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "Tous les messages seront supprimés - il n'est pas possible de revenir en arrière !";

@@ -464,6 +470,9 @@
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Permet l'envoi de fichiers et de médias.";

+/* No comment provided by engineer. */
+"Allow to send SimpleX links." = "Autorise l'envoi de liens SimpleX.";
+
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "Autoriser l'envoi de messages vocaux.";

@@ -707,6 +716,9 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Impossible de recevoir le fichier";

+/* No comment provided by engineer. */
+"Cellular" = "Cellulaire";
+
 /* No comment provided by engineer. */
 "Change" = "Changer";

@@ -1401,6 +1413,9 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Rétrograder et ouvrir le chat";

+/* chat item action */
+"Download" = "Télécharger";
+
 /* No comment provided by engineer. */
 "Download failed" = "Échec du téléchargement";

@@ -1476,6 +1491,9 @@
 /* enabled status */
 "enabled" = "activé";

+/* No comment provided by engineer. */
+"Enabled for" = "Activé pour";
+
 /* enabled status */
 "enabled for contact" = "activé pour le contact";

@@ -1830,6 +1848,9 @@
 /* No comment provided by engineer. */
 "Files and media are prohibited in this group." = "Les fichiers et les médias sont interdits dans ce groupe.";

+/* No comment provided by engineer. */
+"Files and media not allowed" = "Fichiers et médias non autorisés";
+
 /* No comment provided by engineer. */
 "Files and media prohibited!" = "Fichiers et médias interdits !";

@@ -1869,6 +1890,21 @@
 /* No comment provided by engineer. */
 "For console" = "Pour la console";

+/* chat item action */
+"Forward" = "Transférer";
+
+/* No comment provided by engineer. */
+"Forward and save messages" = "Transférer et sauvegarder des messages";
+
+/* No comment provided by engineer. */
+"forwarded" = "transféré";
+
+/* No comment provided by engineer. */
+"Forwarded" = "Transféré";
+
+/* No comment provided by engineer. */
+"Forwarded from" = "Transféré depuis";
+
 /* No comment provided by engineer. */
 "Found desktop" = "Bureau trouvé";

@@ -1947,6 +1983,9 @@
 /* No comment provided by engineer. */
 "Group members can send files and media." = "Les membres du groupe peuvent envoyer des fichiers et des médias.";

+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Les membres du groupe peuvent envoyer des liens SimpleX.";
+
 /* No comment provided by engineer. */
 "Group members can send voice messages." = "Les membres du groupe peuvent envoyer des messages vocaux.";

@@ -2088,6 +2127,9 @@
 /* No comment provided by engineer. */
 "In reply to" = "En réponse à";

+/* No comment provided by engineer. */
+"In-call sounds" = "Sons d'appel";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incognito";

@@ -2433,6 +2475,9 @@
 /* notification */
 "message received" = "message reçu";

+/* No comment provided by engineer. */
+"Message source remains private." = "La source du message reste privée.";
+
 /* No comment provided by engineer. */
 "Message text" = "Texte du message";

@@ -2517,6 +2562,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Plus d'améliorations à venir !";

+/* No comment provided by engineer. */
+"More reliable network connection." = "Connexion réseau plus fiable.";
+
 /* item status description */
 "Most likely this connection is deleted." = "Connexion probablement supprimée.";

@@ -2538,6 +2586,12 @@
 /* No comment provided by engineer. */
 "Network & servers" = "Réseau et serveurs";

+/* No comment provided by engineer. */
+"Network connection" = "Connexion au réseau";
+
+/* No comment provided by engineer. */
+"Network management" = "Gestion du réseau";
+
 /* No comment provided by engineer. */
 "Network settings" = "Paramètres réseau";

@@ -2616,6 +2670,9 @@
 /* No comment provided by engineer. */
 "No history" = "Aucun historique";

+/* No comment provided by engineer. */
+"No network connection" = "Pas de connexion au réseau";
+
 /* No comment provided by engineer. */
 "No permission to record voice message" = "Pas l'autorisation d'enregistrer un message vocal";

@@ -2762,9 +2819,15 @@
 /* No comment provided by engineer. */
 "Or show this code" = "Ou présenter ce code";

+/* No comment provided by engineer. */
+"Other" = "Autres";
+
 /* member role */
 "owner" = "propriétaire";

+/* feature role */
+"owners" = "propriétaires";
+
 /* No comment provided by engineer. */
 "Passcode" = "Code d'accès";

@@ -2897,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Image de profil";

+/* No comment provided by engineer. */
+"Profile images" = "Images de profil";
+
 /* No comment provided by engineer. */
 "Profile name" = "Nom du profil";

@@ -2930,6 +2996,9 @@
 /* No comment provided by engineer. */
 "Prohibit sending files and media." = "Interdire l'envoi de fichiers et de médias.";

+/* No comment provided by engineer. */
+"Prohibit sending SimpleX links." = "Interdire l'envoi de liens SimpleX.";
+
 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "Interdire l'envoi de messages vocaux.";

@@ -3008,6 +3077,9 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "L'adresse de réception sera changée pour un autre serveur. Le changement d'adresse sera terminé lorsque l'expéditeur sera en ligne.";

+/* No comment provided by engineer. */
+"Receiving concurrency" = "Réception simultanée";
+
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "La réception du fichier sera interrompue.";

@@ -3017,6 +3089,9 @@
 /* No comment provided by engineer. */
 "Recent history and improved [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)." = "Historique récent et amélioration du [bot annuaire](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).";

+/* No comment provided by engineer. */
+"Recipient(s) can't see who this message is from." = "Le(s) destinataire(s) ne peut(vent) pas voir de qui provient ce message.";
+
 /* No comment provided by engineer. */
 "Recipients see updates as you type them." = "Les destinataires voient les mises à jour au fur et à mesure que vous leur écrivez.";

@@ -3212,6 +3287,18 @@
 /* No comment provided by engineer. */
 "Save welcome message?" = "Enregistrer le message d'accueil ?";

+/* No comment provided by engineer. */
+"saved" = "enregistré";
+
+/* No comment provided by engineer. */
+"Saved" = "Enregistré";
+
+/* No comment provided by engineer. */
+"Saved from" = "Enregistré depuis";
+
+/* No comment provided by engineer. */
+"saved from %@" = "enregistré à partir de %@";
+
 /* message info title */
 "Saved message" = "Message enregistré";

@@ -3419,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Paramètres";

+/* No comment provided by engineer. */
+"Shape profile images" = "Images de profil modelable";
+
 /* chat item action */
 "Share" = "Partager";

@@ -3479,6 +3569,12 @@
 /* chat feature */
 "SimpleX links" = "Liens SimpleX";

+/* No comment provided by engineer. */
+"SimpleX links are prohibited in this group." = "Les liens SimpleX sont interdits dans ce groupe.";
+
+/* No comment provided by engineer. */
+"SimpleX links not allowed" = "Les liens SimpleX ne sont pas autorisés";
+
 /* No comment provided by engineer. */
 "SimpleX Lock" = "SimpleX Lock";

@@ -3515,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Quelqu'un";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Carré, circulaire, ou toute autre forme intermédiaire.";
+
 /* chat item text */
 "standard end-to-end encryption" = "chiffrement de bout en bout standard";

@@ -4043,6 +4142,9 @@
 /* No comment provided by engineer. */
 "Voice messages are prohibited in this group." = "Les messages vocaux sont interdits dans ce groupe.";

+/* No comment provided by engineer. */
+"Voice messages not allowed" = "Les messages vocaux ne sont pas autorisés";
+
 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "Messages vocaux interdits !";

@@ -4094,12 +4196,24 @@
 /* No comment provided by engineer. */
 "When available" = "Quand disponible";

+/* No comment provided by engineer. */
+"When connecting audio and video calls." = "Lors des appels audio et vidéo.";
+
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Vous pouvez accepter ou refuser les demandes de contacts.";

 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Lorsque vous partagez un profil incognito avec quelqu'un, ce profil sera utilisé pour les groupes auxquels il vous invite.";

+/* No comment provided by engineer. */
+"WiFi" = "WiFi";
+
+/* No comment provided by engineer. */
+"Will be enabled in direct chats!" = "Activé dans les discussions directes !";
+
+/* No comment provided by engineer. */
+"Wired ethernet" = "Ethernet câblé";
+
 /* No comment provided by engineer. */
 "With encrypted files and media." = "Avec les fichiers et les médias chiffrés.";

@@ -4121,6 +4235,9 @@
 /* pref value */
 "yes" = "oui";

+/* No comment provided by engineer. */
+"you" = "vous";
+
 /* No comment provided by engineer. */
 "You" = "Vous";

@@ -50,7 +50,7 @@
 "(new)" = "(új)";

 /* No comment provided by engineer. */
-"(this device v%@)" = "(ez az eszköz v%@)";
+"(this device v%@)" = "(ez az eszköz: v%@)";

 /* No comment provided by engineer. */
 ")" = ")";
@@ -65,7 +65,7 @@
 "[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Csillag a GitHubon](https://github.com/simplex-chat/simplex-chat)";

 /* No comment provided by engineer. */
-"**Add contact**: to create a new invitation link, or connect via a link you received." = "**Ismerős hozzáadása**: új meghívó hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő csatlakozáshoz.";
+"**Add contact**: to create a new invitation link, or connect via a link you received." = "**Ismerős hozzáadása**: új meghívó hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.";

 /* No comment provided by engineer. */
 "**Add new contact**: to create your one-time QR Code for your contact." = "**Új ismerős hozzáadása**: egyszer használatos QR-kód vagy hivatkozás létrehozása a kapcsolattartóhoz.";
@@ -134,19 +134,19 @@
 "%@ and %@" = "%@ és %@";

 /* No comment provided by engineer. */
-"%@ and %@ connected" = "%@ és %@ csatlakozott";
+"%@ and %@ connected" = "%@ és %@ kapcsolódott";

 /* copied message info, <sender> at <time> */
-"%@ at %@:" = "%1$@ %2$@-kor:";
+"%@ at %@:" = "%1$@ ekkor: %2$@";

 /* No comment provided by engineer. */
-"%@ connected" = "%@ csatlakozott";
+"%@ connected" = "%@ kapcsolódott";

 /* No comment provided by engineer. */
 "%@ downloaded" = "%@ letöltve";

 /* notification title */
-"%@ is connected!" = "%@ csatlakozott!";
+"%@ is connected!" = "%@ kapcsolódott!";

 /* No comment provided by engineer. */
 "%@ is not verified" = "%@ nem ellenőrzött";
@@ -161,13 +161,13 @@
 "%@ uploaded" = "%@ feltöltve";

 /* notification title */
-"%@ wants to connect!" = "%@ csatlakozni szeretne!";
+"%@ wants to connect!" = "%@ kapcsolódni szeretne!";

 /* No comment provided by engineer. */
 "%@, %@ and %lld members" = "%@, %@ és további %lld tag";

 /* No comment provided by engineer. */
-"%@, %@ and %lld other members connected" = "%@, %@ és további %lld tag csatlakozott";
+"%@, %@ and %lld other members connected" = "%@, %@ és további %lld tag kapcsolódott";

 /* copied message info */
 "%@:" = "%@:";
@@ -357,7 +357,7 @@
 "accepted call" = "elfogadott hívás";

 /* No comment provided by engineer. */
-"Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Azonosító hozzáadása a profilhoz, hogy az ismerősök megoszthassák másokkal. A profilfrissítés elküldésre kerül ismerősők számára.";
+"Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." = "Azonosító hozzáadása a profilhoz, hogy az ismerősei megoszthassák másokkal. A profilfrissítés elküldésre kerül az ismerősei számára.";

 /* No comment provided by engineer. */
 "Add contact" = "Ismerős hozzáadása";
@@ -396,7 +396,7 @@
 "Admins can block a member for all." = "Az adminok egy tagot mindenki számára letilthatnak.";

 /* No comment provided by engineer. */
-"Admins can create the links to join groups." = "Az adminok hivatkozásokat hozhatnak létre a csoportokhoz való csatlakozáshoz.";
+"Admins can create the links to join groups." = "Az adminok hivatkozásokat hozhatnak létre a csoportokhoz való kapcsolódáshoz.";

 /* No comment provided by engineer. */
 "Advanced network settings" = "Speciális hálózati beállítások";
@@ -417,7 +417,7 @@
 "All data is erased when it is entered." = "A jelkód megadása után minden adat törlésre kerül.";

 /* No comment provided by engineer. */
-"All group members will remain connected." = "Minden csoporttag csatlakoztatva marad.";
+"All group members will remain connected." = "Minden csoporttag kapcsolódva marad.";

 /* feature role */
 "all members" = "minden tag";
@@ -432,7 +432,7 @@
 "All new messages from %@ will be hidden!" = "Minden új üzenet elrejtésre kerül tőle: %@!";

 /* No comment provided by engineer. */
-"All your contacts will remain connected." = "Minden ismerős csatlakoztatva marad.";
+"All your contacts will remain connected." = "Minden ismerős kapcsolódva marad.";

 /* No comment provided by engineer. */
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "Ismerőseivel kapcsolatban marad. A profil változtatások frissítésre kerülnek az ismerősöknél.";
@@ -498,13 +498,13 @@
 "Allow your contacts to send voice messages." = "Hangüzenetek küldésének engedélyezése ismerősök számára.";

 /* No comment provided by engineer. */
-"Already connected?" = "Csatlakoztatva?";
+"Already connected?" = "Már kapcsolódott?";

 /* No comment provided by engineer. */
 "Already connecting!" = "Kapcsolódás folyamatban!";

 /* No comment provided by engineer. */
-"Already joining the group!" = "Csatlakozás folyamatban!";
+"Already joining the group!" = "A csatlakozás folyamatban van a csoporthoz!";

 /* pref value */
 "always" = "mindig";
@@ -582,7 +582,7 @@
 "Authentication failed" = "Sikertelen hitelesítés";

 /* No comment provided by engineer. */
-"Authentication is required before the call is connected, but you may miss calls." = "A hívás csatlakoztatása előtt hitelesítésre van szükség, de előfordulhat, hogy nem tud hívásokat fogadni.";
+"Authentication is required before the call is connected, but you may miss calls." = "A hívás összekapcsolása előtt hitelesítésre van szükség, de előfordulhat, hogy lemarad a hívásokról.";

 /* No comment provided by engineer. */
 "Authentication unavailable" = "Hitelesítés elérhetetlen";
@@ -702,10 +702,10 @@
 "Can't invite contacts!" = "Ismerősök meghívása nem lehetséges!";

 /* No comment provided by engineer. */
-"Cancel" = "Megszakítás";
+"Cancel" = "Mégse";

 /* No comment provided by engineer. */
-"Cancel migration" = "Átköltöztetés megszakítása";
+"Cancel migration" = "Átköltöztetés visszavonása";

 /* feature offered item */
 "cancelled %@" = "%@ törölve";
@@ -754,7 +754,7 @@
 "changed address for you" = "cím megváltoztatva";

 /* rcv group event chat item */
-"changed role of %@ to %@" = "%1$@ szerepköre megváltozott erre: %2$@";
+"changed role of %@ to %@" = "%1$@ szerepkörét megváltoztatta erre: %2$@";

 /* rcv group event chat item */
 "changed your role to %@" = "megváltoztatta a szerepkörét erre: %@";
@@ -883,7 +883,7 @@
 "Connect to desktop" = "Kapcsolódás számítógéphez";

 /* No comment provided by engineer. */
-"connect to SimpleX Chat developers." = "Csatlakozás a SimpleX Chat fejlesztőkhöz.";
+"connect to SimpleX Chat developers." = "Kapcsolódás a SimpleX Chat fejlesztőkhöz.";

 /* No comment provided by engineer. */
 "Connect to yourself?" = "Kapcsolódás saját magához?";
@@ -895,13 +895,13 @@
 "Connect to yourself?\nThis is your own SimpleX address!" = "Kapcsolódás saját magához?\nEz a SimpleX azonosítója!";

 /* No comment provided by engineer. */
-"Connect via contact address" = "Csatlakozás ismerős azonosítója által";
+"Connect via contact address" = "Kapcsolódás a kapcsolattartási azonosítón keresztül";

 /* No comment provided by engineer. */
-"Connect via link" = "Csatlakozás egy hivatkozáson keresztül";
+"Connect via link" = "Kapcsolódás egy hivatkozáson keresztül";

 /* No comment provided by engineer. */
-"Connect via one-time link" = "Csatlakozás egyszer használatos hivatkozáson keresztül";
+"Connect via one-time link" = "Kapcsolódás egyszer használatos hivatkozáson keresztül";

 /* No comment provided by engineer. */
 "Connect with %@" = "Kapcsolódás ezzel: %@";
@@ -931,7 +931,7 @@
 "connecting (introduced)" = "kapcsolódás (bejelentve)";

 /* No comment provided by engineer. */
-"connecting (introduction invitation)" = "csatlakozás (bemutatkozás meghívás)";
+"connecting (introduction invitation)" = "kapcsolódás (bemutatkozó meghívó)";

 /* call status */
 "connecting call" = "hívás kapcsolódik…";
@@ -973,7 +973,7 @@
 "connection:%@" = "kapcsolat: %@";

 /* profile update event chat item */
-"contact %@ changed to %@" = "%1$@ ismerősének neve megváltozott erre: %2$@";
+"contact %@ changed to %@" = "%1$@ megváltoztatta a nevét erre: %2$@";

 /* No comment provided by engineer. */
 "Contact allows" = "Ismerős engedélyezi";
@@ -991,10 +991,10 @@
 "Contact hidden:" = "Ismerős elrejtve:";

 /* notification */
-"Contact is connected" = "Ismerős csatlakozott";
+"Contact is connected" = "Ismerőse kapcsolódott";

 /* No comment provided by engineer. */
-"Contact is not connected yet!" = "Az ismerős még nem csatlakozott!";
+"Contact is not connected yet!" = "Az ismerőse még nem kapcsolódott!";

 /* No comment provided by engineer. */
 "Contact name" = "Ismerős neve";
@@ -1750,7 +1750,7 @@
 "Error starting chat" = "Hiba a csevegés elindításakor";

 /* No comment provided by engineer. */
-"Error stopping chat" = "Hiba a csevegés megszakításakor";
+"Error stopping chat" = "Hiba a csevegés megállításakor";

 /* No comment provided by engineer. */
 "Error switching profile!" = "Hiba a profil váltásakor!";
@@ -1831,10 +1831,10 @@
 "File will be deleted from servers." = "A fájl törölve lesz a kiszolgálóról.";

 /* No comment provided by engineer. */
-"File will be received when your contact completes uploading it." = "A fájl akkor érkezik meg, amikor ismerőse befejezte annak feltöltést.";
+"File will be received when your contact completes uploading it." = "A fájl akkor érkezik meg, amikor a küldője befejezte annak feltöltését.";

 /* No comment provided by engineer. */
-"File will be received when your contact is online, please wait or check later!" = "A fájl akkor érkezik meg, amint ismerőse online lesz, várjon, vagy ellenőrizze később!";
+"File will be received when your contact is online, please wait or check later!" = "A fájl akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
 "File: %@" = "Fájl: %@";
@@ -2086,10 +2086,10 @@
 "Ignore" = "Figyelmen kívül hagyás";

 /* No comment provided by engineer. */
-"Image will be received when your contact completes uploading it." = "A kép akkor érkezik meg, amikor ismerőse befejezte annak feltöltését.";
+"Image will be received when your contact completes uploading it." = "A kép akkor érkezik meg, amikor a küldője befejezte annak feltöltését.";

 /* No comment provided by engineer. */
-"Image will be received when your contact is online, please wait or check later!" = "A kép akkor érkezik meg, amikor ismerős elérhető lesz, várjon vagy ellenőrizze később!";
+"Image will be received when your contact is online, please wait or check later!" = "A kép akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
 "Immediately" = "Azonnal";
@@ -2281,7 +2281,7 @@
 "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." = "Ez akkor fordulhat elő, ha:\n1. Az üzenetek 2 nap után, vagy a kiszolgálón 30 nap után lejártak.\n2. Az üzenet visszafejtése sikertelen volt, mert vagy az ismerőse régebbi adatbázis biztonsági mentést használt.\n3. A kapcsolat sérült.";

 /* 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 (%@)." = "Úgy tűnik, már csatlakozott ezen a hivatkozáson keresztül. Ha ez nem így van, akkor hiba történt (%@).";
+"It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Úgy tűnik, már kapcsolódott ezen a hivatkozáson keresztül. Ha ez nem így van, akkor hiba történt (%@).";

 /* No comment provided by engineer. */
 "Italian interface" = "Olasz kezelőfelület";
@@ -2296,7 +2296,7 @@
 "Join" = "Csatlakozás";

 /* No comment provided by engineer. */
-"join as %@" = "csatlakozás mint %@";
+"join as %@" = "csatlakozás mint: %@";

 /* No comment provided by engineer. */
 "Join group" = "Csatlakozás csoporthoz";
@@ -2440,10 +2440,10 @@
 "Member" = "Tag";

 /* profile update event chat item */
-"member %@ changed to %@" = "%1$@ tag megváltoztatta a nevét erre: %2$@";
+"member %@ changed to %@" = "%1$@ megváltoztatta a nevét erre: %2$@";

 /* rcv group event chat item */
-"member connected" = "kapcsolódva";
+"member connected" = "kapcsolódott";

 /* No comment provided by engineer. */
 "Member role will be changed to \"%@\". All group members will be notified." = "A tag szerepköre meg fog változni erre: \"%@\". A csoport minden tagja értesítést kap róla.";
@@ -2730,13 +2730,13 @@
 "One-time invitation link" = "Egyszer használatos meghívó hivatkozás";

 /* No comment provided by engineer. */
-"Onion hosts will be required for connection. Requires enabling VPN." = "A csatlakozáshoz Onion host-okra lesz szükség. VPN engedélyezése szükséges.";
+"Onion hosts will be required for connection. Requires enabling VPN." = "A kapcsolódáshoz Onion kiszolgálókra lesz szükség. VPN engedélyezése szükséges.";

 /* No comment provided by engineer. */
-"Onion hosts will be used when available. Requires enabling VPN." = "Onion host-ok használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.";
+"Onion hosts will be used when available. Requires enabling VPN." = "Onion kiszolgálók használata, ha azok rendelkezésre állnak. VPN engedélyezése szükséges.";

 /* No comment provided by engineer. */
-"Onion hosts will not be used." = "Onion host-ok nem lesznek használva.";
+"Onion hosts will not be used." = "Onion kiszolgálók nem lesznek használva.";

 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Csak a klienseszközök tárolják a felhasználói profilokat, névjegyeket, csoportokat és a **2 rétegű végponttól-végpontig titkosítással** küldött üzeneteket.";
@@ -2856,7 +2856,7 @@
 "Paste image" = "Kép beillesztése";

 /* No comment provided by engineer. */
-"Paste link to connect!" = "Hivatkozás beillesztése a csatlakozáshoz!";
+"Paste link to connect!" = "Hivatkozás beillesztése a kapcsolódáshoz!";

 /* No comment provided by engineer. */
 "Paste the link you received" = "Fogadott hivatkozás beillesztése";
@@ -2960,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Profilkép";

+/* No comment provided by engineer. */
+"Profile images" = "Profilképek";
+
 /* No comment provided by engineer. */
 "Profile name" = "Profilnév";

@@ -3093,10 +3096,10 @@
 "Recipients see updates as you type them." = "A címzettek a beírás közben látják a frissítéseket.";

 /* No comment provided by engineer. */
-"Reconnect all connected servers to force message delivery. It uses additional traffic." = "Az összes csatlakoztatott kiszolgáló újrakapcsolása az üzenetek kézbesítésének kikényszerítéséhez. Ez további forgalmat használ.";
+"Reconnect all connected servers to force message delivery. It uses additional traffic." = "Újrakapcsolódás az összes kiszolgálóhoz az üzenetek kézbesítésének kikényszerítéséhez. Ez további forgalmat használ.";

 /* No comment provided by engineer. */
-"Reconnect servers?" = "Kiszolgálók újracsatlakoztatása?";
+"Reconnect servers?" = "Újrakapcsolódás a kiszolgálókhoz?";

 /* No comment provided by engineer. */
 "Record updated at" = "A bejegyzés frissítve";
@@ -3144,7 +3147,7 @@
 "removed %@" = "%@ eltávolítva";

 /* profile update event chat item */
-"removed contact address" = "törölt csatlakozási cím";
+"removed contact address" = "törölt kapcsolattartási azonosító";

 /* profile update event chat item */
 "removed profile picture" = "törölt profilkép";
@@ -3345,7 +3348,7 @@
 "Security code" = "Biztonsági kód";

 /* chat item text */
-"security code changed" = "biztonsági kód megváltozott";
+"security code changed" = "a biztonsági kód megváltozott";

 /* No comment provided by engineer. */
 "Select" = "Választás";
@@ -3378,7 +3381,7 @@
 "Send direct message" = "Közvetlen üzenet küldése";

 /* No comment provided by engineer. */
-"Send direct message to connect" = "Közvetlen üzenet küldése a csatlakozáshoz";
+"Send direct message to connect" = "Közvetlen üzenet küldése a kapcsolódáshoz";

 /* No comment provided by engineer. */
 "Send disappearing message" = "Eltűnő üzenet küldése";
@@ -3480,7 +3483,7 @@
 "Set it instead of system authentication." = "Rendszerhitelesítés helyetti beállítás.";

 /* profile update event chat item */
-"set new contact address" = "új kapcsolattartási cím beállítása";
+"set new contact address" = "új kapcsolattartási azonosító beállítása";

 /* profile update event chat item */
 "set new profile picture" = "új profilkép beállítása";
@@ -3503,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Beállítások";

+/* No comment provided by engineer. */
+"Shape profile images" = "Profilkép alakzat";
+
 /* chat item action */
 "Share" = "Megosztás";

@@ -3513,7 +3519,7 @@
 "Share address" = "Azonosító megosztása";

 /* No comment provided by engineer. */
-"Share address with contacts?" = "Megosztja az azonosítót az ismerősökkel?";
+"Share address with contacts?" = "Megosztja az azonosítót az ismerőseivel?";

 /* No comment provided by engineer. */
 "Share link" = "Hivatkozás megosztása";
@@ -3552,7 +3558,7 @@
 "SimpleX Chat security was audited by Trail of Bits." = "A SimpleX Chat biztonsága a Trail of Bits által lett auditálva.";

 /* simplex link type */
-"SimpleX contact address" = "SimpleX ismerős azonosítója";
+"SimpleX contact address" = "SimpleX kapcsolattartási azonosító";

 /* notification */
 "SimpleX encrypted message or connection event" = "SimpleX titkosított üzenet vagy kapcsolati esemény";
@@ -3605,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Valaki";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Négyzet, kör vagy bármi a kettő között.";
+
 /* chat item text */
 "standard end-to-end encryption" = "szabványos végpontok közötti titkosítás";

@@ -3621,40 +3630,40 @@
 "starting…" = "indítás…";

 /* No comment provided by engineer. */
-"Stop" = "Megszakítás";
+"Stop" = "Megállítás";

 /* No comment provided by engineer. */
-"Stop chat" = "Csevegési szolgáltatás megszakítása";
+"Stop chat" = "Csevegési szolgáltatás megállítása";

 /* No comment provided by engineer. */
-"Stop chat to enable database actions" = "Csevegés megszakítása az adatbázis-műveletek engedélyezéséhez";
+"Stop chat to enable database actions" = "Csevegés megállítása az adatbázis-műveletek engedélyezéséhez";

 /* No comment provided by engineer. */
-"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "A csevegés megszakítása a csevegőadatbázis exportálásához, importálásához vagy törléséhez. A csevegés megszakítása alatt nem tud üzeneteket fogadni és küldeni.";
+"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "A csevegés megállítása a csevegő adatbázis exportálásához, importálásához vagy törléséhez. A csevegés megállítása alatt nem tud üzeneteket fogadni és küldeni.";

 /* No comment provided by engineer. */
-"Stop chat?" = "Csevegési szolgáltatás megszakítása?";
+"Stop chat?" = "Csevegési szolgáltatás megállítása?";

 /* cancel file action */
-"Stop file" = "Fájl megszakítása";
+"Stop file" = "Fájl megállítása";

 /* No comment provided by engineer. */
-"Stop receiving file?" = "Fájl fogadás megszakítása?";
+"Stop receiving file?" = "Fájl fogadás megállítása?";

 /* No comment provided by engineer. */
-"Stop sending file?" = "Fájl küldés megszakítása?";
+"Stop sending file?" = "Fájl küldés megállítása?";

 /* No comment provided by engineer. */
-"Stop sharing" = "Megosztás megszakítása";
+"Stop sharing" = "Megosztás megállítása";

 /* No comment provided by engineer. */
-"Stop sharing address?" = "Címmegosztás megszakítása?";
+"Stop sharing address?" = "Címmegosztás megállítása?";

 /* authentication reason */
-"Stop SimpleX" = "A SimpleX megszakítása";
+"Stop SimpleX" = "SimpleX megállítása";

 /* No comment provided by engineer. */
-"Stopping chat" = "Csevegés megszakítása";
+"Stopping chat" = "Csevegés megállítása folyamatban";

 /* No comment provided by engineer. */
 "strike" = "áthúzott";
@@ -3681,7 +3690,7 @@
 "Tap to activate profile." = "A profil aktiválásához koppintson az ikonra.";

 /* No comment provided by engineer. */
-"Tap to Connect" = "Koppintson a csatlakozáshoz";
+"Tap to Connect" = "Koppintson a kapcsolódáshoz";

 /* No comment provided by engineer. */
 "Tap to join" = "Koppintson a csatlakozáshoz";
@@ -3747,7 +3756,7 @@
 "The connection you accepted will be cancelled!" = "Az ön által elfogadott kapcsolat megszakad!";

 /* No comment provided by engineer. */
-"The contact you shared this link with will NOT be able to connect!" = "Ismerőse NEM fog tudni csatlakozni, akivel megosztotta ezt a hivatkozást!";
+"The contact you shared this link with will NOT be able to connect!" = "Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";

 /* No comment provided by engineer. */
 "The created archive is available via app Settings / Database / Old database archive." = "A létrehozott archívum a Beállítások / Adatbázis / Régi adatbázis-archívum menüpontban érhető el.";
@@ -3774,7 +3783,7 @@
 "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ő.";

 /* No comment provided by engineer. */
-"The profile is only shared with your contacts." = "Profilja csak az ismerősök számára kerül megosztásra.";
+"The profile is only shared with your contacts." = "Profilja csak az ismerőseivel kerül megosztásra.";

 /* No comment provided by engineer. */
 "The second tick we missed! ✅" = "A második jelölés, amit kihagytunk! ✅";
@@ -3840,7 +3849,7 @@
 "To ask any questions and to receive updates:" = "Bármilyen kérdés feltevéséhez és a frissítésekért:";

 /* No comment provided by engineer. */
-"To connect, your contact can scan QR code or use the link in the app." = "A csatlakozáshoz az ismerős beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.";
+"To connect, your contact can scan QR code or use the link in the app." = "A kapcsolódáshoz az ismerőse beolvashatja a QR-kódot, vagy használhatja az alkalmazásban található hivatkozást.";

 /* No comment provided by engineer. */
 "To hide unwanted messages." = "Kéretlen üzenetek elrejtése.";
@@ -3870,16 +3879,16 @@
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "A végpontok közötti titkosítás ellenőrzéséhez ismerősével hasonlítsa össze (vagy szkennelje be) az eszközén lévő kódot.";

 /* No comment provided by engineer. */
-"Toggle incognito when connecting." = "Inkognító mód csatlakozáskor.";
+"Toggle incognito when connecting." = "Inkognitó mód kapcsolódáskor.";

 /* No comment provided by engineer. */
 "Transport isolation" = "Kapcsolat izolációs mód";

 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Csatlakozási kísérlet a kapcsolat üzeneteinek fogadására használt kiszolgálóhoz (hiba: %@).";
+"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál (hiba: %@).";

 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact." = "Csatlakozási kísérlet a kapcsolat üzeneteinek fogadására használt kiszolgálóhoz ettől az ismerőstől.";
+"Trying to connect to the server used to receive messages from this contact." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.";

 /* No comment provided by engineer. */
 "Turkish interface" = "Török kezelőfelület";
@@ -3951,7 +3960,7 @@
 "Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." = "Hacsak nem az iOS hívási felületét használja, engedélyezze a Ne zavarjanak módot a megszakítások elkerülése érdekében.";

 /* No comment provided by engineer. */
-"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Hacsak az ismerős nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, hiba lehet – kérjük, jelentse.\nA csatlakozáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";
+"Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection." = "Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";

 /* No comment provided by engineer. */
 "Unlink" = "Szétkapcsolás";
@@ -3978,7 +3987,7 @@
 "Update" = "Frissítés";

 /* No comment provided by engineer. */
-"Update .onion hosts setting?" = "Tor .onion host beállítások frissítése?";
+"Update .onion hosts setting?" = "Tor .onion kiszolgálók beállításainak frissítése?";

 /* No comment provided by engineer. */
 "Update database passphrase" = "Adatbázis jelmondat megváltoztatása";
@@ -3999,7 +4008,7 @@
 "Updating settings will re-connect the client to all servers." = "A beállítások frissítése a szerverekhez újra kapcsolódással jár.";

 /* No comment provided by engineer. */
-"Updating this setting will re-connect the client to all servers." = "A beállítás frissítésével a kliens újracsatlakozik az összes kiszolgálóhoz.";
+"Updating this setting will re-connect the client to all servers." = "A beállítás frissítésével a kliens újrakapcsolódik az összes kiszolgálóhoz.";

 /* No comment provided by engineer. */
 "Upgrade and open chat" = "A csevegés frissítése és megnyitása";
@@ -4014,7 +4023,7 @@
 "Uploading archive" = "Archívum feltöltése";

 /* No comment provided by engineer. */
-"Use .onion hosts" = "Tor .onion hostok használata";
+"Use .onion hosts" = "Tor .onion kiszolgálók használata";

 /* No comment provided by engineer. */
 "Use chat" = "Csevegés használata";
@@ -4050,7 +4059,7 @@
 "User profile" = "Felhasználói profil";

 /* No comment provided by engineer. */
-"Using .onion hosts requires compatible VPN provider." = "A .onion hosztok használatához kompatibilis VPN szolgáltatóra van szükség.";
+"Using .onion hosts requires compatible VPN provider." = "A .onion kiszolgálók használatához kompatibilis VPN szolgáltatóra van szükség.";

 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "SimpleX Chat kiszolgálók használatban.";
@@ -4086,7 +4095,7 @@
 "Via browser" = "Böngészőn keresztül";

 /* chat list item description */
-"via contact address link" = "ismerős azonosítójának hivatkozásán keresztül";
+"via contact address link" = "kapcsolattartási azonosító-hivatkozáson keresztül";

 /* chat list item description */
 "via group link" = "csoport hivatkozáson keresztül";
@@ -4107,10 +4116,10 @@
 "video call (not e2e encrypted)" = "videóhívás (nem e2e titkosított)";

 /* No comment provided by engineer. */
-"Video will be received when your contact completes uploading it." = "A videó akkor érkezik meg, amikor az ismerőse befejezte annak feltöltését.";
+"Video will be received when your contact completes uploading it." = "A videó akkor érkezik meg, amikor a küldője befejezte annak feltöltését.";

 /* No comment provided by engineer. */
-"Video will be received when your contact is online, please wait or check later!" = "A videó akkor érkezik meg, amikor az ismerős elérhető, várjon, vagy ellenőrizze később!";
+"Video will be received when your contact is online, please wait or check later!" = "A videó akkor érkezik meg, amikor a küldője elérhető lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
 "Videos and files up to 1gb" = "Videók és fájlok 1Gb méretig";
@@ -4191,7 +4200,7 @@
 "When connecting audio and video calls." = "Amikor egy bejövő hang- vagy videóhívás érkezik.";

 /* No comment provided by engineer. */
-"When people request to connect, you can accept or reject it." = "Csatlakozási kérelmek esetében, elfogadhatja vagy elutasíthatja azokat.";
+"When people request to connect, you can accept or reject it." = "Amikor az emberek kapcsolódást kérelmeznek, ön elfogadhatja vagy elutasíthatja azokat.";

 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Inkognitóprofil megosztása esetén a rendszer azt a profilt fogja használni azokhoz a csoportokhoz, amelyekbe meghívást kapott.";
@@ -4248,28 +4257,28 @@
 "You are already connected to %@." = "Már kapcsolódva van hozzá: %@.";

 /* No comment provided by engineer. */
-"You are already connecting to %@." = "Már folyamatban van a csatlakozás ehhez: %@.";
+"You are already connecting to %@." = "Már folyamatban van a kapcsolódás ehhez: %@.";

 /* No comment provided by engineer. */
-"You are already connecting via this one-time link!" = "Már csatlakozik ezen az egyszer használatos hivatkozáson keresztül!";
+"You are already connecting via this one-time link!" = "A kapcsolódás már folyamatban van ezen az egyszer használatos hivatkozáson keresztül!";

 /* No comment provided by engineer. */
 "You are already in group %@." = "Már a(z) %@ csoport tagja.";

 /* No comment provided by engineer. */
-"You are already joining the group %@." = "Már folyamatban van a csatlakozás a csoporthoz %@.";
+"You are already joining the group %@." = "A csatlakozás már folyamatban van a(z) %@ csoporthoz.";

 /* No comment provided by engineer. */
-"You are already joining the group via this link!" = "Már csatlakozott a csoporthoz ezen a hivatkozáson keresztül!";
+"You are already joining the group via this link!" = "A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül!";

 /* No comment provided by engineer. */
-"You are already joining the group via this link." = "Ezen a hivatkozáson keresztül már csatlakozik a csoporthoz.";
+"You are already joining the group via this link." = "A csatlakozás már folyamatban van a csoporthoz ezen a hivatkozáson keresztül.";

 /* No comment provided by engineer. */
 "You are already joining the group!\nRepeat join request?" = "Csatlakozás folyamatban!\nCsatlakozási kérés megismétlése?";

 /* No comment provided by engineer. */
-"You are connected to the server used to receive messages from this contact." = "Kiszolgálóhoz történő csatlakozás, mely az adott ismerőstől érkező üzenetek fogadására szolgál.";
+"You are connected to the server used to receive messages from this contact." = "Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.";

 /* No comment provided by engineer. */
 "you are invited to group" = "meghívást kapott a csoportba";
@@ -4314,10 +4323,10 @@
 "You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it." = "Megoszthat egy hivatkozást vagy QR-kódot - így bárki csatlakozhat a csoporthoz. Ha a csoport később törlésre kerül, akkor nem fogja elveszíteni annak tagjait.";

 /* No comment provided by engineer. */
-"You can share this address with your contacts to let them connect with **%@**." = "Megoszthatja ezt a hivatkozást ismerőseivel, hogy kapcsolatba léphessenek önnel a **%@** nevű profilján keresztül.";
+"You can share this address with your contacts to let them connect with **%@**." = "Megoszthatja ezt az azonosítót az ismerőseivel, hogy kapcsolatba léphessenek önnel a **%@** nevű profilján keresztül.";

 /* No comment provided by engineer. */
-"You can share your address as a link or QR code - anybody can connect to you." = "Megoszthatja azonosítóját hivatkozásként vagy QR-kódként – így bárki csatlakozhat önhöz.";
+"You can share your address as a link or QR code - anybody can connect to you." = "Megoszthatja azonosítóját hivatkozásként vagy QR-kódként – így bárki kapcsolódhat önhöz.";

 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "A csevegést az alkalmazás Beállítások / Adatbázis menü segítségével vagy az alkalmazás újraindításával indíthatja el";
@@ -4344,7 +4353,7 @@
 "you changed role for yourself to %@" = "saját szerepkör megváltoztatva erre: %@";

 /* snd group event chat item */
-"you changed role of %@ to %@" = "megváltoztatta %1$@ szerepkörét erre: %@";
+"you changed role of %@ to %@" = "%1$@ szerepkörét megváltoztatta erre: %@";

 /* No comment provided by engineer. */
 "You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Ön szabályozhatja, hogy mely kiszogál(ók)ón keresztül **kapja** az üzeneteket, az ismerősöket - az üzenetküldéshez használt szervereken.";
@@ -4353,10 +4362,10 @@
 "You could not be verified; please try again." = "Nem lehetett ellenőrizni; próbálja meg újra.";

 /* No comment provided by engineer. */
-"You have already requested connection via this address!" = "Már kért egy csatlakozást ezen az azonosítón keresztül!";
+"You have already requested connection via this address!" = "Már kért egy kapcsolódási kérelmet ezen az azonosítón keresztül!";

 /* No comment provided by engineer. */
-"You have already requested connection!\nRepeat connection request?" = "Már kérelmezte a csatlakozást!\nKapcsolódási kérés megismétlése?";
+"You have already requested connection!\nRepeat connection request?" = "Már kért egy kapcsolódási kérelmet!\nKapcsolódási kérés megismétlése?";

 /* No comment provided by engineer. */
 "You have no chats" = "Nincsenek csevegési üzenetek";
@@ -4401,22 +4410,22 @@
 "you unblocked %@" = "feloldotta %@ blokkolá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 tud csatlakozni a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";
+"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!";

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

 /* No comment provided by engineer. */
-"You will be connected when your connection request is accepted, please wait or check later!" = "Akkor lesz csatlakoztatva, ha a csatlakozási kérelme elfogadásra került, várjon, vagy ellenőrizze később!";
+"You will be connected when your connection request is accepted, please wait or check later!" = "Akkor lesz kapcsolódva, ha a kapcsolódási kérelme elfogadásra kerül, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
-"You will be connected when your contact's device is online, please wait or check later!" = "Akkor csatlakozik, amikor az ismerős eszköze online lesz, várjon, vagy ellenőrizze később!";
+"You will be connected when your contact's device is online, please wait or check later!" = "Akkor le kapcsolódva, amikor az ismerőse eszköze online lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
 "You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Az alkalmazás indításakor, vagy 30 másodpercnyi háttérben töltött idő után az alkalmazáshoz visszatérve hitelesítés szükséges.";

 /* No comment provided by engineer. */
-"You will connect to all group members." = "Csatlakozni fog a csoport összes tagjához.";
+"You will connect to all group members." = "Kapcsolódni fog a csoport összes tagjához.";

 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Továbbra is kap hívásokat és értesítéseket a némított profiloktól, ha azok aktívak.";
@@ -4425,7 +4434,7 @@
 "You will stop receiving messages from this group. Chat history will be preserved." = "Ettől a csoporttól nem fog értesítéseket kapni. A csevegési előzmények megmaradnak.";

 /* No comment provided by engineer. */
-"You won't lose your contacts if you later delete your address." = "Nem veszíti el ismerőseit, ha később törli az azonosítóját.";
+"You won't lose your contacts if you later delete your address." = "Nem veszíti el az ismerőseit, ha később törli az azonosítóját.";

 /* No comment provided by engineer. */
 "you: " = "ön: ";
@@ -4461,7 +4470,7 @@
 "Your contacts can allow full message deletion." = "Ismerősök engedélyezhetik a teljes üzenet törlést.";

 /* No comment provided by engineer. */
-"Your contacts will remain connected." = "Az ismerősök továbbra is csatlakoztatva maradnak.";
+"Your contacts will remain connected." = "Az ismerősei továbbra is kapcsolódva maradnak.";

 /* No comment provided by engineer. */
 "Your current chat database will be DELETED and REPLACED with the imported one." = "A jelenlegi csevegési adatbázis TÖRLŐDNI FOG, és a HELYÉRE az importált adatbázis kerül.";
@@ -2,7 +2,7 @@
 "CFBundleName" = "SimpleX";

 /* Privacy - Camera Usage Description */
-"NSCameraUsageDescription" = "A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy csatlakozhasson más felhasználókhoz és videohívásokhoz.";
+"NSCameraUsageDescription" = "A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.";

 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "A SimpleX Face ID-t használ a helyi hitelesítéshez";
@@ -1893,6 +1893,9 @@
 /* chat item action */
 "Forward" = "Inoltra";

+/* No comment provided by engineer. */
+"Forward and save messages" = "Inoltra e salva i messaggi";
+
 /* No comment provided by engineer. */
 "forwarded" = "inoltrato";

@@ -2124,6 +2127,9 @@
 /* No comment provided by engineer. */
 "In reply to" = "In risposta a";

+/* No comment provided by engineer. */
+"In-call sounds" = "Suoni nelle chiamate";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incognito";

@@ -2469,6 +2475,9 @@
 /* notification */
 "message received" = "messaggio ricevuto";

+/* No comment provided by engineer. */
+"Message source remains private." = "La fonte del messaggio resta privata.";
+
 /* No comment provided by engineer. */
 "Message text" = "Testo del messaggio";

@@ -2553,6 +2562,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Altri miglioramenti sono in arrivo!";

+/* No comment provided by engineer. */
+"More reliable network connection." = "Connessione di rete più affidabile.";
+
 /* item status description */
 "Most likely this connection is deleted." = "Probabilmente questa connessione è stata eliminata.";

@@ -2577,6 +2589,9 @@
 /* No comment provided by engineer. */
 "Network connection" = "Connessione di rete";

+/* No comment provided by engineer. */
+"Network management" = "Gestione della rete";
+
 /* No comment provided by engineer. */
 "Network settings" = "Impostazioni di rete";

@@ -2945,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Immagine del profilo";

+/* No comment provided by engineer. */
+"Profile images" = "Immagini del profilo";
+
 /* No comment provided by engineer. */
 "Profile name" = "Nome del profilo";

@@ -3488,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Impostazioni";

+/* No comment provided by engineer. */
+"Shape profile images" = "Forma delle immagini del profilo";
+
 /* chat item action */
 "Share" = "Condividi";

@@ -3590,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Qualcuno";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Quadrata, circolare o qualsiasi forma tra le due.";
+
 /* chat item text */
 "standard end-to-end encryption" = "crittografia end-to-end standard";

@@ -4172,6 +4196,9 @@
 /* No comment provided by engineer. */
 "When available" = "Quando disponibili";

+/* No comment provided by engineer. */
+"When connecting audio and video calls." = "Quando si connettono le chiamate audio e video.";
+
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Quando le persone chiedono di connettersi, puoi accettare o rifiutare.";

@@ -4181,6 +4208,9 @@
 /* No comment provided by engineer. */
 "WiFi" = "WiFi";

+/* No comment provided by engineer. */
+"Will be enabled in direct chats!" = "Viene attivata nelle chat dirette!";
+
 /* No comment provided by engineer. */
 "Wired ethernet" = "Cavo ethernet";

@@ -68,10 +68,10 @@
 "**Create group**: to create a new group." = "**グループ作成**: 新しいグループを作成する。";

 /* No comment provided by engineer. */
-"**e2e encrypted** audio call" = "**e2e 暗号化**音声通話";
+"**e2e encrypted** audio call" = "**エンドツーエンド暗号化済み**の音声通話";

 /* No comment provided by engineer. */
-"**e2e encrypted** video call" = "**e2e暗号化**ビデオ通話";
+"**e2e encrypted** video call" = "**エンドツーエンド暗号化済み**の テレビ電話 通話";

 /* No comment provided by engineer. */
 "**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." = "**よりプライベート**: 20 分ごとに新しいメッセージを確認します。 デバイス トークンは SimpleX Chat サーバーと共有されますが、連絡先やメッセージの数は共有されません。";
@@ -265,6 +265,9 @@
 /* No comment provided by engineer. */
 "~strike~" = "\\~取り消し線~";

+/* time to disappear */
+"0 sec" = "0 秒";
+
 /* No comment provided by engineer. */
 "0s" = "0秒";

@@ -410,6 +413,9 @@
 /* No comment provided by engineer. */
 "All your contacts will remain connected. Profile update will be sent to your contacts." = "すべての連絡先は維持されます。連絡先に更新されたプロフィールを送信します。";

+/* No comment provided by engineer. */
+"All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "すべての連絡先、会話、ファイルは安全に暗号化され、設定されたXFTPリレーに分割でアップロードされます。";
+
 /* No comment provided by engineer. */
 "Allow" = "許可";

@@ -440,6 +446,9 @@
 /* No comment provided by engineer. */
 "Allow to send files and media." = "ファイルやメディアの送信を許可する。";

+/* No comment provided by engineer. */
+"Allow to send SimpleX links." = "SimpleXリンクの送信を許可。";
+
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "音声メッセージの送信を許可する。";

@@ -467,6 +476,12 @@
 /* No comment provided by engineer. */
 "Already connected?" = "すでに接続済みですか？";

+/* No comment provided by engineer. */
+"Already connecting!" = "既に接続中です！";
+
+/* No comment provided by engineer. */
+"Already joining the group!" = "すでにグループに参加しています！";
+
 /* pref value */
 "always" = "常に";

@@ -482,6 +497,9 @@
 /* No comment provided by engineer. */
 "App build: %@" = "アプリのビルド: %@";

+/* No comment provided by engineer. */
+"App data migration" = "アプリデータの移行";
+
 /* No comment provided by engineer. */
 "App encrypts new local files (except videos)." = "アプリは新しいローカルファイル（ビデオを除く）を暗号化します。";

@@ -2960,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "profielfoto";

+/* No comment provided by engineer. */
+"Profile images" = "Profiel afbeeldingen";
+
 /* No comment provided by engineer. */
 "Profile name" = "Profielnaam";

@@ -3503,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Instellingen";

+/* No comment provided by engineer. */
+"Shape profile images" = "Vorm profiel afbeeldingen";
+
 /* chat item action */
 "Share" = "Deel";

@@ -3605,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Iemand";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Vierkant, cirkel of iets daartussenin.";
+
 /* chat item text */
 "standard end-to-end encryption" = "standaard end-to-end encryptie";

@@ -389,6 +389,9 @@
 /* member role */
 "admin" = "administrator";

+/* feature role */
+"admins" = "administratorzy";
+
 /* No comment provided by engineer. */
 "Admins can block a member for all." = "Administratorzy mogą blokować członka dla wszystkich.";

@@ -416,6 +419,9 @@
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Wszyscy członkowie grupy pozostaną połączeni.";

+/* feature role */
+"all members" = "wszyscy członkowie";
+
 /* No comment provided by engineer. */
 "All messages will be deleted - this cannot be undone!" = "Wszystkie wiadomości zostaną usunięte – nie można tego cofnąć!";

@@ -464,6 +470,9 @@
 /* No comment provided by engineer. */
 "Allow to send files and media." = "Pozwól na wysyłanie plików i mediów.";

+/* No comment provided by engineer. */
+"Allow to send SimpleX links." = "Zezwól na wysyłanie linków SimpleX.";
+
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "Zezwól na wysyłanie wiadomości głosowych.";

@@ -707,6 +716,9 @@
 /* No comment provided by engineer. */
 "Cannot receive file" = "Nie można odebrać pliku";

+/* No comment provided by engineer. */
+"Cellular" = "Sieć komórkowa";
+
 /* No comment provided by engineer. */
 "Change" = "Zmień";

@@ -1401,6 +1413,9 @@
 /* No comment provided by engineer. */
 "Downgrade and open chat" = "Obniż wersję i otwórz czat";

+/* chat item action */
+"Download" = "Pobierz";
+
 /* No comment provided by engineer. */
 "Download failed" = "Pobieranie nie udane";

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

+/* No comment provided by engineer. */
+"Enabled for" = "Włączony dla";
+
 /* enabled status */
 "enabled for contact" = "włączone dla kontaktu";

@@ -1830,6 +1848,9 @@
 /* No comment provided by engineer. */
 "Files and media are prohibited in this group." = "Pliki i media są zabronione w tej grupie.";

+/* No comment provided by engineer. */
+"Files and media not allowed" = "Pliki i multimedia nie są dozwolone";
+
 /* No comment provided by engineer. */
 "Files and media prohibited!" = "Pliki i media zabronione!";

@@ -1869,6 +1890,21 @@
 /* No comment provided by engineer. */
 "For console" = "Dla konsoli";

+/* chat item action */
+"Forward" = "Przekaż dalej";
+
+/* No comment provided by engineer. */
+"Forward and save messages" = "Przesyłaj dalej i zapisuj wiadomości";
+
+/* No comment provided by engineer. */
+"forwarded" = "przekazane dalej";
+
+/* No comment provided by engineer. */
+"Forwarded" = "Przekazane dalej";
+
+/* No comment provided by engineer. */
+"Forwarded from" = "Przekazane dalej od";
+
 /* No comment provided by engineer. */
 "Found desktop" = "Znaleziono komputer";

@@ -1947,6 +1983,9 @@
 /* No comment provided by engineer. */
 "Group members can send files and media." = "Członkowie grupy mogą wysyłać pliki i media.";

+/* No comment provided by engineer. */
+"Group members can send SimpleX links." = "Członkowie grupy mogą wysyłać linki SimpleX.";
+
 /* No comment provided by engineer. */
 "Group members can send voice messages." = "Członkowie grupy mogą wysyłać wiadomości głosowe.";

@@ -2088,6 +2127,9 @@
 /* No comment provided by engineer. */
 "In reply to" = "W odpowiedzi na";

+/* No comment provided by engineer. */
+"In-call sounds" = "Dźwięki w rozmowie";
+
 /* No comment provided by engineer. */
 "Incognito" = "Incognito";

@@ -2433,6 +2475,9 @@
 /* notification */
 "message received" = "wiadomość otrzymana";

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

@@ -2517,6 +2562,9 @@
 /* No comment provided by engineer. */
 "More improvements are coming soon!" = "Więcej ulepszeń już wkrótce!";

+/* No comment provided by engineer. */
+"More reliable network connection." = "Bardziej niezawodne połączenia sieciowe.";
+
 /* item status description */
 "Most likely this connection is deleted." = "Najprawdopodobniej to połączenie jest usunięte.";

@@ -2538,6 +2586,12 @@
 /* No comment provided by engineer. */
 "Network & servers" = "Sieć i serwery";

+/* No comment provided by engineer. */
+"Network connection" = "Połączenie z siecią";
+
+/* No comment provided by engineer. */
+"Network management" = "Zarządzenie sieciowe";
+
 /* No comment provided by engineer. */
 "Network settings" = "Ustawienia sieci";

@@ -2616,6 +2670,9 @@
 /* No comment provided by engineer. */
 "No history" = "Brak historii";

+/* No comment provided by engineer. */
+"No network connection" = "Brak połączenia z siecią";
+
 /* No comment provided by engineer. */
 "No permission to record voice message" = "Brak uprawnień do nagrywania wiadomości głosowej";

@@ -2762,9 +2819,15 @@
 /* No comment provided by engineer. */
 "Or show this code" = "Lub pokaż ten kod";

+/* No comment provided by engineer. */
+"Other" = "Inne";
+
 /* member role */
 "owner" = "właściciel";

+/* feature role */
+"owners" = "właściciele";
+
 /* No comment provided by engineer. */
 "Passcode" = "Pin";

@@ -2897,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Zdjęcie profilowe";

+/* No comment provided by engineer. */
+"Profile images" = "Zdjęcia profilowe";
+
 /* No comment provided by engineer. */
 "Profile name" = "Nazwa profilu";

@@ -2930,6 +2996,9 @@
 /* No comment provided by engineer. */
 "Prohibit sending files and media." = "Zakaz wysyłania plików i mediów.";

+/* No comment provided by engineer. */
+"Prohibit sending SimpleX links." = "Zabroń wysyłania linków SimpleX.";
+
 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "Zabroń wysyłania wiadomości głosowych.";

@@ -3008,6 +3077,9 @@
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "Adres odbiorczy zostanie zmieniony na inny serwer. Zmiana adresu zostanie zakończona gdy nadawca będzie online.";

+/* No comment provided by engineer. */
+"Receiving concurrency" = "Konkurencyjne odbieranie";
+
 /* No comment provided by engineer. */
 "Receiving file will be stopped." = "Odbieranie pliku zostanie przerwane.";

@@ -3017,6 +3089,9 @@
 /* No comment provided by engineer. */
 "Recent history and improved [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)." = "Ostania historia i ulepszony [bot adresowy](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).";

+/* No comment provided by engineer. */
+"Recipient(s) can't see who this message is from." = "Odbiorca/y nie mogą zobaczyć od kogo jest ta wiadomość.";
+
 /* No comment provided by engineer. */
 "Recipients see updates as you type them." = "Odbiorcy widzą aktualizacje podczas ich wpisywania.";

@@ -3212,6 +3287,18 @@
 /* No comment provided by engineer. */
 "Save welcome message?" = "Zapisać wiadomość powitalną?";

+/* No comment provided by engineer. */
+"saved" = "zapisane";
+
+/* No comment provided by engineer. */
+"Saved" = "Zapisane";
+
+/* No comment provided by engineer. */
+"Saved from" = "Zapisane od";
+
+/* No comment provided by engineer. */
+"saved from %@" = "zapisane od %@";
+
 /* message info title */
 "Saved message" = "Zachowano wiadomość";

@@ -3419,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Ustawienia";

+/* No comment provided by engineer. */
+"Shape profile images" = "Kształtuj obrazy profilowe";
+
 /* chat item action */
 "Share" = "Udostępnij";

@@ -3479,6 +3569,12 @@
 /* chat feature */
 "SimpleX links" = "Linki SimpleX";

+/* No comment provided by engineer. */
+"SimpleX links are prohibited in this group." = "Linki SimpleX są zablokowane na tej grupie.";
+
+/* No comment provided by engineer. */
+"SimpleX links not allowed" = "Linki SimpleX są niedozwolone";
+
 /* No comment provided by engineer. */
 "SimpleX Lock" = "Blokada SimpleX";

@@ -3515,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Ktoś";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Kwadrat, okrąg lub cokolwiek pomiędzy.";
+
 /* chat item text */
 "standard end-to-end encryption" = "standardowe szyfrowanie end-to-end";

@@ -4043,6 +4142,9 @@
 /* No comment provided by engineer. */
 "Voice messages are prohibited in this group." = "Wiadomości głosowe są zabronione w tej grupie.";

+/* No comment provided by engineer. */
+"Voice messages not allowed" = "Wiadomości głosowe są niedozwolone";
+
 /* No comment provided by engineer. */
 "Voice messages prohibited!" = "Wiadomości głosowe zabronione!";

@@ -4094,12 +4196,24 @@
 /* No comment provided by engineer. */
 "When available" = "Gdy dostępny";

+/* No comment provided by engineer. */
+"When connecting audio and video calls." = "Podczas łączenia połączeń audio i wideo.";
+
 /* No comment provided by engineer. */
 "When people request to connect, you can accept or reject it." = "Kiedy ludzie proszą o połączenie, możesz je zaakceptować lub odrzucić.";

 /* No comment provided by engineer. */
 "When you share an incognito profile with somebody, this profile will be used for the groups they invite you to." = "Gdy udostępnisz komuś profil incognito, będzie on używany w grupach, do których Cię zaprosi.";

+/* No comment provided by engineer. */
+"WiFi" = "WiFi";
+
+/* No comment provided by engineer. */
+"Will be enabled in direct chats!" = "Zostanie włączone w czatach bezpośrednich!";
+
+/* No comment provided by engineer. */
+"Wired ethernet" = "Połączenie ethernet (po kablu)";
+
 /* No comment provided by engineer. */
 "With encrypted files and media." = "Z zaszyfrowanymi plikami i multimediami.";

@@ -4121,6 +4235,9 @@
 /* pref value */
 "yes" = "tak";

+/* No comment provided by engineer. */
+"you" = "Ty";
+
 /* No comment provided by engineer. */
 "You" = "Ty";

@@ -2960,6 +2960,9 @@
 /* No comment provided by engineer. */
 "Profile image" = "Profil fotoğrafı";

+/* No comment provided by engineer. */
+"Profile images" = "Profil resimleri";
+
 /* No comment provided by engineer. */
 "Profile name" = "Profil ismi";

@@ -3051,7 +3054,7 @@
 "Read more in our GitHub repository." = "Daha fazlasını GitHub depomuzdan oku.";

 /* No comment provided by engineer. */
-"Receipts are disabled" = "Makbuzlar devre dışı bırakıldı";
+"Receipts are disabled" = "Gönderildi bilgisi devre dışı bırakıldı";

 /* No comment provided by engineer. */
 "received answer…" = "alınan cevap…";
@@ -3417,7 +3420,7 @@
 "Sending delivery receipts will be enabled for all contacts in all visible chat profiles." = "Görüldü bilgisi, tüm görünür sohbet profillerindeki tüm kişiler için etkinleştirilecektir.";

 /* No comment provided by engineer. */
-"Sending delivery receipts will be enabled for all contacts." = "Teslimat makbuzlarının gönderilmesi tüm kişiler için etkinleştirilecektir.";
+"Sending delivery receipts will be enabled for all contacts." = "Gönderildi bilgisi tüm kişiler için etkinleştirilecektir.";

 /* No comment provided by engineer. */
 "Sending file will be stopped." = "Dosya gönderimi durdurulacaktır.";
@@ -3503,6 +3506,9 @@
 /* No comment provided by engineer. */
 "Settings" = "Ayarlar";

+/* No comment provided by engineer. */
+"Shape profile images" = "Profil resimlerini şekillendir";
+
 /* chat item action */
 "Share" = "Paylaş";

@@ -3605,6 +3611,9 @@
 /* notification title */
 "Somebody" = "Biri";

+/* No comment provided by engineer. */
+"Square, circle, or anything in between." = "Kare,daire, veya aralarında herhangi bir şey.";
+
 /* chat item text */
 "standard end-to-end encryption" = "standart uçtan uca şifreleme";

@@ -13,7 +13,7 @@ android {
    defaultConfig {
        applicationId = "chat.simplex.app"
        namespace = "chat.simplex.app"
-        minSdk = 28
+        minSdk = 26
        //noinspection OldTargetApi
        targetSdk = 33
        // !!!
@@ -7,7 +7,7 @@ import chat.simplex.app.SimplexService.Companion.showPassphraseNotification
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.views.helpers.DBMigrationResult
 import chat.simplex.common.platform.chatModel
-import chat.simplex.common.platform.initChatControllerAndRunMigrations
+import chat.simplex.common.platform.initChatControllerOnStart
 import chat.simplex.common.views.helpers.DatabaseUtils
 import kotlinx.coroutines.*
 import java.util.Date
@@ -60,7 +60,7 @@ class MessagesFetcherWork(
    try {
      // In case of self-destruct is enabled the initialization process will not start in SimplexApp, Let's start it here
      if (DatabaseUtils.ksSelfDestructPassword.get() != null && chatModel.chatDbStatus.value == null) {
-        initChatControllerAndRunMigrations()
+        initChatControllerOnStart()
      }
      withTimeout(durationSeconds * 1000L) {
        val chatController = ChatController
@@ -6,7 +6,6 @@ import android.content.Context
 import chat.simplex.common.platform.Log
 import android.content.Intent
 import android.content.pm.ActivityInfo
-import android.media.AudioManager
 import android.os.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -66,6 +65,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
    context = this
    initHaskell()
    initMultiplatform()
+    runMigrations()
    tmpDir.deleteRecursively()
    tmpDir.mkdir()

@@ -74,7 +74,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
      // It's important, otherwise, user may be locked in undefined state
      appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
    } else if (DatabaseUtils.ksAppPassword.get() == null || DatabaseUtils.ksSelfDestructPassword.get() == null) {
-      initChatControllerAndRunMigrations()
+      initChatControllerOnStart()
    }
    ProcessLifecycleOwner.get().lifecycle.addObserver(this@SimplexApp)
  }
@@ -254,7 +254,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
      override fun androidSetNightModeIfSupported() {
        if (Build.VERSION.SDK_INT < 31) return

-        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM.name) {
+        val light = if (CurrentColors.value.name == DefaultTheme.SYSTEM_THEME_NAME) {
          null
        } else {
          CurrentColors.value.colors.isLight
@@ -77,7 +77,7 @@ class SimplexService: Service() {
      isServiceStarted = true
      // In case of self-destruct is enabled the initialization process will not start in SimplexApp, Let's start it here
      if (DatabaseUtils.ksSelfDestructPassword.get() != null && chatModel.chatDbStatus.value == null) {
-        initChatControllerAndRunMigrations()
+        initChatControllerOnStart()
      }
    }
  }
@@ -53,6 +53,9 @@ kotlin {
    val commonTest by getting {
      dependencies {
        implementation(kotlin("test"))
+        implementation(kotlin("test-junit"))
+        implementation(kotlin("test-common"))
+        implementation(kotlin("test-annotations-common"))
      }
    }
    val androidMain by getting {
@@ -113,7 +116,7 @@ android {
  compileSdk = 34
  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
  defaultConfig {
-    minSdk = 28
+    minSdk = 26
  }
  testOptions.targetSdk = 33
  lint.targetSdk = 33
@@ -15,8 +15,10 @@ actual val dataDir: File = androidAppContext.dataDir
 actual val tmpDir: File = androidAppContext.getDir("temp", Application.MODE_PRIVATE)
 actual val filesDir: File = File(dataDir.absolutePath + File.separator + "files")
 actual val appFilesDir: File = File(filesDir.absolutePath + File.separator + "app_files")
+actual val wallpapersDir: File = File(filesDir.absolutePath + File.separator + "assets" + File.separator + "wallpapers").also { it.mkdirs() }
 actual val coreTmpDir: File = File(filesDir.absolutePath + File.separator + "temp_files")
 actual val dbAbsolutePrefixPath: String = dataDir.absolutePath + File.separator + "files"
+actual val preferencesDir = File(dataDir.absolutePath + File.separator + "shared_prefs")

 actual val chatDatabaseFileName: String = "files_chat.db"
 actual val agentDatabaseFileName: String = "files_agent.db"
@@ -7,6 +7,8 @@ import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.text.BidiFormatter
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.Font
@@ -14,9 +16,11 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.core.graphics.drawable.toBitmap
 import chat.simplex.common.model.AppPreferences
 import com.russhwolf.settings.Settings
 import com.russhwolf.settings.SharedPreferencesSettings
+import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.desc

@@ -51,3 +55,6 @@ actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
 actual fun desktopExpandWindowToWidth(width: Dp) {}

 actual fun isRtl(text: CharSequence): Boolean = BidiFormatter.getInstance().isRtl(text)
+
+actual fun ImageResource.toComposeImageBitmap(): ImageBitmap? =
+  getDrawable(androidAppContext)?.toBitmap()?.asImageBitmap()
@@ -37,7 +37,7 @@ actual fun ClipboardManager.shareText(text: String) {
  }
 }

-actual fun shareFile(text: String, fileSource: CryptoFile) {
+fun openOrShareFile(text: String, fileSource: CryptoFile, justOpen: Boolean) {
  val uri = if (fileSource.cryptoArgs != null) {
    val tmpFile = File(tmpDir, fileSource.filePath)
    tmpFile.deleteOnExit()
@@ -55,20 +55,31 @@ actual fun shareFile(text: String, fileSource: CryptoFile) {
  }
  val ext = fileSource.filePath.substringAfterLast(".")
  val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext) ?: return
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
+  val sendIntent: Intent = Intent(if (justOpen) Intent.ACTION_VIEW else Intent.ACTION_SEND).apply {
    /*if (text.isNotEmpty()) {
      putExtra(Intent.EXTRA_TEXT, text)
    }*/
-    putExtra(Intent.EXTRA_STREAM, uri.toUri())
-    type = mimeType
-    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    if (justOpen) {
+      flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+      setDataAndType(uri.toUri(), mimeType)
+    } else {
+      putExtra(Intent.EXTRA_STREAM, uri.toUri())
+      type = mimeType
+    }
  }
  val shareIntent = Intent.createChooser(sendIntent, null)
  shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
  androidAppContext.startActivity(shareIntent)
 }

+actual fun shareFile(text: String, fileSource: CryptoFile) {
+  openOrShareFile(text, fileSource, justOpen = false)
+}
+
+actual fun openFile(fileSource: CryptoFile) {
+  openOrShareFile("", fileSource, justOpen = true)
+}
+
 actual fun UriHandler.sendEmail(subject: String, body: CharSequence) {
  val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
  emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
@@ -19,14 +19,10 @@ 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.*
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import chat.simplex.common.R
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -34,7 +30,6 @@ import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.saveAppLocale
-import chat.simplex.common.views.usersettings.AppearanceScope.ColorEditor
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.painterResource
@@ -46,9 +41,8 @@ enum class AppIcon(val image: ImageResource) {
 }

@Composable
-actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)) {
+actual fun AppearanceView(m: ChatModel) {
  val appIcon = remember { mutableStateOf(findEnabledIcon()) }
-
  fun setAppIcon(newIcon: AppIcon) {
    if (appIcon.value == newIcon) return
    val newComponent = ComponentName(APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
@@ -65,18 +59,11 @@ actual fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatMod

    appIcon.value = newIcon
  }
-
  AppearanceScope.AppearanceLayout(
    appIcon,
    m.controller.appPrefs.appLanguage,
    m.controller.appPrefs.systemDarkTheme,
    changeIcon = ::setAppIcon,
-    showSettingsModal = showSettingsModal,
-    editColor = { name, initialColor ->
-      ModalManager.start.showModalCloseable { close ->
-        ColorEditor(name, initialColor, close)
-      }
-    },
  )
 }

@@ -86,8 +73,6 @@ fun AppearanceScope.AppearanceLayout(
  languagePref: SharedPreference<String?>,
  systemDarkTheme: SharedPreference<String?>,
  changeIcon: (AppIcon) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  editColor: (ThemeColor, Color) -> Unit,
 ) {
  ColumnWithScrollBar(
    Modifier.fillMaxWidth(),
@@ -120,6 +105,13 @@ fun AppearanceScope.AppearanceLayout(
      }
      //      }
    }
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ThemesSection(systemDarkTheme)
+
+    SectionDividerSpaced(maxTopPadding = true)
+    ProfileImageSection()
+
    SectionDividerSpaced()

    SectionView(stringResource(MR.strings.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
@@ -145,11 +137,6 @@ fun AppearanceScope.AppearanceLayout(
      }
    }

-    SectionDividerSpaced(maxTopPadding = true)
-    ProfileImageSection()
-
-    SectionDividerSpaced(maxTopPadding = true)
-    ThemesSection(systemDarkTheme, showSettingsModal, editColor)
    SectionBottomSpacer()
  }
 }
@@ -169,8 +156,6 @@ fun PreviewAppearanceSettings() {
      languagePref = SharedPreference({ null }, {}),
      systemDarkTheme = SharedPreference({ null }, {}),
      changeIcon = {},
-      showSettingsModal = { {} },
-      editColor = { _, _ -> },
    )
  }
 }
@@ -4,7 +4,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.*
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
@@ -399,6 +399,18 @@ object ChatModel {
    currentUser.value = updated
  }

+  fun updateCurrentUserUiThemes(rhId: Long?, uiThemes: ThemeModeOverrides?) {
+    val current = currentUser.value ?: return
+    val updated = current.copy(
+      uiThemes = uiThemes
+    )
+    val i = users.indexOfFirst { it.user.userId == current.userId && it.user.remoteHostId == rhId }
+    if (i != -1) {
+      users[i] = users[i].copy(user = updated)
+    }
+    currentUser.value = updated
+  }
+
  suspend fun addLiveDummy(chatInfo: ChatInfo): ChatItem {
    val cItem = ChatItem.liveDummy(chatInfo is ChatInfo.Direct)
    withContext(Dispatchers.Main) {
@@ -682,7 +694,8 @@ data class User(
  override val showNtfs: Boolean,
  val sendRcptsContacts: Boolean,
  val sendRcptsSmallGroups: Boolean,
-  val viewPwdHash: UserPwdHash?
+  val viewPwdHash: UserPwdHash?,
+  val uiThemes: ThemeModeOverrides? = null,
 ): NamedChat, UserLike {
  override val displayName: String get() = profile.displayName
  override val fullName: String get() = profile.fullName
@@ -709,6 +722,7 @@ data class User(
      sendRcptsContacts = true,
      sendRcptsSmallGroups = false,
      viewPwdHash = null,
+      uiThemes = null,
    )
  }
 }
@@ -1041,16 +1055,21 @@ data class Contact(
  override val updatedAt: Instant,
  val chatTs: Instant?,
  val contactGroupMemberId: Long? = null,
-  val contactGrpInvSent: Boolean
+  val contactGrpInvSent: Boolean,
+  val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Direct
  override val id get() = "@$contactId"
  override val apiId get() = contactId
  override val ready get() = activeConn?.connStatus == ConnStatus.Ready
  val active get() = contactStatus == ContactStatus.Active
-  override val sendMsgEnabled get() =
-    (ready && active && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?: false))
-        || nextSendGrpInv
+  override val sendMsgEnabled get() = (
+      ready
+          && active
+          && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?: false)
+          && !(activeConn?.connDisabled ?: true)
+      )
+      || nextSendGrpInv
  val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
  override val incognito get() = contactConnIncognito
@@ -1109,7 +1128,8 @@ data class Contact(
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now(),
      chatTs = Clock.System.now(),
-      contactGrpInvSent = false
+      contactGrpInvSent = false,
+      uiThemes = null,
    )
  }
 }
@@ -1150,15 +1170,19 @@ data class Connection(
  val pqEncryption: Boolean,
  val pqSndEnabled: Boolean? = null,
  val pqRcvEnabled: Boolean? = null,
-  val connectionStats: ConnectionStats? = null
+  val connectionStats: ConnectionStats? = null,
+  val authErrCounter: Int
 ) {
  val id: ChatId get() = ":$connId"

+  val connDisabled: Boolean
+    get() = authErrCounter >= 10 // authErrDisableCount in core
+
  val connPQEnabled: Boolean
    get() = pqSndEnabled == true && pqRcvEnabled == true

  companion object {
-    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null, pqSupport = false, pqEncryption = false)
+    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null, pqSupport = false, pqEncryption = false, authErrCounter = 0)
  }
 }

@@ -1245,7 +1269,8 @@ data class GroupInfo (
  val chatSettings: ChatSettings,
  override val createdAt: Instant,
  override val updatedAt: Instant,
-  val chatTs: Instant?
+  val chatTs: Instant?,
+  val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Group
  override val id get() = "#$groupId"
@@ -1287,7 +1312,8 @@ data class GroupInfo (
      chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now(),
-      chatTs = Clock.System.now()
+      chatTs = Clock.System.now(),
+      uiThemes = null,
    )
  }
 }
@@ -1900,18 +1926,20 @@ data class ChatItem (
      ts: Instant = Clock.System.now(),
      text: String = "hello\nthere",
      status: CIStatus = CIStatus.SndNew(),
+      sentViaProxy: Boolean? = null,
      quotedItem: CIQuote? = null,
      file: CIFile? = null,
      itemForwarded: CIForwardedFrom? = null,
      itemDeleted: CIDeleted? = null,
      itemEdited: Boolean = false,
      itemTimed: CITimed? = null,
+      itemLive: Boolean = false,
      deletable: Boolean = true,
      editable: Boolean = true
    ) =
      ChatItem(
        chatDir = dir,
-        meta = CIMeta.getSample(id, ts, text, status, itemForwarded, itemDeleted, itemEdited, itemTimed, deletable, editable),
+        meta = CIMeta.getSample(id, ts, text, status, sentViaProxy, itemForwarded, itemDeleted, itemEdited, itemTimed, itemLive, deletable, editable),
        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
        quotedItem = quotedItem,
        reactions = listOf(),
@@ -1993,6 +2021,7 @@ data class ChatItem (
          itemTs = Clock.System.now(),
          itemText = generalGetString(MR.strings.deleted_description),
          itemStatus = CIStatus.RcvRead(),
+          sentViaProxy = null,
          createdAt = Clock.System.now(),
          updatedAt = Clock.System.now(),
          itemForwarded = null,
@@ -2016,6 +2045,7 @@ data class ChatItem (
          itemTs = Clock.System.now(),
          itemText = "",
          itemStatus = CIStatus.RcvRead(),
+          sentViaProxy = null,
          createdAt = Clock.System.now(),
          updatedAt = Clock.System.now(),
          itemForwarded = null,
@@ -2118,6 +2148,7 @@ data class CIMeta (
  val itemTs: Instant,
  val itemText: String,
  val itemStatus: CIStatus,
+  val sentViaProxy: Boolean?,
  val createdAt: Instant,
  val updatedAt: Instant,
  val itemForwarded: CIForwardedFrom?,
@@ -2144,7 +2175,7 @@ data class CIMeta (

  companion object {
    fun getSample(
-      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(),
+      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(), sentViaProxy: Boolean? = null,
      itemForwarded: CIForwardedFrom? = null, itemDeleted: CIDeleted? = null, itemEdited: Boolean = false,
      itemTimed: CITimed? = null, itemLive: Boolean = false, deletable: Boolean = true, editable: Boolean = true
    ): CIMeta =
@@ -2153,6 +2184,7 @@ data class CIMeta (
        itemTs = ts,
        itemText = text,
        itemStatus = status,
+        sentViaProxy = sentViaProxy,
        createdAt = ts,
        updatedAt = ts,
        itemForwarded = itemForwarded,
@@ -2171,6 +2203,7 @@ data class CIMeta (
        itemTs = Clock.System.now(),
        itemText = "invalid JSON",
        itemStatus = CIStatus.SndNew(),
+        sentViaProxy = null,
        createdAt = Clock.System.now(),
        updatedAt = Clock.System.now(),
        itemForwarded = null,
@@ -2227,7 +2260,8 @@ sealed class CIStatus {
  @Serializable @SerialName("sndSent") class SndSent(val sndProgress: SndCIStatusProgress): CIStatus()
  @Serializable @SerialName("sndRcvd") class SndRcvd(val msgRcptStatus: MsgReceiptStatus, val sndProgress: SndCIStatusProgress): CIStatus()
  @Serializable @SerialName("sndErrorAuth") class SndErrorAuth: CIStatus()
-  @Serializable @SerialName("sndError") class SndError(val agentError: String): CIStatus()
+  @Serializable @SerialName("sndError") class CISSndError(val agentError: SndError): CIStatus()
+  @Serializable @SerialName("sndWarning") class SndWarning(val agentError: SndError): CIStatus()
  @Serializable @SerialName("rcvNew") class RcvNew: CIStatus()
  @Serializable @SerialName("rcvRead") class RcvRead: CIStatus()
  @Serializable @SerialName("invalid") class Invalid(val text: String): CIStatus()
@@ -2251,7 +2285,8 @@ sealed class CIStatus {
        MsgReceiptStatus.BadMsgHash -> MR.images.ic_double_check to Color.Red
      }
      is SndErrorAuth -> MR.images.ic_close to Color.Red
-      is SndError -> MR.images.ic_warning_filled to WarningYellow
+      is CISSndError -> MR.images.ic_close to Color.Red
+      is SndWarning -> MR.images.ic_warning_filled to WarningOrange
      is RcvNew -> MR.images.ic_circle_filled to primaryColor
      is RcvRead -> null
      is CIStatus.Invalid -> MR.images.ic_question_mark to metaColor
@@ -2262,13 +2297,48 @@ sealed class CIStatus {
    is SndSent -> null
    is SndRcvd -> null
    is SndErrorAuth -> generalGetString(MR.strings.message_delivery_error_title) to generalGetString(MR.strings.message_delivery_error_desc)
-    is SndError -> generalGetString(MR.strings.message_delivery_error_title) to (generalGetString(MR.strings.unknown_error) + ": $agentError")
+    is CISSndError -> generalGetString(MR.strings.message_delivery_error_title) to agentError.errorInfo
+    is SndWarning -> generalGetString(MR.strings.message_delivery_warning_title) to agentError.errorInfo
    is RcvNew -> null
    is RcvRead -> null
    is Invalid -> "Invalid status" to this.text
  }
 }

+@Serializable
+sealed class SndError {
+  @Serializable @SerialName("auth") class Auth: SndError()
+  @Serializable @SerialName("quota") class Quota: SndError()
+  @Serializable @SerialName("expired") class Expired: SndError()
+  @Serializable @SerialName("relay") class Relay(val srvError: SrvError): SndError()
+  @Serializable @SerialName("proxy") class Proxy(val proxyServer: String, val srvError: SrvError): SndError()
+  @Serializable @SerialName("proxyRelay") class ProxyRelay(val proxyServer: String, val srvError: SrvError): SndError()
+  @Serializable @SerialName("other") class Other(val sndError: String): SndError()
+
+  val errorInfo: String get() = when (this) {
+    is SndError.Auth -> generalGetString(MR.strings.snd_error_auth)
+    is SndError.Quota -> generalGetString(MR.strings.snd_error_quota)
+    is SndError.Expired -> generalGetString(MR.strings.snd_error_expired)
+    is SndError.Relay -> generalGetString(MR.strings.snd_error_relay).format(srvError.errorInfo)
+    is SndError.Proxy -> generalGetString(MR.strings.snd_error_proxy).format(proxyServer, srvError.errorInfo)
+    is SndError.ProxyRelay -> generalGetString(MR.strings.snd_error_proxy_relay).format(proxyServer, srvError.errorInfo)
+    is SndError.Other -> generalGetString(MR.strings.ci_status_other_error).format(sndError)
+  }
+}
+
+@Serializable
+sealed class SrvError {
+  @Serializable @SerialName("host") class Host: SrvError()
+  @Serializable @SerialName("version") class Version: SrvError()
+  @Serializable @SerialName("other") class Other(val srvError: String): SrvError()
+
+  val errorInfo: String get() = when (this) {
+    is SrvError.Host -> generalGetString(MR.strings.srv_error_host)
+    is SrvError.Version -> generalGetString(MR.strings.srv_error_version)
+    is SrvError.Other -> srvError
+  }
+}
+
@Serializable
 enum class MsgReceiptStatus {
  @SerialName("ok") Ok,
@@ -2593,6 +2663,7 @@ data class CIFile(
    is CIFileStatus.RcvInvitation -> false
    is CIFileStatus.RcvAccepted -> false
    is CIFileStatus.RcvTransfer -> false
+    is CIFileStatus.RcvAborted -> false
    is CIFileStatus.RcvCancelled -> false
    is CIFileStatus.RcvComplete -> true
    is CIFileStatus.RcvError -> false
@@ -2614,6 +2685,7 @@ data class CIFile(
    is CIFileStatus.RcvInvitation -> null
    is CIFileStatus.RcvAccepted -> rcvCancelAction
    is CIFileStatus.RcvTransfer -> rcvCancelAction
+    is CIFileStatus.RcvAborted -> null
    is CIFileStatus.RcvCancelled -> null
    is CIFileStatus.RcvComplete -> null
    is CIFileStatus.RcvError -> null
@@ -2653,6 +2725,12 @@ data class CIFile(
    return res
  }

+  fun forwardingAllowed(): Boolean = when {
+    chatModel.connectedToRemote() && cachedRemoteFileRequests[fileSource] != false && loaded -> true
+    getLoadedFilePath(this) != null -> true
+    else -> false
+  }
+
  companion object {
    fun getSample(
      fileId: Long = 1,
@@ -2788,6 +2866,7 @@ sealed class CIFileStatus {
  @Serializable @SerialName("rcvInvitation") object RcvInvitation: CIFileStatus()
  @Serializable @SerialName("rcvAccepted") object RcvAccepted: CIFileStatus()
  @Serializable @SerialName("rcvTransfer") class RcvTransfer(val rcvProgress: Long, val rcvTotal: Long): CIFileStatus()
+  @Serializable @SerialName("rcvAborted") object RcvAborted: CIFileStatus()
  @Serializable @SerialName("rcvComplete") object RcvComplete: CIFileStatus()
  @Serializable @SerialName("rcvCancelled") object RcvCancelled: CIFileStatus()
  @Serializable @SerialName("rcvError") object RcvError: CIFileStatus()
@@ -2802,6 +2881,7 @@ sealed class CIFileStatus {
    is RcvInvitation -> false
    is RcvAccepted -> false
    is RcvTransfer -> false
+    is RcvAborted -> false
    is RcvComplete -> false
    is RcvCancelled -> false
    is RcvError -> false
@@ -3348,7 +3428,8 @@ data class ChatItemVersion(
@Serializable
 data class MemberDeliveryStatus(
  val groupMemberId: Long,
-  val memberDeliveryStatus: CIStatus
+  val memberDeliveryStatus: CIStatus,
+  val sentViaProxy: Boolean?
 )

 enum class NotificationPreviewMode {
@@ -12,6 +12,7 @@ import dev.icerock.moko.resources.compose.painterResource
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
+import chat.simplex.common.views.chat.group.toggleShowMemberMessages
 import chat.simplex.common.views.migration.MigrationFileLinkData
 import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.common.views.usersettings.*
@@ -25,8 +26,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.builtins.*
 import kotlinx.serialization.json.*
 import java.util.Date

@@ -106,6 +106,7 @@ class AppPreferences {
  val privacySaveLastDraft = mkBoolPreference(SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT, true)
  val privacyDeliveryReceiptsSet = mkBoolPreference(SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET, false)
  val privacyEncryptLocalFiles = mkBoolPreference(SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES, true)
+  val privacyAskToApproveRelays = mkBoolPreference(SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS, true)
  val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
  val showUnreadAndFavorites = mkBoolPreference(SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES, false)
  val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
@@ -130,6 +131,8 @@ class AppPreferences {
    },
    set = fun(mode: TransportSessionMode) { _networkSessionMode.set(mode.name) }
  )
+  val networkSMPProxyMode = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_MODE, SMPProxyMode.Never.name)
+  val networkSMPProxyFallback = mkStrPreference(SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK, SMPProxyFallback.Allow.name)
  val networkHostMode = mkStrPreference(SHARED_PREFS_NETWORK_HOST_MODE, HostMode.OnionViaSocks.name)
  val networkRequiredHostMode = mkBoolPreference(SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE, false)
  val networkTCPConnectTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT, NetCfg.defaults.tcpConnectTimeout, NetCfg.proxyDefaults.tcpConnectTimeout)
@@ -164,13 +167,20 @@ class AppPreferences {
  val selfDestruct = mkBoolPreference(SHARED_PREFS_SELF_DESTRUCT, false)
  val selfDestructDisplayName = mkStrPreference(SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME, null)

-  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM.name)
-  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.name)
-  val themeOverrides = mkMapPreference(SHARED_PREFS_THEMES, mapOf(), encode = {
+  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM_THEME_NAME)
+  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.themeName)
+  val currentThemeIds = mkMapPreference(SHARED_PREFS_CURRENT_THEME_IDs, mapOf(), encode = {
+    json.encodeToString(MapSerializer(String.serializer(), String.serializer()), it)
+  }, decode = {
+    json.decodeFromString(MapSerializer(String.serializer(), String.serializer()), it)
+  })
+  // Deprecated. Remove key from preferences in 2025
+  val themeOverridesOld = mkMapPreference(SHARED_PREFS_THEMES_OLD, mapOf(), encode = {
    json.encodeToString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
  }, decode = {
-    json.decodeFromString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
+    jsonCoerceInputValues.decodeFromString(MapSerializer(String.serializer(), ThemeOverrides.serializer()), it)
  }, settingsThemes)
+  val themeOverrides = mkThemeOverridesPreference()
  val profileImageCornerRadius = mkFloatPreference(SHARED_PREFS_PROFILE_IMAGE_CORNER_RADIUS, 22.5f)

  val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null)
@@ -185,6 +195,8 @@ class AppPreferences {

  val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)

+  val showSentViaProxy = mkBoolPreference(SHARED_PREFS_SHOW_SENT_VIA_RPOXY, false)
+

  val iosCallKitEnabled = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_ENABLED, true)
  val iosCallKitCallsInRecents = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS, false)
@@ -263,6 +275,12 @@ class AppPreferences {
      set = fun(value) = prefs.putString(prefName, encode(value))
    )

+  private fun mkThemeOverridesPreference(): SharedPreference<List<ThemeOverrides>> =
+    SharedPreference(
+      get = fun() = themeOverridesStore ?: (readThemeOverrides()).also { themeOverridesStore = it },
+      set = fun(value) { if (writeThemeOverrides(value)) { themeOverridesStore = value } }
+    )
+
  companion object {
    const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
    internal const val SHARED_PREFS_THEMES_ID = "chat.simplex.app.THEMES"
@@ -288,6 +306,7 @@ class AppPreferences {
    private const val SHARED_PREFS_PRIVACY_SAVE_LAST_DRAFT = "PrivacySaveLastDraft"
    private const val SHARED_PREFS_PRIVACY_DELIVERY_RECEIPTS_SET = "PrivacyDeliveryReceiptsSet"
    private const val SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES = "PrivacyEncryptLocalFiles"
+    private const val SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS = "PrivacyAskToApproveRelays"
    const val SHARED_PREFS_PRIVACY_FULL_BACKUP = "FullBackup"
    private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
    private const val SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES = "ShowUnreadAndFavorites"
@@ -306,6 +325,8 @@ class AppPreferences {
    private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
    private const val SHARED_PREFS_NETWORK_PROXY_HOST_PORT = "NetworkProxyHostPort"
    private const val SHARED_PREFS_NETWORK_SESSION_MODE = "NetworkSessionMode"
+    private const val SHARED_PREFS_NETWORK_SMP_PROXY_MODE = "NetworkSMPProxyMode"
+    private const val SHARED_PREFS_NETWORK_SMP_PROXY_FALLBACK = "NetworkSMPProxyFallback"
    private const val SHARED_PREFS_NETWORK_HOST_MODE = "NetworkHostMode"
    private const val SHARED_PREFS_NETWORK_REQUIRED_HOST_MODE = "NetworkRequiredHostMode"
    private const val SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT = "NetworkTCPConnectTimeout"
@@ -336,8 +357,10 @@ class AppPreferences {
    private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
    private const val SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED = "PQExperimentalEnabled" // no longer used
    private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme"
+    private const val SHARED_PREFS_CURRENT_THEME_IDs = "CurrentThemeIds"
    private const val SHARED_PREFS_SYSTEM_DARK_THEME = "SystemDarkTheme"
-    private const val SHARED_PREFS_THEMES = "Themes"
+    private const val SHARED_PREFS_THEMES_OLD = "Themes"
+    private const val SHARED_PREFS_THEME_OVERRIDES = "ThemeOverrides"
    private const val SHARED_PREFS_PROFILE_IMAGE_CORNER_RADIUS = "ProfileImageCornerRadius"
    private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion"
    private const val SHARED_PREFS_LAST_MIGRATED_VERSION_CODE = "LastMigratedVersionCode"
@@ -348,9 +371,12 @@ class AppPreferences {
    private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "ConnectRemoteViaMulticastAuto"
    private const val SHARED_PREFS_OFFER_REMOTE_MULTICAST = "OfferRemoteMulticast"
    private const val SHARED_PREFS_DESKTOP_WINDOW_STATE = "DesktopWindowState"
+    private const val SHARED_PREFS_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"

    private const val SHARED_PREFS_IOS_CALL_KIT_ENABLED = "iOSCallKitEnabled"
    private const val SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS = "iOSCallKitCallsInRecents"
+
+    private var themeOverridesStore: List<ThemeOverrides>? = null
  }
 }

@@ -435,8 +461,13 @@ object ChatController {
    Log.d(TAG, "startChatWithTemporaryDatabase")
    val migrationActiveUser = apiGetActiveUser(null, ctrl) ?: apiCreateActiveUser(null, Profile(displayName = "Temp", fullName = ""), ctrl = ctrl)
    apiSetNetworkConfig(netCfg, ctrl)
-    apiSetTempFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
-    apiSetFilesFolder(getMigrationTempFilesDirectory().absolutePath, ctrl)
+    apiSetAppFilePaths(
+      getMigrationTempFilesDirectory().absolutePath,
+      getMigrationTempFilesDirectory().absolutePath,
+      wallpapersDir.parentFile.absolutePath,
+      remoteHostsDir.absolutePath,
+      ctrl
+    )
    apiStartChat(ctrl)
    return migrationActiveUser
  }
@@ -655,22 +686,10 @@ object ChatController {
    }
  }

-  suspend fun apiSetTempFolder(tempFolder: String, ctrl: ChatCtrl? = null) {
-    val r = sendCmd(null, CC.SetTempFolder(tempFolder), ctrl)
+  suspend fun apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, remoteHostsFolder: String, ctrl: ChatCtrl? = null) {
+    val r = sendCmd(null, CC.ApiSetAppFilePaths(filesFolder, tempFolder, assetsFolder, remoteHostsFolder), ctrl)
    if (r is CR.CmdOk) return
-    throw Exception("failed to set temp folder: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiSetFilesFolder(filesFolder: String, ctrl: ChatCtrl? = null) {
-    val r = sendCmd(null, CC.SetFilesFolder(filesFolder), ctrl)
-    if (r is CR.CmdOk) return
-    throw Exception("failed to set files folder: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiSetRemoteHostsFolder(remoteHostsFolder: String) {
-    val r = sendCmd(null, CC.SetRemoteHostsFolder(remoteHostsFolder))
-    if (r is CR.CmdOk) return
-    throw Exception("failed to set remote hosts folder: ${r.responseType} ${r.details}")
+    throw Exception("failed to set app file paths: ${r.responseType} ${r.details}")
  }

  suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetEncryptLocalFiles(enable))
@@ -775,8 +794,8 @@ object ChatController {
    }
  }

-  suspend fun apiForwardChatItem(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemId: Long): ChatItem? {
-    val cmd = CC.ApiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId)
+  suspend fun apiForwardChatItem(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemId: Long, ttl: Int?): ChatItem? {
+    val cmd = CC.ApiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl)
    return processSendMessageCmd(rh, cmd)?.chatItem
  }

@@ -1156,6 +1175,20 @@ object ChatController {
    return null
  }

+  suspend fun apiSetUserUIThemes(rh: Long?, userId: Long, themes: ThemeModeOverrides?): Boolean {
+    val r = sendCmd(rh, CC.ApiSetUserUIThemes(userId, themes))
+    if (r is CR.CmdOk) return true
+    Log.e(TAG, "apiSetUserUIThemes bad response: ${r.responseType} ${r.details}")
+    return false
+  }
+
+  suspend fun apiSetChatUIThemes(rh: Long?, chatId: ChatId, themes: ThemeModeOverrides?): Boolean {
+    val r = sendCmd(rh, CC.ApiSetChatUIThemes(chatId, themes))
+    if (r is CR.CmdOk) return true
+    Log.e(TAG, "apiSetChatUIThemes bad response: ${r.responseType} ${r.details}")
+    return false
+  }
+
  suspend fun apiCreateUserAddress(rh: Long?): String? {
    val userId = kotlin.runCatching { currentUserId("apiCreateUserAddress") }.getOrElse { return null }
    val r = sendCmd(rh, CC.ApiCreateMyAddress(userId))
@@ -1330,9 +1363,9 @@ object ChatController {
    }
  }

-  suspend fun apiReceiveFile(rh: Long?, fileId: Long, encrypted: Boolean, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
+  suspend fun apiReceiveFile(rh: Long?, fileId: Long, userApprovedRelays: Boolean, encrypted: Boolean, inline: Boolean? = null, auto: Boolean = false): AChatItem? {
    // -1 here is to override default behavior of providing current remote host id because file can be asked by local device while remote is connected
-    val r = sendCmd(rh, CC.ReceiveFile(fileId, encrypted, inline))
+    val r = sendCmd(rh, CC.ReceiveFile(fileId, userApprovedRelays = userApprovedRelays, encrypt = encrypted, inline = inline))
    return when (r) {
      is CR.RcvFileAccepted -> r.chatItem
      is CR.RcvFileAcceptedSndCancelled -> {
@@ -1351,7 +1384,23 @@ object ChatController {
          val maybeChatError = chatError(r)
          if (maybeChatError is ChatErrorType.FileCancelled || maybeChatError is ChatErrorType.FileAlreadyReceiving) {
            Log.d(TAG, "apiReceiveFile ignoring FileCancelled or FileAlreadyReceiving error")
-          } else {
+          } else if (maybeChatError is ChatErrorType.FileNotApproved) {
+            Log.d(TAG, "apiReceiveFile FileNotApproved error")
+            if (!auto) {
+              val srvs = maybeChatError.unknownServers.map{ serverHostname(it) }
+              AlertManager.shared.showAlertDialog(
+                title = generalGetString(MR.strings.file_not_approved_title),
+                text = generalGetString(MR.strings.file_not_approved_descr).format(srvs.sorted().joinToString(separator = ", ")),
+                confirmText = generalGetString(MR.strings.download_file),
+                onConfirm = {
+                  val user = chatModel.currentUser.value
+                  if (user != null) {
+                    withBGApi { chatModel.controller.receiveFile(rh, user, fileId, userApprovedRelays = true) }
+                  }
+                },
+              )
+            }
+          } else if (!auto) {
            apiErrorAlert("apiReceiveFile", generalGetString(MR.strings.error_receiving_file), r)
          }
        }
@@ -2031,13 +2080,21 @@ object ChatController {
        }
      }
      is CR.ContactSwitch ->
-        chatModel.updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateContactConnectionStats(rhId, r.contact, r.switchProgress.connectionStats)
+        }
      is CR.GroupMemberSwitch ->
-        chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.switchProgress.connectionStats)
+        }
      is CR.ContactRatchetSync ->
-        chatModel.updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateContactConnectionStats(rhId, r.contact, r.ratchetSyncProgress.connectionStats)
+        }
      is CR.GroupMemberRatchetSync ->
-        chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
+        if (active(r.user)) {
+          chatModel.updateGroupMemberConnectionStats(rhId, r.groupInfo, r.member, r.ratchetSyncProgress.connectionStats)
+        }
      is CR.RemoteHostSessionCode -> {
        chatModel.remoteHostPairing.value = r.remoteHost_ to RemoteHostSessionState.PendingConfirmation(r.sessionCode)
      }
@@ -2046,6 +2103,11 @@ object ChatController {
        chatModel.currentRemoteHost.value = r.remoteHost
        switchUIRemoteHost(r.remoteHost.remoteHostId)
      }
+      is CR.ContactDisabled -> {
+        if (active(r.user)) {
+          chatModel.updateContact(rhId, r.contact)
+        }
+      }
      is CR.RemoteHostStopped -> {
        val disconnectedHost = chatModel.remoteHosts.firstOrNull { it.remoteHostId == r.remoteHostId_ }
        chatModel.remoteHostPairing.value = null
@@ -2196,9 +2258,14 @@ object ChatController {
    }
  }

-  suspend fun receiveFile(rhId: Long?, user: UserLike, fileId: Long, auto: Boolean = false) {
-    val encrypted = appPrefs.privacyEncryptLocalFiles.get()
-    val chatItem = apiReceiveFile(rhId, fileId, encrypted = encrypted, auto = auto)
+  suspend fun receiveFile(rhId: Long?, user: UserLike, fileId: Long, userApprovedRelays: Boolean = false, auto: Boolean = false) {
+    val chatItem = apiReceiveFile(
+      rhId,
+      fileId,
+      userApprovedRelays = userApprovedRelays || !appPrefs.privacyAskToApproveRelays.get(),
+      encrypted = appPrefs.privacyEncryptLocalFiles.get(),
+      auto = auto
+    )
    if (chatItem != null) {
      chatItemSimpleUpdate(rhId, user, chatItem)
    }
@@ -2302,6 +2369,8 @@ object ChatController {
    val hostMode = HostMode.valueOf(appPrefs.networkHostMode.get()!!)
    val requiredHostMode = appPrefs.networkRequiredHostMode.get()
    val sessionMode = appPrefs.networkSessionMode.get()
+    val smpProxyMode = SMPProxyMode.valueOf(appPrefs.networkSMPProxyMode.get()!!)
+    val smpProxyFallback = SMPProxyFallback.valueOf(appPrefs.networkSMPProxyFallback.get()!!)
    val tcpConnectTimeout = appPrefs.networkTCPConnectTimeout.get()
    val tcpTimeout = appPrefs.networkTCPTimeout.get()
    val tcpTimeoutPerKb = appPrefs.networkTCPTimeoutPerKb.get()
@@ -2322,6 +2391,8 @@ object ChatController {
      hostMode = hostMode,
      requiredHostMode = requiredHostMode,
      sessionMode = sessionMode,
+      smpProxyMode = smpProxyMode,
+      smpProxyFallback = smpProxyFallback,
      tcpConnectTimeout = tcpConnectTimeout,
      tcpTimeout = tcpTimeout,
      tcpTimeoutPerKb = tcpTimeoutPerKb,
@@ -2340,6 +2411,8 @@ object ChatController {
    appPrefs.networkHostMode.set(cfg.hostMode.name)
    appPrefs.networkRequiredHostMode.set(cfg.requiredHostMode)
    appPrefs.networkSessionMode.set(cfg.sessionMode)
+    appPrefs.networkSMPProxyMode.set(cfg.smpProxyMode.name)
+    appPrefs.networkSMPProxyFallback.set(cfg.smpProxyFallback.name)
    appPrefs.networkTCPConnectTimeout.set(cfg.tcpConnectTimeout)
    appPrefs.networkTCPTimeout.set(cfg.tcpTimeout)
    appPrefs.networkTCPTimeoutPerKb.set(cfg.tcpTimeoutPerKb)
@@ -2387,9 +2460,8 @@ sealed class CC {
  class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean, val viewPwd: String?): CC()
  class StartChat(val mainApp: Boolean): CC()
  class ApiStopChat: CC()
-  class SetTempFolder(val tempFolder: String): CC()
-  class SetFilesFolder(val filesFolder: String): CC()
-  class SetRemoteHostsFolder(val remoteHostsFolder: String): CC()
+  @Serializable
+  class ApiSetAppFilePaths(val appFilesFolder: String, val appTempFolder: String, val appAssetsFolder: String, val appRemoteHostsFolder: String): CC()
  class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
  class ApiExportArchive(val config: ArchiveConfig): CC()
  class ApiImportArchive(val config: ArchiveConfig): CC()
@@ -2407,7 +2479,7 @@ sealed class CC {
  class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
  class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
  class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
-  class ApiForwardChatItem(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemId: Long): CC()
+  class ApiForwardChatItem(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemId: Long, val ttl: Int?): CC()
  class ApiNewGroup(val userId: Long, val incognito: Boolean, val groupProfile: GroupProfile): CC()
  class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
  class ApiJoinGroup(val groupId: Long): CC()
@@ -2457,6 +2529,8 @@ sealed class CC {
  class ApiSetContactPrefs(val contactId: Long, val prefs: ChatPreferences): CC()
  class ApiSetContactAlias(val contactId: Long, val localAlias: String): CC()
  class ApiSetConnectionAlias(val connId: Long, val localAlias: String): CC()
+  class ApiSetUserUIThemes(val userId: Long, val themes: ThemeModeOverrides?): CC()
+  class ApiSetChatUIThemes(val chatId: String, val themes: ThemeModeOverrides?): CC()
  class ApiCreateMyAddress(val userId: Long): CC()
  class ApiDeleteMyAddress(val userId: Long): CC()
  class ApiShowMyAddress(val userId: Long): CC()
@@ -2475,7 +2549,7 @@ sealed class CC {
  class ApiRejectContact(val contactReqId: Long): CC()
  class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
  class ApiChatUnread(val type: ChatType, val id: Long, val unreadChat: Boolean): CC()
-  class ReceiveFile(val fileId: Long, val encrypt: Boolean, val inline: Boolean?): CC()
+  class ReceiveFile(val fileId: Long, val userApprovedRelays: Boolean, val encrypt: Boolean, val inline: Boolean?): CC()
  class CancelFile(val fileId: Long): CC()
  // Remote control
  class SetLocalDeviceName(val displayName: String): CC()
@@ -2524,9 +2598,7 @@ sealed class CC {
    is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}${maybePwd(viewPwd)}"
    is StartChat -> "/_start main=${onOff(mainApp)}"
    is ApiStopChat -> "/_stop"
-    is SetTempFolder -> "/_temp_folder $tempFolder"
-    is SetFilesFolder -> "/_files_folder $filesFolder"
-    is SetRemoteHostsFolder -> "/remote_hosts_folder $remoteHostsFolder"
+    is ApiSetAppFilePaths -> "/set file paths ${json.encodeToString(this)}"
    is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
    is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
    is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
@@ -2549,7 +2621,10 @@ sealed class CC {
    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
    is ApiDeleteMemberChatItem -> "/_delete member item #$groupId $groupMemberId $itemId"
    is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
-    is ApiForwardChatItem -> "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} $itemId"
+    is ApiForwardChatItem -> {
+      val ttlStr = if (ttl != null) "$ttl" else "default"
+      "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} $itemId ttl=${ttlStr}"
+    }
    is ApiNewGroup -> "/_group $userId incognito=${onOff(incognito)} ${json.encodeToString(groupProfile)}"
    is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
    is ApiJoinGroup -> "/_join #$groupId"
@@ -2603,6 +2678,8 @@ sealed class CC {
    is ApiSetContactPrefs -> "/_set prefs @$contactId ${json.encodeToString(prefs)}"
    is ApiSetContactAlias -> "/_set alias @$contactId ${localAlias.trim()}"
    is ApiSetConnectionAlias -> "/_set alias :$connId ${localAlias.trim()}"
+    is ApiSetUserUIThemes -> "/_set theme user $userId ${if (themes != null) json.encodeToString(themes) else ""}"
+    is ApiSetChatUIThemes -> "/_set theme $chatId ${if (themes != null) json.encodeToString(themes) else ""}"
    is ApiCreateMyAddress -> "/_address $userId"
    is ApiDeleteMyAddress -> "/_delete_address $userId"
    is ApiShowMyAddress -> "/_show_address $userId"
@@ -2623,6 +2700,7 @@ sealed class CC {
    is ApiChatUnread -> "/_unread chat ${chatRef(type, id)} ${onOff(unreadChat)}"
    is ReceiveFile ->
      "/freceive $fileId" +
+          (" approved_relays=${onOff(userApprovedRelays)}") +
          (if (encrypt == null) "" else " encrypt=${onOff(encrypt)}") +
          (if (inline == null) "" else " inline=${onOff(inline)}")
    is CancelFile -> "/fcancel $fileId"
@@ -2666,9 +2744,7 @@ sealed class CC {
    is ApiDeleteUser -> "apiDeleteUser"
    is StartChat -> "startChat"
    is ApiStopChat -> "apiStopChat"
-    is SetTempFolder -> "setTempFolder"
-    is SetFilesFolder -> "setFilesFolder"
-    is SetRemoteHostsFolder -> "setRemoteHostsFolder"
+    is ApiSetAppFilePaths -> "apiSetAppFilePaths"
    is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
    is ApiExportArchive -> "apiExportArchive"
    is ApiImportArchive -> "apiImportArchive"
@@ -2736,6 +2812,8 @@ sealed class CC {
    is ApiSetContactPrefs -> "apiSetContactPrefs"
    is ApiSetContactAlias -> "apiSetContactAlias"
    is ApiSetConnectionAlias -> "apiSetConnectionAlias"
+    is ApiSetUserUIThemes -> "apiSetUserUIThemes"
+    is ApiSetChatUIThemes -> "apiSetChatUIThemes"
    is ApiCreateMyAddress -> "apiCreateMyAddress"
    is ApiDeleteMyAddress -> "apiDeleteMyAddress"
    is ApiShowMyAddress -> "apiShowMyAddress"
@@ -3025,9 +3103,12 @@ data class ParsedServerAddress (
@Serializable
 data class NetCfg(
  val socksProxy: String?,
+  val socksMode: SocksMode = SocksMode.Always,
  val hostMode: HostMode,
  val requiredHostMode: Boolean,
  val sessionMode: TransportSessionMode,
+  val smpProxyMode: SMPProxyMode,
+  val smpProxyFallback: SMPProxyFallback,
  val tcpConnectTimeout: Long, // microseconds
  val tcpTimeout: Long, // microseconds
  val tcpTimeoutPerKb: Long, // microseconds
@@ -3056,6 +3137,8 @@ data class NetCfg(
        hostMode = HostMode.OnionViaSocks,
        requiredHostMode = false,
        sessionMode = TransportSessionMode.User,
+        smpProxyMode = SMPProxyMode.Never,
+        smpProxyFallback = SMPProxyFallback.Allow,
        tcpConnectTimeout = 25_000_000,
        tcpTimeout = 15_000_000,
        tcpTimeoutPerKb = 10_000,
@@ -3071,6 +3154,8 @@ data class NetCfg(
        hostMode = HostMode.OnionViaSocks,
        requiredHostMode = false,
        sessionMode = TransportSessionMode.User,
+        smpProxyMode = SMPProxyMode.Never,
+        smpProxyFallback = SMPProxyFallback.Allow,
        tcpConnectTimeout = 35_000_000,
        tcpTimeout = 20_000_000,
        tcpTimeoutPerKb = 15_000,
@@ -3109,6 +3194,35 @@ enum class HostMode {
  @SerialName("public") Public;
 }

+@Serializable
+enum class SocksMode {
+  @SerialName("always") Always,
+  @SerialName("onion") Onion;
+}
+
+@Serializable
+enum class SMPProxyMode {
+  @SerialName("always") Always,
+  @SerialName("unknown") Unknown,
+  @SerialName("unprotected") Unprotected,
+  @SerialName("never") Never;
+
+  companion object {
+    val default = Never
+  }
+}
+
+@Serializable
+enum class SMPProxyFallback {
+  @SerialName("allow") Allow,
+  @SerialName("allowProtected") AllowProtected,
+  @SerialName("prohibit") Prohibit;
+
+  companion object {
+    val default = Allow
+  }
+}
+
@Serializable
 enum class TransportSessionMode {
  @SerialName("user") User,
@@ -3971,6 +4085,15 @@ val json = Json {
  explicitNulls = false
 }

+// Can decode unknown enum to default value specified for this field
+val jsonCoerceInputValues = Json {
+  prettyPrint = true
+  ignoreUnknownKeys = true
+  encodeDefaults = true
+  explicitNulls = false
+  coerceInputValues = true
+}
+
 val jsonShort = Json {
  prettyPrint = false
  ignoreUnknownKeys = true
@@ -4175,7 +4298,7 @@ sealed class CR {
  @Serializable @SerialName("rcvStandaloneFileComplete") class RcvStandaloneFileComplete(val user: UserRef, val targetPath: String, val rcvFileTransfer: RcvFileTransfer): CR()
  @Serializable @SerialName("rcvFileCancelled") class RcvFileCancelled(val user: UserRef, val chatItem_: AChatItem?, val rcvFileTransfer: RcvFileTransfer): CR()
  @Serializable @SerialName("rcvFileSndCancelled") class RcvFileSndCancelled(val user: UserRef, val chatItem: AChatItem, val rcvFileTransfer: RcvFileTransfer): CR()
-  @Serializable @SerialName("rcvFileError") class RcvFileError(val user: UserRef, val chatItem_: AChatItem?, val rcvFileTransfer: RcvFileTransfer): CR()
+  @Serializable @SerialName("rcvFileError") class RcvFileError(val user: UserRef, val chatItem_: AChatItem?, val agentError: AgentErrorType, val rcvFileTransfer: RcvFileTransfer): CR()
  // sending file events
  @Serializable @SerialName("sndFileStart") class SndFileStart(val user: UserRef, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
  @Serializable @SerialName("sndFileComplete") class SndFileComplete(val user: UserRef, val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
@@ -4197,6 +4320,7 @@ sealed class CR {
  @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val user: UserRef, val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
  @Serializable @SerialName("callEnded") class CallEnded(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: UserRef, val connection: PendingContactConnection): CR()
+  @Serializable @SerialName("contactDisabled") class ContactDisabled(val user: UserRef, val contact: Contact): CR()
  // remote events (desktop)
  @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
  @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
@@ -4361,6 +4485,7 @@ sealed class CR {
    is CallExtraInfo -> "callExtraInfo"
    is CallEnded -> "callEnded"
    is ContactConnectionDeleted -> "contactConnectionDeleted"
+    is ContactDisabled -> "contactDisabled"
    is RemoteHostList -> "remoteHostList"
    is CurrentRemoteHost -> "currentRemoteHost"
    is RemoteHostStarted -> "remoteHostStarted"
@@ -4501,7 +4626,7 @@ sealed class CR {
    is RcvFileSndCancelled -> withUser(user, json.encodeToString(chatItem))
    is RcvFileProgressXFTP -> withUser(user, "chatItem: ${json.encodeToString(chatItem_)}\nreceivedSize: $receivedSize\ntotalSize: $totalSize")
    is RcvStandaloneFileComplete -> withUser(user, targetPath)
-    is RcvFileError -> withUser(user, json.encodeToString(chatItem_))
+    is RcvFileError -> withUser(user, "chatItem_: ${json.encodeToString(chatItem_)}\nagentError: ${agentError.string}\nrcvFileTransfer: $rcvFileTransfer")
    is SndFileCancelled -> json.encodeToString(chatItem_)
    is SndStandaloneFileCreated -> noDetails()
    is SndFileStartXFTP -> withUser(user, json.encodeToString(chatItem))
@@ -4521,6 +4646,7 @@ sealed class CR {
    is CallExtraInfo -> withUser(user, "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}")
    is CallEnded -> withUser(user, "contact: ${contact.id}")
    is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
+    is ContactDisabled -> withUser(user, json.encodeToString(contact))
    // remote events (mobile)
    is RemoteHostList -> json.encodeToString(remoteHosts)
    is CurrentRemoteHost -> if (remoteHost_ == null) "local" else json.encodeToString(remoteHost_)
@@ -4824,13 +4950,14 @@ sealed class ChatErrorType {
      is FileCancel -> "fileCancel"
      is FileAlreadyExists -> "fileAlreadyExists"
      is FileRead -> "fileRead"
-      is FileWrite -> "fileWrite"
+      is FileWrite -> "fileWrite $message"
      is FileSend -> "fileSend"
      is FileRcvChunk -> "fileRcvChunk"
      is FileInternal -> "fileInternal"
      is FileImageType -> "fileImageType"
      is FileImageSize -> "fileImageSize"
      is FileNotReceived -> "fileNotReceived"
+      is FileNotApproved -> "fileNotApproved"
      // is XFTPRcvFile -> "xftpRcvFile"
      // is XFTPSndFile -> "xftpSndFile"
      is FallbackToSMPProhibited -> "fallbackToSMPProhibited"
@@ -4910,6 +5037,7 @@ sealed class ChatErrorType {
  @Serializable @SerialName("fileImageType") class FileImageType(val filePath: String): ChatErrorType()
  @Serializable @SerialName("fileImageSize") class FileImageSize(val filePath: String): ChatErrorType()
  @Serializable @SerialName("fileNotReceived") class FileNotReceived(val fileId: Long): ChatErrorType()
+  @Serializable @SerialName("fileNotApproved") class FileNotApproved(val fileId: Long, val unknownServers: List<String>): ChatErrorType()
  // @Serializable @SerialName("xFTPRcvFile") object XFTPRcvFile: ChatErrorType()
  // @Serializable @SerialName("xFTPSndFile") object XFTPSndFile: ChatErrorType()
  @Serializable @SerialName("fallbackToSMPProhibited") class FallbackToSMPProhibited(val fileId: Long): ChatErrorType()
@@ -5408,6 +5536,7 @@ enum class NotificationsMode() {
 data class AppSettings(
  var networkConfig: NetCfg? = null,
  var privacyEncryptLocalFiles: Boolean? = null,
+  var privacyAskToApproveRelays: Boolean? = null,
  var privacyAcceptImages: Boolean? = null,
  var privacyLinkPreviews: Boolean? = null,
  var privacyShowChatPreviews: Boolean? = null,
@@ -5425,12 +5554,18 @@ data class AppSettings(
  var androidCallOnLockScreen: AppSettingsLockScreenCalls? = null,
  var iosCallKitEnabled: Boolean? = null,
  var iosCallKitCallsInRecents: Boolean? = null,
+  var uiProfileImageCornerRadius: Float? = null,
+  var uiColorScheme: String? = null,
+  var uiDarkColorScheme: String? = null,
+  var uiCurrentThemeIds: Map<String, String>? = null,
+  var uiThemes: List<ThemeOverrides>? = null,
 ) {
  fun prepareForExport(): AppSettings {
    val empty = AppSettings()
    val def = defaults
    if (networkConfig != def.networkConfig) { empty.networkConfig = networkConfig }
    if (privacyEncryptLocalFiles != def.privacyEncryptLocalFiles) { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
+    if (privacyAskToApproveRelays != def.privacyAskToApproveRelays) { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
    if (privacyAcceptImages != def.privacyAcceptImages) { empty.privacyAcceptImages = privacyAcceptImages }
    if (privacyLinkPreviews != def.privacyLinkPreviews) { empty.privacyLinkPreviews = privacyLinkPreviews }
    if (privacyShowChatPreviews != def.privacyShowChatPreviews) { empty.privacyShowChatPreviews = privacyShowChatPreviews }
@@ -5448,6 +5583,11 @@ data class AppSettings(
    if (androidCallOnLockScreen != def.androidCallOnLockScreen) { empty.androidCallOnLockScreen = androidCallOnLockScreen }
    if (iosCallKitEnabled != def.iosCallKitEnabled) { empty.iosCallKitEnabled = iosCallKitEnabled }
    if (iosCallKitCallsInRecents != def.iosCallKitCallsInRecents) { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
+    if (uiProfileImageCornerRadius != def.uiProfileImageCornerRadius) { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
+    if (uiColorScheme != def.uiColorScheme) { empty.uiColorScheme = uiColorScheme }
+    if (uiDarkColorScheme != def.uiDarkColorScheme) { empty.uiDarkColorScheme = uiDarkColorScheme }
+    if (uiCurrentThemeIds != def.uiCurrentThemeIds) { empty.uiCurrentThemeIds = uiCurrentThemeIds }
+    if (uiThemes != def.uiThemes) { empty.uiThemes = uiThemes }
    return empty
  }

@@ -5462,6 +5602,7 @@ data class AppSettings(
      setNetCfg(net)
    }
    privacyEncryptLocalFiles?.let { def.privacyEncryptLocalFiles.set(it) }
+    privacyAskToApproveRelays?.let { def.privacyAskToApproveRelays.set(it) }
    privacyAcceptImages?.let { def.privacyAcceptImages.set(it) }
    privacyLinkPreviews?.let { def.privacyLinkPreviews.set(it) }
    privacyShowChatPreviews?.let { def.privacyShowChatPreviews.set(it) }
@@ -5479,6 +5620,11 @@ data class AppSettings(
    androidCallOnLockScreen?.let { def.callOnLockScreen.set(it.toCallOnLockScreen()) }
    iosCallKitEnabled?.let { def.iosCallKitEnabled.set(it) }
    iosCallKitCallsInRecents?.let { def.iosCallKitCallsInRecents.set(it) }
+    uiProfileImageCornerRadius?.let { def.profileImageCornerRadius.set(it) }
+    uiColorScheme?.let { def.currentTheme.set(it) }
+    uiDarkColorScheme?.let { def.systemDarkTheme.set(it) }
+    uiCurrentThemeIds?.let { def.currentThemeIds.set(it) }
+    uiThemes?.let { def.themeOverrides.set(it.skipDuplicates()) }
  }

  companion object {
@@ -5486,6 +5632,7 @@ data class AppSettings(
      get() = AppSettings(
        networkConfig = NetCfg.defaults,
        privacyEncryptLocalFiles = true,
+        privacyAskToApproveRelays = true,
        privacyAcceptImages = true,
        privacyLinkPreviews = true,
        privacyShowChatPreviews = true,
@@ -5502,7 +5649,12 @@ data class AppSettings(
        confirmDBUpgrades = false,
        androidCallOnLockScreen = AppSettingsLockScreenCalls.SHOW,
        iosCallKitEnabled = true,
-        iosCallKitCallsInRecents = false
+        iosCallKitCallsInRecents = false,
+        uiProfileImageCornerRadius = 22.5f,
+        uiColorScheme = DefaultTheme.SYSTEM_THEME_NAME,
+        uiDarkColorScheme = DefaultTheme.SIMPLEX.themeName,
+        uiCurrentThemeIds = null,
+        uiThemes = null,
      )

    val current: AppSettings
@@ -5511,6 +5663,7 @@ data class AppSettings(
        return defaults.copy(
          networkConfig = getNetCfg(),
          privacyEncryptLocalFiles = def.privacyEncryptLocalFiles.get(),
+          privacyAskToApproveRelays = def.privacyAskToApproveRelays.get(),
          privacyAcceptImages = def.privacyAcceptImages.get(),
          privacyLinkPreviews = def.privacyLinkPreviews.get(),
          privacyShowChatPreviews = def.privacyShowChatPreviews.get(),
@@ -5528,6 +5681,11 @@ data class AppSettings(
          androidCallOnLockScreen = AppSettingsLockScreenCalls.from(def.callOnLockScreen.get()),
          iosCallKitEnabled = def.iosCallKitEnabled.get(),
          iosCallKitCallsInRecents = def.iosCallKitCallsInRecents.get(),
+          uiProfileImageCornerRadius = def.profileImageCornerRadius.get(),
+          uiColorScheme = def.currentTheme.get() ?: DefaultTheme.SYSTEM_THEME_NAME,
+          uiDarkColorScheme = def.systemDarkTheme.get() ?: DefaultTheme.SIMPLEX.themeName,
+          uiCurrentThemeIds = def.currentThemeIds.get(),
+          uiThemes = def.themeOverrides.get(),
        )
    }
  }
@@ -2,7 +2,6 @@ package com.sd.lib.compose.wheel_picker

 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
-import chat.simplex.common.ui.theme.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -12,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import chat.simplex.common.ui.theme.isInDarkTheme

 /**
 * The default implementation of focus view in vertical.
@@ -76,7 +76,7 @@ fun FWheelPickerFocusHorizontal(
 */
 private val DefaultDividerColor: Color
  @Composable
-  get() = (if (isSystemInDarkTheme()) {
+  get() = (if (isInDarkTheme()) {
    Color.White
  } else {
    Color.Black
@@ -42,6 +42,12 @@ fun runMigrations() {
          ChatController.appPrefs.currentTheme.set(DefaultTheme.SIMPLEX.name)
        }
        lastMigration.set(117)
+      } else if (lastMigration.get() < 203) {
+        // Moving to a different key for storing themes as a List
+        val oldOverrides = ChatController.appPrefs.themeOverridesOld.get().values.toList()
+        ChatController.appPrefs.themeOverrides.set(oldOverrides)
+        ChatController.appPrefs.currentThemeIds.set(oldOverrides.associate { it.base.themeName to it.themeId })
+        lastMigration.set(203)
      } else {
        lastMigration.set(BuildConfigCommon.ANDROID_VERSION_CODE)
        break
@@ -43,14 +43,13 @@ val appPreferences: AppPreferences

 val chatController: ChatController = ChatController

-fun initChatControllerAndRunMigrations() {
+fun initChatControllerOnStart() {
  withLongRunningApi {
    if (appPreferences.chatStopped.get() && appPreferences.storeDBPassphrase.get() && ksDatabasePassword.get() != null) {
      initChatController(startChat = ::showStartChatAfterRestartAlert)
    } else {
      initChatController()
    }
-    runMigrations()
  }
 }

@@ -88,11 +87,13 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
      return
    }
    platform.androidRestartNetworkObserver()
-    controller.apiSetTempFolder(coreTmpDir.absolutePath)
-    controller.apiSetFilesFolder(appFilesDir.absolutePath)
-    if (appPlatform.isDesktop) {
-      controller.apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
-    }
+    controller.apiSetAppFilePaths(
+      appFilesDir.absolutePath,
+      coreTmpDir.absolutePath,
+      wallpapersDir.parentFile.absolutePath,
+      remoteHostsDir.absolutePath,
+      ctrl
+    )
    controller.apiSetEncryptLocalFiles(controller.appPrefs.privacyEncryptLocalFiles.get())
    // If we migrated successfully means previous re-encryption process on database level finished successfully too
    if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
@@ -1,10 +1,12 @@
 package chat.simplex.common.platform

 import androidx.compose.runtime.Composable
-import chat.simplex.common.model.CIFile
-import chat.simplex.common.model.CryptoFile
+import chat.simplex.common.model.*
+import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
+import com.charleskorn.kaml.*
+import kotlinx.serialization.encodeToString
 import java.io.*
 import java.net.URI
 import java.net.URLDecoder
@@ -14,8 +16,10 @@ expect val dataDir: File
 expect val tmpDir: File
 expect val filesDir: File
 expect val appFilesDir: File
+expect val wallpapersDir: File
 expect val coreTmpDir: File
 expect val dbAbsolutePrefixPath: String
+expect val preferencesDir: File

 expect val chatDatabaseFileName: String
 expect val agentDatabaseFileName: String
@@ -78,6 +82,20 @@ fun getAppFilePath(fileName: String): String {
  }
 }

+fun getWallpaperFilePath(fileName: String): String {
+  val rh = chatModel.currentRemoteHost.value
+  val s = File.separator
+  val path = if (rh == null) {
+    wallpapersDir.absolutePath + s + fileName
+  } else {
+    remoteHostsDir.absolutePath + s + rh.storePath + s + "simplex_v1_assets" + s + "wallpapers" + s + fileName
+  }
+  File(path).parentFile.mkdirs()
+  return path
+}
+
+fun getPreferenceFilePath(fileName: String = "themes.yaml"): String = preferencesDir.absolutePath + File.separator + fileName
+
 fun getLoadedFilePath(file: CIFile?): String? {
  val f = file?.fileSource?.filePath
  return if (f != null && file.loaded) {
@@ -98,6 +116,42 @@ fun getLoadedFileSource(file: CIFile?): CryptoFile? {
  }
 }

+fun readThemeOverrides(): List<ThemeOverrides> {
+  return try {
+    val file = File(getPreferenceFilePath("themes.yaml"))
+    if (!file.exists()) return emptyList()
+
+    file.inputStream().use {
+      val map = yaml.parseToYamlNode(it).yamlMap
+      val list = map.get<YamlList>("themes")
+      val res = ArrayList<ThemeOverrides>()
+      list?.items?.forEach {
+        try {
+          res.add(yaml.decodeFromYamlNode(ThemeOverrides.serializer(), it))
+        } catch (e: Throwable) {
+          Log.e(TAG, "Error while reading specific theme: ${e.stackTraceToString()}")
+        }
+      }
+      res.skipDuplicates()
+    }
+  } catch (e: Throwable) {
+    Log.e(TAG, "Error while reading themes file: ${e.stackTraceToString()}")
+    emptyList()
+  }
+}
+
+fun writeThemeOverrides(overrides: List<ThemeOverrides>): Boolean =
+  try {
+    File(getPreferenceFilePath("themes.yaml")).outputStream().use {
+      val string = yaml.encodeToString(ThemesFile(themes = overrides))
+      it.bufferedWriter().use { it.write(string) }
+    }
+    true
+  } catch (e: Throwable) {
+    Log.e(TAG, "Error while writing themes file: ${e.stackTraceToString()}")
+    false
+  }
+
 private fun fileReady(file: CIFile, filePath: String) =
  File(filePath).exists() &&
  CIFile.cachedRemoteFileRequests[file.fileSource] != false
@@ -1,11 +1,13 @@
 package chat.simplex.common.platform

 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import com.russhwolf.settings.Settings
+import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource

@Composable
@@ -31,3 +33,5 @@ expect fun windowWidth(): Dp
 expect fun desktopExpandWindowToWidth(width: Dp)

 expect fun isRtl(text: CharSequence): Boolean
+
+expect fun ImageResource.toComposeImageBitmap(): ImageBitmap?
@@ -8,3 +8,4 @@ expect fun UriHandler.sendEmail(subject: String, body: CharSequence)

 expect fun ClipboardManager.shareText(text: String)
 expect fun shareFile(text: String, fileSource: CryptoFile)
+expect fun openFile(fileSource: CryptoFile)
@@ -31,17 +31,6 @@ val WarningOrange = Color(255, 127, 0, 255)
 val WarningYellow = Color(255, 192, 0, 255)
 val FileLight = Color(183, 190, 199, 255)
 val FileDark = Color(101, 101, 106, 255)
-val SentMessageColor = Color(0x1E45B8FF)

 val MenuTextColor: Color @Composable get () = if (isInDarkTheme()) LocalContentColor.current.copy(alpha = 0.8f) else Color.Black
-val NoteFolderIconColor: Color @Composable get() = with(CurrentColors.collectAsState().value.appColors.sentMessage) {
-  // Default color looks too light and better to have it here a little bit brighter
-  if (alpha == SentMessageColor.alpha) {
-    copy(min(SentMessageColor.alpha + 0.1f, 1f))
-  } else {
-    // Color is non-standard and theme maker can choose color without alpha at all since the theme bound to dark/light variant,
-    // and it shouldn't be universal
-    this
-  }
-}
-
+val NoteFolderIconColor: Color @Composable get() = MaterialTheme.appColors.primaryVariant2
@@ -6,53 +6,136 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatController
-import chat.simplex.common.platform.isInNightMode
+import chat.simplex.common.model.ChatController.appPrefs
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.ThemeManager.colorFromReadableHex
+import chat.simplex.common.ui.theme.ThemeManager.toReadableHex
 import chat.simplex.common.views.helpers.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import chat.simplex.res.MR
+import kotlinx.serialization.Transient
+import java.util.UUID

 enum class DefaultTheme {
-  SYSTEM, LIGHT, DARK, SIMPLEX;
+  LIGHT, DARK, SIMPLEX, BLACK;
+
+  companion object {
+    const val SYSTEM_THEME_NAME: String = "SYSTEM"
+  }
+
+  val themeName: String
+    get() = name
+
+  val mode: DefaultThemeMode get() = if (this == LIGHT) DefaultThemeMode.LIGHT else DefaultThemeMode.DARK

  // Call it only with base theme, not SYSTEM
-  fun hasChangedAnyColor(colors: Colors, appColors: AppColors): Boolean {
-    val palette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPalette
-      DARK -> DarkColorPalette
-      SIMPLEX -> SimplexColorPalette
-    }
-    val appPalette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPaletteApp
-      DARK -> DarkColorPaletteApp
-      SIMPLEX -> SimplexColorPaletteApp
-    }
-    return colors.primary != palette.primary ||
-        colors.primaryVariant != palette.primaryVariant ||
-        colors.secondary != palette.secondary ||
-        colors.secondaryVariant != palette.secondaryVariant ||
-        colors.background != palette.background ||
-        colors.surface != palette.surface ||
-        appColors != appPalette
+  fun hasChangedAnyColor(overrides: ThemeOverrides?): Boolean {
+    if (overrides == null) return false
+    return overrides.colors != ThemeColors() ||
+        overrides.wallpaper != null && (overrides.wallpaper.background != null || overrides.wallpaper.tint != null)
  }
 }

-data class AppColors(
-  val title: Color,
-  val sentMessage: Color,
-  val receivedMessage: Color
-)
+@Serializable
+enum class DefaultThemeMode {
+  @SerialName("light") LIGHT,
+  @SerialName("dark") DARK
+}
+
+@Stable
+class AppColors(
+  title: Color,
+  primaryVariant2: Color,
+  sentMessage: Color,
+  sentQuote: Color,
+  receivedMessage: Color,
+  receivedQuote: Color,
+) {
+  var title by mutableStateOf(title, structuralEqualityPolicy())
+    internal set
+  var primaryVariant2 by mutableStateOf(primaryVariant2, structuralEqualityPolicy())
+    internal set
+  var sentMessage by mutableStateOf(sentMessage, structuralEqualityPolicy())
+    internal set
+  var sentQuote by mutableStateOf(sentQuote, structuralEqualityPolicy())
+    internal set
+  var receivedMessage by mutableStateOf(receivedMessage, structuralEqualityPolicy())
+    internal set
+  var receivedQuote by mutableStateOf(receivedQuote, structuralEqualityPolicy())
+    internal set
+
+  fun copy(
+    title: Color = this.title,
+    primaryVariant2: Color = this.primaryVariant2,
+    sentMessage: Color = this.sentMessage,
+    sentQuote: Color = this.sentQuote,
+    receivedMessage: Color = this.receivedMessage,
+    receivedQuote: Color = this.receivedQuote,
+  ): AppColors = AppColors(
+    title,
+    primaryVariant2,
+    sentMessage,
+    sentQuote,
+    receivedMessage,
+    receivedQuote,
+  )
+
+  override fun toString(): String {
+    return buildString {
+      append("AppColors(")
+      append("title=$title, ")
+      append("primaryVariant2=$primaryVariant2, ")
+      append("sentMessage=$sentMessage, ")
+      append("sentQuote=$sentQuote, ")
+      append("receivedMessage=$receivedMessage, ")
+      append("receivedQuote=$receivedQuote")
+      append(")")
+    }
+  }
+}
+
+@Stable
+class AppWallpaper(
+  background: Color? = null,
+  tint: Color? = null,
+  type: WallpaperType = WallpaperType.Empty,
+) {
+  var background by mutableStateOf(background, structuralEqualityPolicy())
+    internal set
+  var tint by mutableStateOf(tint, structuralEqualityPolicy())
+    internal set
+  var type by mutableStateOf(type, structuralEqualityPolicy())
+    internal set
+
+  fun copy(
+    background: Color? = this.background,
+    tint: Color? = this.tint,
+    type: WallpaperType = this.type,
+  ): AppWallpaper = AppWallpaper(
+    background,
+    tint,
+    type,
+  )
+
+  override fun toString(): String {
+    return buildString {
+      append("AppWallpaper(")
+      append("background=$background, ")
+      append("tint=$tint, ")
+      append("type=$type")
+      append(")")
+    }
+  }
+}

 enum class ThemeColor {
-  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, RECEIVED_MESSAGE;
+  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, SENT_QUOTE, RECEIVED_MESSAGE, RECEIVED_QUOTE, PRIMARY_VARIANT2, WALLPAPER_BACKGROUND, WALLPAPER_TINT;

-  fun fromColors(colors: Colors, appColors: AppColors): Color {
+  fun fromColors(colors: Colors, appColors: AppColors, appWallpaper: AppWallpaper): Color? {
    return when (this) {
      PRIMARY -> colors.primary
      PRIMARY_VARIANT -> colors.primaryVariant
@@ -61,8 +144,13 @@ enum class ThemeColor {
      BACKGROUND -> colors.background
      SURFACE -> colors.surface
      TITLE -> appColors.title
+      PRIMARY_VARIANT2 -> appColors.primaryVariant2
      SENT_MESSAGE -> appColors.sentMessage
+      SENT_QUOTE -> appColors.sentQuote
      RECEIVED_MESSAGE -> appColors.receivedMessage
+      RECEIVED_QUOTE -> appColors.receivedQuote
+      WALLPAPER_BACKGROUND -> appWallpaper.background
+      WALLPAPER_TINT -> appWallpaper.tint
    }
  }

@@ -75,8 +163,13 @@ enum class ThemeColor {
      BACKGROUND -> generalGetString(MR.strings.color_background)
      SURFACE -> generalGetString(MR.strings.color_surface)
      TITLE -> generalGetString(MR.strings.color_title)
+      PRIMARY_VARIANT2 -> generalGetString(MR.strings.color_primary_variant2)
      SENT_MESSAGE -> generalGetString(MR.strings.color_sent_message)
+      SENT_QUOTE -> generalGetString(MR.strings.color_sent_quote)
      RECEIVED_MESSAGE -> generalGetString(MR.strings.color_received_message)
+      RECEIVED_QUOTE -> generalGetString(MR.strings.color_received_quote)
+      WALLPAPER_BACKGROUND -> generalGetString(MR.strings.color_wallpaper_background)
+      WALLPAPER_TINT -> generalGetString(MR.strings.color_wallpaper_tint)
    }
 }

@@ -92,45 +185,232 @@ data class ThemeColors(
  @SerialName("menus")
  val surface: String? = null,
  val title: String? = null,
+  @SerialName("accentVariant2")
+  val primaryVariant2: String? = null,
  val sentMessage: String? = null,
+  @SerialName("sentReply")
+  val sentQuote: String? = null,
  val receivedMessage: String? = null,
+  @SerialName("receivedReply")
+  val receivedQuote: String? = null,
 ) {
-  fun toColors(base: DefaultTheme): Colors {
+  companion object {
+    fun from(colors: Colors, appColors: AppColors): ThemeColors =
+      ThemeColors(
+        primary = colors.primary.toReadableHex(),
+        primaryVariant = colors.primaryVariant.toReadableHex(),
+        secondary = colors.secondary.toReadableHex(),
+        secondaryVariant = colors.secondaryVariant.toReadableHex(),
+        background = colors.background.toReadableHex(),
+        surface = colors.surface.toReadableHex(),
+        title = appColors.title.toReadableHex(),
+        primaryVariant2 = appColors.primaryVariant2.toReadableHex(),
+        sentMessage = appColors.sentMessage.toReadableHex(),
+        sentQuote = appColors.sentQuote.toReadableHex(),
+        receivedMessage = appColors.receivedMessage.toReadableHex(),
+        receivedQuote = appColors.receivedQuote.toReadableHex(),
+      )
+  }
+}
+
+@Serializable
+data class ThemeWallpaper (
+  val preset: String? = null,
+  val scale: Float? = null,
+  val scaleType: WallpaperScaleType? = null,
+  val background: String? = null,
+  val tint: String? = null,
+  val image: String? = null,
+  val imageFile: String? = null,
+) {
+  fun toAppWallpaper(): AppWallpaper {
+    return AppWallpaper(
+      background = background?.colorFromReadableHex(),
+      tint = tint?.colorFromReadableHex(),
+      type = WallpaperType.from(this) ?: WallpaperType.Empty
+    )
+  }
+
+  fun withFilledWallpaperBase64(): ThemeWallpaper {
+    val aw = toAppWallpaper()
+    val type = aw.type
+    return ThemeWallpaper(
+      image = if (type is WallpaperType.Image && type.image != null) resizeImageToStrSize(type.image!!, 5_000_000) else null,
+      imageFile = null,
+      preset = if (type is WallpaperType.Preset) type.filename else null,
+      scale = if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) type.scale else 1f,
+      scaleType = if (type is WallpaperType.Image) type.scaleType else null,
+      background = aw.background?.toReadableHex(),
+      tint = aw.tint?.toReadableHex(),
+    )
+  }
+
+  fun withFilledWallpaperPath(): ThemeWallpaper {
+    val aw = toAppWallpaper()
+    val type = aw.type
+    return ThemeWallpaper(
+      image = null,
+      imageFile = if (type is WallpaperType.Image) type.filename else null,
+      preset = if (type is WallpaperType.Preset) type.filename else null,
+      scale = if (scale == null) null else if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) scale else null,
+      scaleType = if (scaleType == null) null else if (type is WallpaperType.Image) type.scaleType else null,
+      background = aw.background?.toReadableHex(),
+      tint = aw.tint?.toReadableHex(),
+    )
+  }
+
+ fun importFromString(): ThemeWallpaper =
+   if (preset == null && image != null) {
+     // Need to save image from string and to save its path
+     try {
+       val parsed = base64ToBitmap(image)
+       val filename = saveWallpaperFile(parsed)
+       copy(image = null, imageFile = filename)
+     } catch (e: Exception) {
+       Log.e(TAG, "Error while parsing/copying the image: ${e.stackTraceToString()}")
+       ThemeWallpaper()
+     }
+   } else this
+
+  companion object {
+    fun from(type: WallpaperType, background: String?, tint: String?): ThemeWallpaper {
+      return ThemeWallpaper(
+        image = null,
+        imageFile = if (type is WallpaperType.Image) type.filename else null,
+        preset = if (type is WallpaperType.Preset) type.filename else null,
+        scale = if (type is WallpaperType.Preset) type.scale else if (type is WallpaperType.Image) type.scale else null,
+        scaleType = if (type is WallpaperType.Image) type.scaleType else null,
+        background = background,
+        tint = tint,
+      )
+    }
+  }
+}
+
+@Serializable
+data class ThemesFile(
+  val themes: List<ThemeOverrides> = emptyList()
+)
+
+@Serializable
+data class ThemeOverrides (
+  val themeId: String = UUID.randomUUID().toString(),
+  val base: DefaultTheme,
+  val colors: ThemeColors = ThemeColors(),
+  val wallpaper: ThemeWallpaper? = null,
+) {
+
+  fun isSame(type: WallpaperType?, themeName: String): Boolean =
+    (
+        (wallpaper?.preset != null && type is WallpaperType.Preset && wallpaper.preset == type.filename) ||
+        (wallpaper?.imageFile != null && type is WallpaperType.Image) ||
+        (wallpaper?.preset == null && wallpaper?.imageFile == null && (type == WallpaperType.Empty || type == null))
+    ) && base.themeName == themeName
+
+  fun withUpdatedColor(name: ThemeColor, color: String?): ThemeOverrides {
+    return copy(
+      colors = when (name) {
+        ThemeColor.PRIMARY -> colors.copy(primary = color)
+        ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
+        ThemeColor.SECONDARY -> colors.copy(secondary = color)
+        ThemeColor.SECONDARY_VARIANT -> colors.copy(secondaryVariant = color)
+        ThemeColor.BACKGROUND -> colors.copy(background = color)
+        ThemeColor.SURFACE -> colors.copy(surface = color)
+        ThemeColor.TITLE -> colors.copy(title = color)
+        ThemeColor.PRIMARY_VARIANT2 -> colors.copy(primaryVariant2 = color)
+        ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
+        ThemeColor.SENT_QUOTE -> colors.copy(sentQuote = color)
+        ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
+        ThemeColor.RECEIVED_QUOTE -> colors.copy(receivedQuote = color)
+        ThemeColor.WALLPAPER_BACKGROUND -> colors.copy()
+        ThemeColor.WALLPAPER_TINT -> colors.copy()
+      }, wallpaper = when (name) {
+        ThemeColor.WALLPAPER_BACKGROUND -> wallpaper?.copy(background = color)
+        ThemeColor.WALLPAPER_TINT -> wallpaper?.copy(tint = color)
+        else -> wallpaper?.copy()
+      }
+    )
+  }
+
+  fun toColors(base: DefaultTheme, perChatTheme: ThemeColors?, perUserTheme: ThemeColors?, presetWallpaperTheme: ThemeColors?): Colors {
    val baseColors = when (base) {
      DefaultTheme.LIGHT -> LightColorPalette
      DefaultTheme.DARK -> DarkColorPalette
      DefaultTheme.SIMPLEX -> SimplexColorPalette
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPalette
+      DefaultTheme.BLACK -> BlackColorPalette
    }
    return baseColors.copy(
-      primary = primary?.colorFromReadableHex() ?: baseColors.primary,
-      primaryVariant = primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
-      secondary = secondary?.colorFromReadableHex() ?: baseColors.secondary,
-      secondaryVariant = secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
-      background = background?.colorFromReadableHex() ?: baseColors.background,
-      surface = surface?.colorFromReadableHex() ?: baseColors.surface,
+      primary = perChatTheme?.primary?.colorFromReadableHex() ?: perUserTheme?.primary?.colorFromReadableHex() ?: colors.primary?.colorFromReadableHex() ?: presetWallpaperTheme?.primary?.colorFromReadableHex() ?: baseColors.primary,
+      primaryVariant = perChatTheme?.primaryVariant?.colorFromReadableHex() ?: perUserTheme?.primaryVariant?.colorFromReadableHex() ?: colors.primaryVariant?.colorFromReadableHex() ?: presetWallpaperTheme?.primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
+      secondary = perChatTheme?.secondary?.colorFromReadableHex() ?: perUserTheme?.secondary?.colorFromReadableHex() ?: colors.secondary?.colorFromReadableHex() ?: presetWallpaperTheme?.secondary?.colorFromReadableHex() ?: baseColors.secondary,
+      secondaryVariant = perChatTheme?.secondaryVariant?.colorFromReadableHex() ?: perUserTheme?.secondaryVariant?.colorFromReadableHex() ?: colors.secondaryVariant?.colorFromReadableHex() ?: presetWallpaperTheme?.secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
+      background = perChatTheme?.background?.colorFromReadableHex() ?: perUserTheme?.background?.colorFromReadableHex() ?: colors.background?.colorFromReadableHex() ?: presetWallpaperTheme?.background?.colorFromReadableHex() ?: baseColors.background,
+      surface = perChatTheme?.surface?.colorFromReadableHex() ?: perUserTheme?.surface?.colorFromReadableHex() ?: colors.surface?.colorFromReadableHex() ?: presetWallpaperTheme?.surface?.colorFromReadableHex() ?: baseColors.surface,
    )
  }

-  fun toAppColors(base: DefaultTheme): AppColors {
+  fun toAppColors(base: DefaultTheme, perChatTheme: ThemeColors?, perChatWallpaperType: WallpaperType?, perUserTheme: ThemeColors?, perUserWallpaperType: WallpaperType?, presetWallpaperTheme: ThemeColors?): AppColors {
    val baseColors = when (base) {
      DefaultTheme.LIGHT -> LightColorPaletteApp
      DefaultTheme.DARK -> DarkColorPaletteApp
      DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPaletteApp
+      DefaultTheme.BLACK -> BlackColorPaletteApp
    }
+
+    val sentMessageFallback = colors.sentMessage?.colorFromReadableHex() ?: presetWallpaperTheme?.sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage
+    val sentQuoteFallback = colors.sentQuote?.colorFromReadableHex() ?: presetWallpaperTheme?.sentQuote?.colorFromReadableHex() ?: baseColors.sentQuote
+    val receivedMessageFallback = colors.receivedMessage?.colorFromReadableHex() ?: presetWallpaperTheme?.receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage
+    val receivedQuoteFallback = colors.receivedQuote?.colorFromReadableHex() ?: presetWallpaperTheme?.receivedQuote?.colorFromReadableHex() ?: baseColors.receivedQuote
    return baseColors.copy(
-      title = title?.colorFromReadableHex() ?: baseColors.title,
-      sentMessage = sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage,
-      receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
+      title = perChatTheme?.title?.colorFromReadableHex() ?: perUserTheme?.title?.colorFromReadableHex() ?: colors.title?.colorFromReadableHex() ?: presetWallpaperTheme?.title?.colorFromReadableHex() ?: baseColors.title,
+      primaryVariant2 = perChatTheme?.primaryVariant2?.colorFromReadableHex() ?: perUserTheme?.primaryVariant2?.colorFromReadableHex() ?: colors.primaryVariant2?.colorFromReadableHex() ?: presetWallpaperTheme?.primaryVariant2?.colorFromReadableHex() ?: baseColors.primaryVariant2,
+      sentMessage = if (perChatTheme?.sentMessage != null) perChatTheme.sentMessage.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.sentMessage?.colorFromReadableHex() ?: sentMessageFallback
+        else sentMessageFallback,
+      sentQuote = if (perChatTheme?.sentQuote != null) perChatTheme.sentQuote.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.sentQuote?.colorFromReadableHex() ?: sentQuoteFallback
+        else sentQuoteFallback,
+      receivedMessage = if (perChatTheme?.receivedMessage != null) perChatTheme.receivedMessage.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.receivedMessage?.colorFromReadableHex() ?: receivedMessageFallback
+        else receivedMessageFallback,
+      receivedQuote = if (perChatTheme?.receivedQuote != null) perChatTheme.receivedQuote.colorFromReadableHex()
+        else if (perUserTheme != null && (perChatWallpaperType == null || perUserWallpaperType == null || perChatWallpaperType.sameType(perUserWallpaperType))) perUserTheme.receivedQuote?.colorFromReadableHex() ?: receivedQuoteFallback
+        else receivedQuoteFallback,
    )
  }

-  fun withFilledColors(base: DefaultTheme): ThemeColors {
-    val c = toColors(base)
-    val ac = toAppColors(base)
+  fun toAppWallpaper(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverride?, materialBackgroundColor: Color): AppWallpaper {
+    val mainType = when {
+      themeOverridesForType != null -> themeOverridesForType
+      // type can be null if override is empty `"wallpaper": "{}"`, in this case no wallpaper is needed, empty.
+      // It's not null to override upper level wallpaper
+      perChatTheme?.wallpaper != null -> perChatTheme.wallpaper.toAppWallpaper().type
+      perUserTheme?.wallpaper != null -> perUserTheme.wallpaper.toAppWallpaper().type
+      else -> wallpaper?.toAppWallpaper()?.type ?: return AppWallpaper()
+    }
+    val first: ThemeWallpaper? = if (mainType.sameType(perChatTheme?.wallpaper?.toAppWallpaper()?.type)) perChatTheme?.wallpaper else null
+    val second: ThemeWallpaper? = if (mainType.sameType(perUserTheme?.wallpaper?.toAppWallpaper()?.type)) perUserTheme?.wallpaper else null
+    val third: ThemeWallpaper? = if (mainType.sameType(this.wallpaper?.toAppWallpaper()?.type)) this.wallpaper else null
+
+    return AppWallpaper(type = when (mainType) {
+        is WallpaperType.Preset -> mainType.copy(
+          scale = mainType.scale ?: first?.scale ?: second?.scale ?: third?.scale
+        )
+        is WallpaperType.Image -> mainType.copy(
+          scale = if (themeOverridesForType == null) mainType.scale ?: first?.scale ?: second?.scale ?: third?.scale else second?.scale ?: third?.scale ?: mainType.scale,
+          scaleType = if (themeOverridesForType == null) mainType.scaleType ?: first?.scaleType ?: second?.scaleType ?: third?.scaleType else second?.scaleType ?: third?.scaleType ?: mainType.scaleType,
+          filename = if (themeOverridesForType == null) mainType.filename else first?.imageFile ?: second?.imageFile ?: third?.imageFile ?: mainType.filename,
+        )
+        is WallpaperType.Empty -> mainType
+      },
+      background = (first?.background ?: second?.background ?: third?.background)?.colorFromReadableHex() ?: mainType.defaultBackgroundColor(base, materialBackgroundColor),
+      tint = (first?.tint ?: second?.tint ?: third?.tint)?.colorFromReadableHex() ?: mainType.defaultTintColor(base)
+    )
+  }
+
+  fun withFilledColors(base: DefaultTheme, perChatTheme: ThemeColors?, perChatWallpaperType: WallpaperType?, perUserTheme: ThemeColors?, perUserWallpaperType: WallpaperType?, presetWallpaperTheme: ThemeColors?): ThemeColors {
+    val c = toColors(base, perChatTheme, perUserTheme, presetWallpaperTheme)
+    val ac = toAppColors(base, perChatTheme, perChatWallpaperType, perUserTheme, perUserWallpaperType, presetWallpaperTheme)
    return ThemeColors(
      primary = c.primary.toReadableHex(),
      primaryVariant = c.primaryVariant.toReadableHex(),
@@ -139,23 +419,71 @@ data class ThemeColors(
      background = c.background.toReadableHex(),
      surface = c.surface.toReadableHex(),
      title = ac.title.toReadableHex(),
+      primaryVariant2 = ac.primaryVariant2.toReadableHex(),
      sentMessage = ac.sentMessage.toReadableHex(),
-      receivedMessage = ac.receivedMessage.toReadableHex()
+      sentQuote = ac.sentQuote.toReadableHex(),
+      receivedMessage = ac.receivedMessage.toReadableHex(),
+      receivedQuote = ac.receivedQuote.toReadableHex(),
    )
  }
 }

-private fun String.colorFromReadableHex(): Color =
-  Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
+fun List<ThemeOverrides>.getTheme(themeId: String?): ThemeOverrides? =
+  firstOrNull { it.themeId == themeId }

-private fun Color.toReadableHex(): String = "#" + Integer.toHexString(toArgb())
+fun List<ThemeOverrides>.getTheme(themeId: String?, type: WallpaperType?, base: DefaultTheme): ThemeOverrides? =
+  firstOrNull { it.themeId == themeId || it.isSame(type, base.themeName)}
+
+fun List<ThemeOverrides>.replace(theme: ThemeOverrides): List<ThemeOverrides> {
+  val index = indexOfFirst { it.themeId == theme.themeId ||
+      // prevent situation when two themes has the same type but different theme id (maybe something was changed in prefs by hand)
+      it.isSame(WallpaperType.from(theme.wallpaper), theme.base.themeName)
+  }
+  return if (index != -1) {
+    val a = ArrayList(this)
+    a[index] = theme
+    a
+  } else {
+    this + theme
+  }
+}
+
+fun List<ThemeOverrides>.sameTheme(type: WallpaperType?, themeName: String): ThemeOverrides? = firstOrNull { it.isSame(type, themeName) }
+
+/** See [ThemesTest.testSkipDuplicates] */
+fun List<ThemeOverrides>.skipDuplicates(): List<ThemeOverrides> {
+  val res = ArrayList<ThemeOverrides>()
+  forEach { theme ->
+    val themeType = WallpaperType.from(theme.wallpaper)
+    if (res.none { it.themeId == theme.themeId || it.isSame(themeType, theme.base.themeName) }) {
+      res.add(theme)
+    }
+  }
+  return res
+}

@Serializable
-data class ThemeOverrides (
-  val base: DefaultTheme,
-  val colors: ThemeColors
+data class ThemeModeOverrides (
+  val light: ThemeModeOverride? = null,
+  val dark: ThemeModeOverride? = null
 ) {
-  fun withUpdatedColor(name: ThemeColor, color: String): ThemeOverrides {
+  fun preferredMode(darkTheme: Boolean): ThemeModeOverride? = when (darkTheme) {
+    false -> light
+    else -> dark
+  }
+}
+
+@Serializable
+data class ThemeModeOverride (
+  val mode: DefaultThemeMode = CurrentColors.value.base.mode,
+  val colors: ThemeColors = ThemeColors(),
+  val wallpaper: ThemeWallpaper? = null,
+) {
+
+  @Transient
+  val type = WallpaperType.from(wallpaper)
+
+  fun withUpdatedColor(name: ThemeColor, color: String?): ThemeModeOverride {
    return copy(colors = when (name) {
      ThemeColor.PRIMARY -> colors.copy(primary = color)
      ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
@@ -164,9 +492,27 @@ data class ThemeOverrides (
      ThemeColor.BACKGROUND -> colors.copy(background = color)
      ThemeColor.SURFACE -> colors.copy(surface = color)
      ThemeColor.TITLE -> colors.copy(title = color)
+      ThemeColor.PRIMARY_VARIANT2 -> colors.copy(primaryVariant2 = color)
      ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
+      ThemeColor.SENT_QUOTE -> colors.copy(sentQuote = color)
      ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
-    })
+      ThemeColor.RECEIVED_QUOTE -> colors.copy(receivedQuote = color)
+      ThemeColor.WALLPAPER_BACKGROUND -> colors.copy()
+      ThemeColor.WALLPAPER_TINT -> colors.copy()
+    }, wallpaper = when (name) {
+      ThemeColor.WALLPAPER_BACKGROUND -> wallpaper?.copy(background = color)
+      ThemeColor.WALLPAPER_TINT -> wallpaper?.copy(tint = color)
+      else -> wallpaper?.copy()
+    }
+    )
+  }
+  companion object {
+    fun withFilledAppDefaults(mode: DefaultThemeMode, base: DefaultTheme): ThemeModeOverride =
+      ThemeModeOverride(
+        mode = mode,
+        colors = ThemeOverrides(base = base).withFilledColors(base, null, null, null, null, null),
+        wallpaper = ThemeWallpaper(preset = PresetWallpaper.SCHOOL.filename)
+      )
  }
 }

@@ -204,7 +550,6 @@ val DarkColorPalette = darkColors(
 //  background = Color.Black,
  surface = Color(0xFF222222),
 //  background = Color(0xFF121212),
-//  surface = Color(0xFF121212),
  error = Color.Red,
  onBackground = Color(0xFFFFFBFA),
  onSurface = Color(0xFFFFFBFA),
@@ -212,8 +557,11 @@ val DarkColorPalette = darkColors(
 )
 val DarkColorPaletteApp = AppColors(
  title = SimplexBlue,
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFF18262E),
+  sentMessage = Color(0xFF18262E),
+  sentQuote = Color(0xFF1D3847),
+  receivedMessage = Color(0xff262627),
+  receivedQuote = Color(0xff373739),
 )

 val LightColorPalette = lightColors(
@@ -231,8 +579,11 @@ val LightColorPalette = lightColors(
 )
 val LightColorPaletteApp = AppColors(
  title = SimplexBlue,
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFFE9F7FF),
+  sentMessage = Color(0xFFE9F7FF),
+  sentQuote = Color(0xFFD6F0FF),
+  receivedMessage = Color(0xfff5f5f6),
+  receivedQuote = Color(0xffececee),
 )

 val SimplexColorPalette = darkColors(
@@ -251,11 +602,39 @@ val SimplexColorPalette = darkColors(
 )
 val SimplexColorPaletteApp = AppColors(
  title = Color(0xFF267BE5),
-  sentMessage = SentMessageColor,
-  receivedMessage = Color(0x20B1B0B5)
+  primaryVariant2 = Color(0xFF172941),
+  sentMessage = Color(0xFF172941),
+  sentQuote = Color(0xFF1C3A57),
+  receivedMessage = Color(0xff25283a),
+  receivedQuote = Color(0xff36394a),
 )

-val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))
+val BlackColorPalette = darkColors(
+  primary = Color(0xff0077e0),  // If this value changes also need to update #0088ff in string resource files
+  primaryVariant = Color(0xff0077e0),
+  secondary = HighOrLowlight,
+  secondaryVariant = DarkGray,
+  background = Color(0xff070707),
+  surface = Color(0xff161617),
+  //  background = Color(0xFF121212),
+  //  surface = Color(0xFF121212),
+  error = Color.Red,
+  onBackground = Color(0xFFFFFBFA),
+  onSurface = Color(0xFFFFFBFA),
+  //  onError: Color = Color.Black,
+)
+val BlackColorPaletteApp = AppColors(
+  title = Color(0xff0077e0),
+  primaryVariant2 = Color(0xff243747),
+  sentMessage = Color(0xFF18262E),
+  sentQuote = Color(0xFF1D3847),
+  receivedMessage = Color(0xff1b1b1b),
+  receivedQuote = Color(0xff29292b),
+)
+
+var systemInDarkThemeCurrently: Boolean = isInNightMode()
+
+val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get()))

@Composable
 fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLight
@@ -263,31 +642,113 @@ fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLi
@Composable
 expect fun isSystemInDarkTheme(): Boolean

+internal val LocalAppColors = staticCompositionLocalOf { LightColorPaletteApp }
+internal val LocalAppWallpaper = staticCompositionLocalOf { AppWallpaper() }
+
+val MaterialTheme.appColors: AppColors
+  @Composable
+  @ReadOnlyComposable
+  get() = LocalAppColors.current
+
+fun AppColors.updateColorsFrom(other: AppColors) {
+  title = other.title
+  primaryVariant2 = other.primaryVariant2
+  sentMessage = other.sentMessage
+  sentQuote = other.sentQuote
+  receivedMessage = other.receivedMessage
+  receivedQuote = other.receivedQuote
+}
+
+fun AppWallpaper.updateWallpaperFrom(other: AppWallpaper) {
+  background = other.background
+  tint = other.tint
+  type = other.type
+}
+
+val MaterialTheme.wallpaper: AppWallpaper
+  @Composable
+  @ReadOnlyComposable
+  get() = LocalAppWallpaper.current
+
 fun reactOnDarkThemeChanges(isDark: Boolean) {
-  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM.name && CurrentColors.value.colors.isLight == isDark) {
+  systemInDarkThemeCurrently = isDark
+  if (ChatController.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.value.colors.isLight == isDark) {
    // Change active colors from light to dark and back based on system theme
-    ThemeManager.applyTheme(DefaultTheme.SYSTEM.name, isDark)
+    ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
  }
 }

@Composable
 fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
-  LaunchedEffect(darkTheme) {
-    // For preview
-    if (darkTheme != null)
-      CurrentColors.value = ThemeManager.currentColors(darkTheme)
-  }
-  val systemDark = isSystemInDarkTheme()
-  LaunchedEffect(systemDark) {
-    reactOnDarkThemeChanges(systemDark)
+// TODO: Fix preview working with dark/light theme
+
+//  LaunchedEffect(darkTheme) {
+//    // For preview
+//    if (darkTheme != null)
+//      CurrentColors.value = ThemeManager.currentColors(darkTheme, null, null, chatModel.currentUser.value?.uiThemes, appPreferences.themeOverrides.get())
+//  }
+  val systemDark = rememberUpdatedState(isSystemInDarkTheme())
+  LaunchedEffect(Unit) {
+    // snapshotFlow vs LaunchedEffect reduce number of recomposes
+    snapshotFlow { systemDark.value }
+      .collect {
+        reactOnDarkThemeChanges(systemDark.value)
+      }
  }
  val theme by CurrentColors.collectAsState()
+  LaunchedEffect(Unit) {
+    // snapshotFlow vs LaunchedEffect reduce number of recomposes when user is changed or it's themes
+    snapshotFlow { chatModel.currentUser.value?.uiThemes }
+      .collect {
+        ThemeManager.applyTheme(appPrefs.currentTheme.get()!!)
+      }
+  }
  MaterialTheme(
    colors = theme.colors,
    typography = Typography,
    shapes = Shapes,
    content = {
-      CompositionLocalProvider(LocalContentColor provides MaterialTheme.colors.onBackground, content = content)
+      val rememberedAppColors = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [appColors]
+        // provided, and overwrite the values set in it.
+        theme.appColors.copy()
+      }.apply { updateColorsFrom(theme.appColors) }
+      val rememberedWallpaper = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [wallpaper]
+        // provided, and overwrite the values set in it.
+        theme.wallpaper.copy()
+      }.apply { updateWallpaperFrom(theme.wallpaper) }
+      CompositionLocalProvider(
+        LocalContentColor provides MaterialTheme.colors.onBackground,
+        LocalAppColors provides rememberedAppColors,
+        LocalAppWallpaper provides rememberedWallpaper,
+        content = content)
+    }
+  )
+}
+
+@Composable
+fun SimpleXThemeOverride(theme: ThemeManager.ActiveTheme, content: @Composable () -> Unit) {
+  MaterialTheme(
+    colors = theme.colors,
+    typography = Typography,
+    shapes = Shapes,
+    content = {
+      val rememberedAppColors = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [appColors]
+        // provided, and overwrite the values set in it.
+        theme.appColors.copy()
+      }.apply { updateColorsFrom(theme.appColors) }
+      val rememberedWallpaper = remember {
+        // Explicitly creating a new object here so we don't mutate the initial [wallpaper]
+        // provided, and overwrite the values set in it.
+        theme.wallpaper.copy()
+      }.apply { updateWallpaperFrom(theme.wallpaper) }
+      CompositionLocalProvider(
+        LocalContentColor provides MaterialTheme.colors.onBackground,
+        LocalAppColors provides rememberedAppColors,
+        LocalAppWallpaper provides rememberedWallpaper,
+        content = content)
    }
  )
 }
@@ -1,14 +1,14 @@
 package chat.simplex.common.ui.theme

 import androidx.compose.material.Colors
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.text.font.FontFamily
-import chat.simplex.res.MR
-import chat.simplex.common.model.AppPreferences
-import chat.simplex.common.model.ChatController
-import chat.simplex.common.platform.platform
-import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.views.helpers.*
+import java.io.File

 // https://github.com/rsms/inter
 // I place it here because IDEA shows an error (but still works anyway) when this declaration inside Type.kt
@@ -18,140 +18,215 @@ expect val EmojiFont: FontFamily
 object ThemeManager {
  private val appPrefs: AppPreferences = ChatController.appPrefs

-  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors)
+  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors, val wallpaper: AppWallpaper = AppWallpaper())

  private fun systemDarkThemeColors(): Pair<Colors, DefaultTheme> = when (appPrefs.systemDarkTheme.get()) {
-    DefaultTheme.DARK.name -> DarkColorPalette to DefaultTheme.DARK
-    DefaultTheme.SIMPLEX.name -> SimplexColorPalette to DefaultTheme.SIMPLEX
+    DefaultTheme.DARK.themeName -> DarkColorPalette to DefaultTheme.DARK
+    DefaultTheme.SIMPLEX.themeName -> SimplexColorPalette to DefaultTheme.SIMPLEX
+    DefaultTheme.BLACK.themeName -> BlackColorPalette to DefaultTheme.BLACK
    else -> SimplexColorPalette to DefaultTheme.SIMPLEX
  }

-  fun currentColors(darkForSystemTheme: Boolean): ActiveTheme {
+  private fun nonSystemThemeName(): String {
    val themeName = appPrefs.currentTheme.get()!!
-    val themeOverrides = appPrefs.themeOverrides.get()
-
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
+    return if (themeName != DefaultTheme.SYSTEM_THEME_NAME) {
      themeName
    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+      if (systemInDarkThemeCurrently) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.themeName
    }
-    val theme = themeOverrides[nonSystemThemeName]
+  }
+
+  fun defaultActiveTheme(appSettingsTheme: List<ThemeOverrides>): ThemeOverrides? {
+    val nonSystemThemeName = nonSystemThemeName()
+    val defaultThemeId = appPrefs.currentThemeIds.get()[nonSystemThemeName]
+    return appSettingsTheme.getTheme(defaultThemeId)
+  }
+
+  fun defaultActiveTheme(perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ThemeModeOverride {
+    val perUserTheme = if (!CurrentColors.value.colors.isLight) perUserTheme?.dark else perUserTheme?.light
+    if (perUserTheme != null) {
+      return perUserTheme
+    }
+    val defaultTheme = defaultActiveTheme(appSettingsTheme)
+    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper)
+  }
+
+  fun currentColors(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ActiveTheme {
+    val themeName = appPrefs.currentTheme.get()!!
+    val nonSystemThemeName = nonSystemThemeName()
+    val defaultTheme = defaultActiveTheme(appSettingsTheme)
+
    val baseTheme = when (nonSystemThemeName) {
-      DefaultTheme.LIGHT.name -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-      DefaultTheme.DARK.name -> Triple(DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp)
-      DefaultTheme.SIMPLEX.name -> Triple(DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp)
-      else -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
+      DefaultTheme.LIGHT.themeName -> ActiveTheme(DefaultTheme.LIGHT.themeName, DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.LIGHT)))
+      DefaultTheme.DARK.themeName -> ActiveTheme(DefaultTheme.DARK.themeName, DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.DARK)))
+      DefaultTheme.SIMPLEX.themeName -> ActiveTheme(DefaultTheme.SIMPLEX.themeName, DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.SIMPLEX)))
+      DefaultTheme.BLACK.themeName -> ActiveTheme(DefaultTheme.BLACK.themeName, DefaultTheme.BLACK, BlackColorPalette, BlackColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.BLACK)))
+      else -> ActiveTheme(DefaultTheme.LIGHT.themeName, DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp, AppWallpaper(type = PresetWallpaper.SCHOOL.toType(DefaultTheme.LIGHT)))
    }
-    if (theme == null) {
-      return ActiveTheme(themeName, baseTheme.first, baseTheme.second, baseTheme.third)
+
+    val perUserTheme = if (baseTheme.colors.isLight) perUserTheme?.light else perUserTheme?.dark
+    val theme = (appSettingsTheme.sameTheme(themeOverridesForType ?: perChatTheme?.type ?: perUserTheme?.type ?: defaultTheme?.wallpaper?.toAppWallpaper()?.type, nonSystemThemeName) ?: defaultTheme)
+
+    if (theme == null && perUserTheme == null && perChatTheme == null && themeOverridesForType == null) {
+      return ActiveTheme(themeName, baseTheme.base, baseTheme.colors, baseTheme.appColors, baseTheme.wallpaper)
    }
-    return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.base))
+    val presetWallpaperTheme = when {
+      perChatTheme?.wallpaper != null -> if (perChatTheme.wallpaper.preset != null) PresetWallpaper.from(perChatTheme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+      perUserTheme?.wallpaper != null -> if (perUserTheme.wallpaper.preset != null) PresetWallpaper.from(perUserTheme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+      else -> if (theme?.wallpaper?.preset != null) PresetWallpaper.from(theme.wallpaper.preset)?.colors?.get(baseTheme.base) else null
+    }
+    val themeOrEmpty = theme ?: ThemeOverrides(base = baseTheme.base)
+    val colors = themeOrEmpty.toColors(themeOrEmpty.base, perChatTheme?.colors, perUserTheme?.colors, presetWallpaperTheme)
+    return ActiveTheme(
+      themeName,
+      baseTheme.base,
+      colors,
+      themeOrEmpty.toAppColors(themeOrEmpty.base, perChatTheme?.colors, perChatTheme?.type, perUserTheme?.colors, perUserTheme?.type, presetWallpaperTheme),
+      themeOrEmpty.toAppWallpaper(themeOverridesForType, perChatTheme, perUserTheme, colors.background)
+    )
  }

-  fun currentThemeOverridesForExport(darkForSystemTheme: Boolean): ThemeOverrides {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val nonFilledTheme = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    return nonFilledTheme.copy(colors = nonFilledTheme.colors.withFilledColors(CurrentColors.value.base))
+  fun currentThemeOverridesForExport(perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?): ThemeOverrides {
+    val current = currentColors(null, perChatTheme, perUserTheme, appPrefs.themeOverrides.get())
+    val wType = current.wallpaper.type
+    val wBackground = current.wallpaper.background
+    val wTint = current.wallpaper.tint
+    return ThemeOverrides(
+      themeId = "",
+      base = current.base,
+      colors = ThemeColors.from(current.colors, current.appColors),
+      wallpaper = if (wType !is WallpaperType.Empty) ThemeWallpaper.from(wType, wBackground?.toReadableHex(), wTint?.toReadableHex()).withFilledWallpaperBase64() else null
+    )
  }

-  // colors, default theme enum, localized name of theme
-  fun allThemes(darkForSystemTheme: Boolean): List<Triple<Colors, DefaultTheme, String>> {
-    val allThemes = ArrayList<Triple<Colors, DefaultTheme, String>>()
-    allThemes.add(
-      Triple(
-        if (darkForSystemTheme) systemDarkThemeColors().first else LightColorPalette,
-        DefaultTheme.SYSTEM,
-        generalGetString(MR.strings.theme_system)
-      )
-    )
-    allThemes.add(
-      Triple(
-        LightColorPalette,
-        DefaultTheme.LIGHT,
-        generalGetString(MR.strings.theme_light)
-      )
-    )
-    allThemes.add(
-      Triple(
-        DarkColorPalette,
-        DefaultTheme.DARK,
-        generalGetString(MR.strings.theme_dark)
-      )
-    )
-    allThemes.add(
-      Triple(
-        SimplexColorPalette,
-        DefaultTheme.SIMPLEX,
-        generalGetString(MR.strings.theme_simplex)
-      )
-    )
-    return allThemes
-  }
-
-  fun applyTheme(theme: String, darkForSystemTheme: Boolean) {
+  fun applyTheme(theme: String) {
    appPrefs.currentTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
    platform.androidSetNightModeIfSupported()
  }

-  fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {
+  fun changeDarkTheme(theme: String) {
    appPrefs.systemDarkTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
  }

-  fun saveAndApplyThemeColor(name: ThemeColor, color: Color? = null, darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+  fun saveAndApplyThemeColor(baseTheme: DefaultTheme, name: ThemeColor, color: Color? = null, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = baseTheme.themeName
+    val overrides = pref.get()
+    val themeId = appPrefs.currentThemeIds.get()[nonSystemThemeName]
+    val prevValue = overrides.getTheme(themeId) ?: ThemeOverrides(base = baseTheme)
+    pref.set(overrides.replace(prevValue.withUpdatedColor(name, color?.toReadableHex())))
+    val themeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    themeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(themeIds)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun applyThemeColor(name: ThemeColor, color: Color? = null, pref: MutableState<ThemeModeOverride>) {
+    pref.value = pref.value.withUpdatedColor(name, color?.toReadableHex())
+  }
+
+  fun saveAndApplyWallpaper(baseTheme: DefaultTheme, type: WallpaperType?, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = baseTheme.themeName
+    val overrides = pref.get()
+    val theme = overrides.sameTheme(type, baseTheme.themeName)
+    val prevValue = theme ?: ThemeOverrides(base = baseTheme)
+    pref.set(overrides.replace(prevValue.copy(wallpaper = if (type != null && type !is WallpaperType.Empty) ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint) else null)))
+    val themeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    themeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(themeIds)
+    CurrentColors.value = currentColors( null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun copyFromSameThemeOverrides(type: WallpaperType?, lowerLevelOverride: ThemeModeOverride?, pref: MutableState<ThemeModeOverride>): Boolean {
+    val overrides = appPrefs.themeOverrides.get()
+    val sameWallpaper = if (lowerLevelOverride?.type?.sameType(type) == true) lowerLevelOverride.wallpaper else overrides.sameTheme(type, CurrentColors.value.base.themeName)?.wallpaper
+    if (sameWallpaper == null) {
+      if (type != null) {
+        pref.value = ThemeModeOverride(wallpaper = ThemeWallpaper.from(type, null, null).copy(scale = null, scaleType = null))
+      } else {
+        // Make an empty wallpaper to override any top level ones
+        pref.value = ThemeModeOverride(wallpaper = ThemeWallpaper())
+      }
+      return true
    }
-    var colorToSet = color
-    if (colorToSet == null) {
-      // Setting default color from a base theme
-      colorToSet = when(nonSystemThemeName) {
-        DefaultTheme.LIGHT.name -> name.fromColors(LightColorPalette, LightColorPaletteApp)
-        DefaultTheme.DARK.name -> name.fromColors(DarkColorPalette, DarkColorPaletteApp)
-        DefaultTheme.SIMPLEX.name -> name.fromColors(SimplexColorPalette, SimplexColorPaletteApp)
-        // Will not be here
-        else -> return
+    var type = sameWallpaper.toAppWallpaper().type
+    if (type is WallpaperType.Image && sameWallpaper.imageFile == type.filename) {
+      // same image file. Needs to be copied first in order to be able to remove the file once it's not needed anymore without affecting main theme override
+      val filename = saveWallpaperFile(File(getWallpaperFilePath(type.filename)).toURI())
+      if (filename != null) {
+        type = WallpaperType.Image(filename, type.scale, type.scaleType)
+      } else {
+        Log.e(TAG, "Error while copying wallpaper from global overrides to chat overrides")
+        return false
      }
    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[nonSystemThemeName] = prevValue.withUpdatedColor(name, colorToSet.toReadableHex())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
+    val prevValue = pref.value
+    pref.value = prevValue.copy(
+      colors = ThemeColors(),
+      wallpaper = ThemeWallpaper.from(type, null, null).copy(scale = null, scaleType = null)
+    )
+    return true
  }

-  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, darkForSystemTheme: Boolean) {
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[theme.base.name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[theme.base.name] = prevValue.copy(colors = theme.colors)
-    appPrefs.themeOverrides.set(overrides)
-    appPrefs.currentTheme.set(theme.base.name)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
+  fun applyWallpaper(type: WallpaperType?, pref: MutableState<ThemeModeOverride>) {
+    val prevValue = pref.value
+    pref.value = prevValue.copy(
+      wallpaper = if (type != null)
+        ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
+      else null
+    )
  }

-  fun resetAllThemeColors(darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val wallpaper = theme.wallpaper?.importFromString()
+    val nonSystemThemeName = theme.base.themeName
+    val overrides = pref.get()
+    val prevValue = overrides.getTheme(null, wallpaper?.toAppWallpaper()?.type, theme.base) ?: ThemeOverrides(base = theme.base)
+    if (prevValue.wallpaper?.imageFile != null) {
+      File(getWallpaperFilePath(prevValue.wallpaper.imageFile)).delete()
+    }
+    pref.set(overrides.replace(prevValue.copy(base = theme.base, colors = theme.colors, wallpaper = wallpaper)))
+    appPrefs.currentTheme.set(nonSystemThemeName)
+    val currentThemeIds = appPrefs.currentThemeIds.get().toMutableMap()
+    currentThemeIds[nonSystemThemeName] = prevValue.themeId
+    appPrefs.currentThemeIds.set(currentThemeIds)
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun resetAllThemeColors(pref: SharedPreference<List<ThemeOverrides>> = appPrefs.themeOverrides) {
+    val nonSystemThemeName = nonSystemThemeName()
+    val themeId = appPrefs.currentThemeIds.get()[nonSystemThemeName] ?: return
+    val overrides = pref.get()
+    val prevValue = overrides.getTheme(themeId) ?: return
+    pref.set(overrides.replace(prevValue.copy(colors = ThemeColors(), wallpaper = prevValue.wallpaper?.copy(background = null, tint = null))))
+    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+
+  fun resetAllThemeColors(pref: MutableState<ThemeModeOverride>) {
+    val prevValue = pref.value
+    pref.value = prevValue.copy(colors = ThemeColors(), wallpaper = prevValue.wallpaper?.copy(background = null, tint = null))
+  }
+
+  fun removeTheme(themeId: String?) {
+    val themes = ArrayList(appPrefs.themeOverrides.get())
+    themes.removeAll { it.themeId == themeId }
+    appPrefs.themeOverrides.set(themes)
+  }
+
+  fun String.colorFromReadableHex(): Color =
+    Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
+
+  fun Color.toReadableHex(): String {
+    val s = Integer.toHexString(toArgb())
+    return when {
+      this == Color.Transparent -> "#00ffffff"
+      s.length == 1 -> "#ff$s$s$s$s$s$s"
+      s.length == 2 -> "#ff$s$s$s"
+      s.length == 3 -> "#ff$s$s"
+      s.length == 6 && this.alpha == 0f -> "#00$s"
+      s.length == 6 -> "#ff$s"
+      else -> "#$s"
    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: return
-    overrides[nonSystemThemeName] = prevValue.copy(colors = ThemeColors())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
  }
 }
-
-private fun Color.toReadableHex(): String = "#" + Integer.toHexString(toArgb())
@@ -29,6 +29,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -337,6 +338,16 @@ fun ChatInfoLayout(
        if (cStats != null && cStats.ratchetSyncAllowed) {
          SynchronizeConnectionButton(syncContactConnection)
        }
+
+        WallpaperButton {
+          ModalManager.end.showModal {
+            val chat = remember { derivedStateOf { chatModel.chats.firstOrNull { it.id == chat.id } } }
+            val c = chat.value
+            if (c != null) {
+              ChatWallpaperEditorModal(c)
+            }
+          }
+        }
        //      } else if (developerTools) {
        //        SynchronizeConnectionButtonForce(syncContactConnectionForce)
        //      }
@@ -642,6 +653,15 @@ private fun SendReceiptsOption(currentUser: User, state: State<SendReceipts>, on
  )
 }

+@Composable
+fun WallpaperButton(onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_image),
+    stringResource(MR.strings.settings_section_title_chat_theme),
+    click = onClick
+  )
+}
+
@Composable
 fun ClearChatButton(onClick: () -> Unit) {
  SettingsActionItem(
@@ -675,6 +695,51 @@ fun ShareAddressButton(onClick: () -> Unit) {
  )
 }

+@Composable
+fun ModalData.ChatWallpaperEditorModal(chat: Chat) {
+  val themes = remember(CurrentColors.collectAsState().value.base) {
+    (chat.chatInfo as? ChatInfo.Direct)?.contact?.uiThemes
+      ?: (chat.chatInfo as? ChatInfo.Group)?.groupInfo?.uiThemes
+      ?: ThemeModeOverrides()
+  }
+  val globalThemeUsed = remember { stateGetOrPut("globalThemeUsed") { false }  }
+  val initialTheme = remember(CurrentColors.collectAsState().value.base) {
+    val preferred = themes.preferredMode(!CurrentColors.value.colors.isLight)
+    globalThemeUsed.value = preferred == null
+    preferred ?: ThemeManager.defaultActiveTheme(chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+  }
+  ChatWallpaperEditor(
+    initialTheme,
+    applyToMode = if (themes.light == themes.dark) null else initialTheme.mode,
+    globalThemeUsed = globalThemeUsed,
+    save = { applyToMode, newTheme ->
+      save(applyToMode, newTheme, chatModel.getChat(chat.id) ?: chat)
+    })
+}
+
+suspend fun save(applyToMode: DefaultThemeMode?, newTheme: ThemeModeOverride?, chat: Chat) {
+  val unchangedThemes: ThemeModeOverrides = ((chat.chatInfo as? ChatInfo.Direct)?.contact?.uiThemes ?: (chat.chatInfo as? ChatInfo.Group)?.groupInfo?.uiThemes) ?: ThemeModeOverrides()
+  val wallpaperFiles = listOf(unchangedThemes.light?.wallpaper?.imageFile, unchangedThemes.dark?.wallpaper?.imageFile)
+  var changedThemes: ThemeModeOverrides? = unchangedThemes
+  val changed = newTheme?.copy(wallpaper = newTheme.wallpaper?.withFilledWallpaperPath())
+  changedThemes = when (applyToMode) {
+    null -> changedThemes?.copy(light = changed?.copy(mode = DefaultThemeMode.LIGHT), dark = changed?.copy(mode = DefaultThemeMode.DARK))
+    DefaultThemeMode.LIGHT -> changedThemes?.copy(light = changed?.copy(mode = applyToMode))
+    DefaultThemeMode.DARK -> changedThemes?.copy(dark = changed?.copy(mode = applyToMode))
+  }
+  changedThemes = if (changedThemes?.light != null || changedThemes?.dark != null) changedThemes else null
+  val wallpaperFilesToDelete = wallpaperFiles - changedThemes?.light?.wallpaper?.imageFile - changedThemes?.dark?.wallpaper?.imageFile
+  wallpaperFilesToDelete.forEach(::removeWallpaperFile)
+
+  if (controller.apiSetChatUIThemes(chat.remoteHostId, chat.id, changedThemes)) {
+    if (chat.chatInfo is ChatInfo.Direct) {
+      chatModel.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(contact = chat.chatInfo.contact.copy(uiThemes = changedThemes)))
+    } else if (chat.chatInfo is ChatInfo.Group) {
+      chatModel.updateChatInfo(chat.remoteHostId, chat.chatInfo.copy(groupInfo = chat.chatInfo.groupInfo.copy(uiThemes = changedThemes)))
+    }
+  }
+}
+
 private fun setContactAlias(chat: Chat, localAlias: String, chatModel: ChatModel) = withBGApi {
  val chatRh = chat.remoteHostId
  chatModel.controller.apiSetContactAlias(chatRh, chat.chatInfo.apiId, localAlias)?.let {
@@ -42,7 +42,7 @@ sealed class CIInfoTab {
@Composable
 fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
  val sent = ci.chatDir.sent
-  val appColors = CurrentColors.collectAsState().value.appColors
+  val appColors = MaterialTheme.appColors
  val uriHandler = LocalUriHandler.current
  val selection = remember { mutableStateOf<CIInfoTab>(CIInfoTab.History) }

@@ -304,7 +304,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
  }

  @Composable
-  fun MemberDeliveryStatusView(member: GroupMember, status: CIStatus) {
+  fun MemberDeliveryStatusView(member: GroupMember, status: CIStatus, sentViaProxy: Boolean?) {
    SectionItemView(
      padding = PaddingValues(horizontal = 0.dp)
    ) {
@@ -317,6 +317,18 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
        overflow = TextOverflow.Ellipsis
      )
      Spacer(Modifier.fillMaxWidth().weight(1f))
+      if (sentViaProxy == true) {
+        Box(
+          Modifier.size(36.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          Icon(
+            painterResource(MR.images.ic_arrow_forward),
+            contentDescription = null,
+            tint = CurrentColors.value.colors.secondary
+          )
+        }
+      }
      val statusIcon = status.statusIcon(MaterialTheme.colors.primary, CurrentColors.value.colors.secondary)
      var modifier = Modifier.size(36.dp).clip(RoundedCornerShape(20.dp))
      val info = status.statusInto
@@ -357,8 +369,8 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
      if (mss.isNotEmpty()) {
        SectionView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
          Text(stringResource(MR.strings.delivery), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = DEFAULT_PADDING))
-          mss.forEach { (member, status) ->
-            MemberDeliveryStatusView(member, status)
+          mss.forEach { (member, status, sentViaProxy) ->
+            MemberDeliveryStatusView(member, status, sentViaProxy)
          }
        }
      } else {
@@ -482,10 +494,10 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools
  }
 }

-private fun membersStatuses(chatModel: ChatModel, memberDeliveryStatuses: List<MemberDeliveryStatus>): List<Pair<GroupMember, CIStatus>> {
+private fun membersStatuses(chatModel: ChatModel, memberDeliveryStatuses: List<MemberDeliveryStatus>): List<Triple<GroupMember, CIStatus, Boolean?>> {
  return memberDeliveryStatuses.mapNotNull { mds ->
    chatModel.getGroupMember(mds.groupMemberId)?.let { mem ->
-      mem to mds.memberDeliveryStatus
+      Triple(mem, mds.memberDeliveryStatus, mds.sentViaProxy)
    }
  }
 }
@@ -5,25 +5,24 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.shape.CircleShape
 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.clip
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.text.*
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
@@ -118,368 +117,373 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
    val clipboard = LocalClipboardManager.current
    when (chat.chatInfo) {
      is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
-        ChatLayout(
-          chat,
-          unreadCount,
-          composeState,
-          composeView = {
-            Column(
-              Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-              if (
-                chat.chatInfo is ChatInfo.Direct
-                && !chat.chatInfo.contact.ready
-                && chat.chatInfo.contact.active
-                && !chat.chatInfo.contact.nextSendGrpInv
+        val perChatTheme = remember(chat.chatInfo, CurrentColors.value.base) { if (chat.chatInfo is ChatInfo.Direct) chat.chatInfo.contact.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else if (chat.chatInfo is ChatInfo.Group) chat.chatInfo.groupInfo.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else null }
+        val overrides = if (perChatTheme != null) ThemeManager.currentColors(null, perChatTheme, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get()) else null
+        SimpleXThemeOverride(overrides ?: CurrentColors.collectAsState().value) {
+          ChatLayout(
+            chat,
+            unreadCount,
+            composeState,
+            composeView = {
+              Column(
+                Modifier.fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally
              ) {
-                Text(
-                  generalGetString(MR.strings.contact_connection_pending),
-                  Modifier.padding(top = 4.dp),
-                  fontSize = 14.sp,
-                  color = MaterialTheme.colors.secondary
+                if (
+                  chat.chatInfo is ChatInfo.Direct
+                  && !chat.chatInfo.contact.ready
+                  && chat.chatInfo.contact.active
+                  && !chat.chatInfo.contact.nextSendGrpInv
+                ) {
+                  Text(
+                    generalGetString(MR.strings.contact_connection_pending),
+                    Modifier.padding(top = 4.dp),
+                    fontSize = 14.sp,
+                    color = MaterialTheme.colors.secondary
+                  )
+                }
+                ComposeView(
+                  chatModel, chat, composeState, attachmentOption,
+                  showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
                )
              }
-              ComposeView(
-                chatModel, chat, composeState, attachmentOption,
-                showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
-              )
-            }
-          },
-          attachmentOption,
-          attachmentBottomSheetState,
-          searchText,
-          useLinkPreviews = useLinkPreviews,
-          linkMode = chatModel.simplexLinkMode.value,
-          back = {
-            hideKeyboard(view)
-            AudioPlayer.stop()
-            chatModel.chatId.value = null
-            chatModel.groupMembers.clear()
-          },
-          info = {
-            if (ModalManager.end.hasModalsOpen()) {
-              ModalManager.end.closeModals()
-              return@ChatLayout
-            }
-            hideKeyboard(view)
-            withBGApi {
-              // The idea is to preload information before showing a modal because large groups can take time to load all members
-              var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = null
-              var preloadedCode: String? = null
-              var preloadedLink: Pair<String, GroupMemberRole>? = null
-              if (chat.chatInfo is ChatInfo.Direct) {
-                preloadedContactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-                preloadedCode = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-              } else if (chat.chatInfo is ChatInfo.Group) {
-                setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
-                preloadedLink = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
+            },
+            attachmentOption,
+            attachmentBottomSheetState,
+            searchText,
+            useLinkPreviews = useLinkPreviews,
+            linkMode = chatModel.simplexLinkMode.value,
+            back = {
+              hideKeyboard(view)
+              AudioPlayer.stop()
+              chatModel.chatId.value = null
+              chatModel.groupMembers.clear()
+            },
+            info = {
+              if (ModalManager.end.hasModalsOpen()) {
+                ModalManager.end.closeModals()
+                return@ChatLayout
              }
-              ModalManager.end.showModalCloseable(true) { close ->
-                val chat = remember { activeChat }.value
-                if (chat?.chatInfo is ChatInfo.Direct) {
-                  var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
-                  var code: String? by remember { mutableStateOf(preloadedCode) }
-                  KeyChangeEffect(chat.id, ChatModel.networkStatuses.toMap()) {
-                    contactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-                    preloadedContactInfo = contactInfo
-                    code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-                    preloadedCode = code
-                  }
-                  ChatInfoView(chatModel, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
-                } else if (chat?.chatInfo is ChatInfo.Group) {
-                  var link: Pair<String, GroupMemberRole>? by remember(chat.id) { mutableStateOf(preloadedLink) }
-                  KeyChangeEffect(chat.id) {
-                    setGroupMembers(chatRh, (chat.chatInfo as ChatInfo.Group).groupInfo, chatModel)
-                    link = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
-                    preloadedLink = link
-                  }
-                  GroupChatInfoView(chatModel, chatRh, chat.id, link?.first, link?.second, {
-                    link = it
-                    preloadedLink = it
-                  }, close)
-                }
-              }
-            }
-          },
-          showMemberInfo = { groupInfo: GroupInfo, member: GroupMember ->
-            hideKeyboard(view)
-            withBGApi {
-              val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
-              val stats = r?.second
-              val (_, code) = if (member.memberActive) {
-                val memCode = chatModel.controller.apiGetGroupMemberCode(chatRh, groupInfo.apiId, member.groupMemberId)
-                member to memCode?.second
-              } else {
-                member to null
-              }
-              setGroupMembers(chatRh, groupInfo, chatModel)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) { close ->
-                remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
-                  GroupMemberInfoView(chatRh, groupInfo, mem, stats, code, chatModel, close, close)
-                }
-              }
-            }
-          },
-          loadPrevMessages = {
-            if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-            val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
-            val firstId = chatModel.chatItems.value.firstOrNull()?.id
-            if (c != null && firstId != null) {
+              hideKeyboard(view)
              withBGApi {
-                apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
+                // The idea is to preload information before showing a modal because large groups can take time to load all members
+                var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = null
+                var preloadedCode: String? = null
+                var preloadedLink: Pair<String, GroupMemberRole>? = null
+                if (chat.chatInfo is ChatInfo.Direct) {
+                  preloadedContactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                  preloadedCode = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
+                } else if (chat.chatInfo is ChatInfo.Group) {
+                  setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
+                  preloadedLink = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
+                }
+                ModalManager.end.showModalCloseable(true) { close ->
+                  val chat = remember { activeChat }.value
+                  if (chat?.chatInfo is ChatInfo.Direct) {
+                    var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
+                    var code: String? by remember { mutableStateOf(preloadedCode) }
+                    KeyChangeEffect(chat.id, ChatModel.networkStatuses.toMap()) {
+                      contactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                      preloadedContactInfo = contactInfo
+                      code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
+                      preloadedCode = code
+                    }
+                    ChatInfoView(chatModel, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
+                  } else if (chat?.chatInfo is ChatInfo.Group) {
+                    var link: Pair<String, GroupMemberRole>? by remember(chat.id) { mutableStateOf(preloadedLink) }
+                    KeyChangeEffect(chat.id) {
+                      setGroupMembers(chatRh, (chat.chatInfo as ChatInfo.Group).groupInfo, chatModel)
+                      link = chatModel.controller.apiGetGroupLink(chatRh, chat.chatInfo.groupInfo.groupId)
+                      preloadedLink = link
+                    }
+                    GroupChatInfoView(chatModel, chatRh, chat.id, link?.first, link?.second, {
+                      link = it
+                      preloadedLink = it
+                    }, close)
+                  }
+                }
              }
-            }
-          },
-          deleteMessage = { itemId, mode ->
-            withBGApi {
-              val cInfo = chat.chatInfo
-              val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
-              val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
-              val groupInfo = toModerate?.first
-              val groupMember = toModerate?.second
-              val deletedChatItem: ChatItem?
-              val toChatItem: ChatItem?
-              if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
-                val r = chatModel.controller.apiDeleteMemberChatItem(
-                  chatRh,
-                  groupId = groupInfo.groupId,
-                  groupMemberId = groupMember.groupMemberId,
-                  itemId = itemId
-                )
-                deletedChatItem = r?.first
-                toChatItem = r?.second
-              } else {
-                val r = chatModel.controller.apiDeleteChatItem(
-                  chatRh,
+            },
+            showMemberInfo = { groupInfo: GroupInfo, member: GroupMember ->
+              hideKeyboard(view)
+              withBGApi {
+                val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
+                val stats = r?.second
+                val (_, code) = if (member.memberActive) {
+                  val memCode = chatModel.controller.apiGetGroupMemberCode(chatRh, groupInfo.apiId, member.groupMemberId)
+                  member to memCode?.second
+                } else {
+                  member to null
+                }
+                setGroupMembers(chatRh, groupInfo, chatModel)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) { close ->
+                  remember { derivedStateOf { chatModel.getGroupMember(member.groupMemberId) } }.value?.let { mem ->
+                    GroupMemberInfoView(chatRh, groupInfo, mem, stats, code, chatModel, close, close)
+                  }
+                }
+              }
+            },
+            loadPrevMessages = {
+              if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
+              val firstId = chatModel.chatItems.value.firstOrNull()?.id
+              if (c != null && firstId != null) {
+                withBGApi {
+                  apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
+                }
+              }
+            },
+            deleteMessage = { itemId, mode ->
+              withBGApi {
+                val cInfo = chat.chatInfo
+                val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
+                val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
+                val groupInfo = toModerate?.first
+                val groupMember = toModerate?.second
+                val deletedChatItem: ChatItem?
+                val toChatItem: ChatItem?
+                if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
+                  val r = chatModel.controller.apiDeleteMemberChatItem(
+                    chatRh,
+                    groupId = groupInfo.groupId,
+                    groupMemberId = groupMember.groupMemberId,
+                    itemId = itemId
+                  )
+                  deletedChatItem = r?.first
+                  toChatItem = r?.second
+                } else {
+                  val r = chatModel.controller.apiDeleteChatItem(
+                    chatRh,
+                    type = cInfo.chatType,
+                    id = cInfo.apiId,
+                    itemId = itemId,
+                    mode = mode
+                  )
+                  deletedChatItem = r?.deletedChatItem?.chatItem
+                  toChatItem = r?.toChatItem?.chatItem
+                }
+                if (toChatItem == null && deletedChatItem != null) {
+                  chatModel.removeChatItem(chatRh, cInfo, deletedChatItem)
+                } else if (toChatItem != null) {
+                  chatModel.upsertChatItem(chatRh, cInfo, toChatItem)
+                }
+              }
+            },
+            deleteMessages = { itemIds ->
+              if (itemIds.isNotEmpty()) {
+                val chatInfo = chat.chatInfo
+                withBGApi {
+                  val deletedItems: ArrayList<ChatItem> = arrayListOf()
+                  for (itemId in itemIds) {
+                    val di = chatModel.controller.apiDeleteChatItem(
+                      chatRh, chatInfo.chatType, chatInfo.apiId, itemId, CIDeleteMode.cidmInternal
+                    )?.deletedChatItem?.chatItem
+                    if (di != null) {
+                      deletedItems.add(di)
+                    }
+                  }
+                  for (di in deletedItems) {
+                    chatModel.removeChatItem(chatRh, chatInfo, di)
+                  }
+                }
+              }
+            },
+            receiveFile = { fileId ->
+              withBGApi { chatModel.controller.receiveFile(chatRh, user, fileId) }
+            },
+            cancelFile = { fileId ->
+              withBGApi { chatModel.controller.cancelFile(chatRh, user, fileId) }
+            },
+            joinGroup = { groupId, onComplete ->
+              withBGApi {
+                chatModel.controller.apiJoinGroup(chatRh, groupId)
+                onComplete.invoke()
+              }
+            },
+            startCall = out@{ media ->
+              withBGApi {
+                val cInfo = chat.chatInfo
+                if (cInfo is ChatInfo.Direct) {
+                  val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
+                  val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
+                  chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
+                  chatModel.showCallView.value = true
+                  chatModel.callCommand.add(WCallCommand.Capabilities(media))
+                }
+              }
+            },
+            endCall = {
+              val call = chatModel.activeCall.value
+              if (call != null) withBGApi { chatModel.callManager.endCall(call) }
+            },
+            acceptCall = { contact ->
+              hideKeyboard(view)
+              withBGApi {
+                val invitation = chatModel.callInvitations.remove(contact.id)
+                  ?: controller.apiGetCallInvitations(chatModel.remoteHostId()).firstOrNull { it.contact.id == contact.id }
+                if (invitation == null) {
+                  AlertManager.shared.showAlertMsg(generalGetString(MR.strings.call_already_ended))
+                } else {
+                  chatModel.callManager.acceptIncomingCall(invitation = invitation)
+                }
+              }
+            },
+            acceptFeature = { contact, feature, param ->
+              withBGApi {
+                chatModel.controller.allowFeatureToContact(chatRh, contact, feature, param)
+              }
+            },
+            openDirectChat = { contactId ->
+              withBGApi {
+                openDirectChat(chatRh, contactId, chatModel)
+              }
+            },
+            updateContactStats = { contact ->
+              withBGApi {
+                val r = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
+                if (r != null) {
+                  val contactStats = r.first
+                  if (contactStats != null)
+                    chatModel.updateContactConnectionStats(chatRh, contact, contactStats)
+                }
+              }
+            },
+            updateMemberStats = { groupInfo, member ->
+              withBGApi {
+                val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
+                if (r != null) {
+                  val memStats = r.second
+                  if (memStats != null) {
+                    chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
+                  }
+                }
+              }
+            },
+            syncContactConnection = { contact ->
+              withBGApi {
+                val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
+                if (cStats != null) {
+                  chatModel.updateContactConnectionStats(chatRh, contact, cStats)
+                }
+              }
+            },
+            syncMemberConnection = { groupInfo, member ->
+              withBGApi {
+                val r = chatModel.controller.apiSyncGroupMemberRatchet(chatRh, groupInfo.apiId, member.groupMemberId, force = false)
+                if (r != null) {
+                  chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
+                }
+              }
+            },
+            findModelChat = { chatId ->
+              chatModel.getChat(chatId)
+            },
+            findModelMember = { memberId ->
+              chatModel.groupMembers.find { it.id == memberId }
+            },
+            setReaction = { cInfo, cItem, add, reaction ->
+              withBGApi {
+                val updatedCI = chatModel.controller.apiChatItemReaction(
+                  rh = chatRh,
                  type = cInfo.chatType,
                  id = cInfo.apiId,
-                  itemId = itemId,
-                  mode = mode
+                  itemId = cItem.id,
+                  add = add,
+                  reaction = reaction
                )
-                deletedChatItem = r?.deletedChatItem?.chatItem
-                toChatItem = r?.toChatItem?.chatItem
+                if (updatedCI != null) {
+                  chatModel.updateChatItem(cInfo, updatedCI)
+                }
              }
-              if (toChatItem == null && deletedChatItem != null) {
-                chatModel.removeChatItem(chatRh, cInfo, deletedChatItem)
-              } else if (toChatItem != null) {
-                chatModel.upsertChatItem(chatRh, cInfo, toChatItem)
-              }
-            }
-          },
-          deleteMessages = { itemIds ->
-            if (itemIds.isNotEmpty()) {
-              val chatInfo = chat.chatInfo
-              withBGApi {
-                val deletedItems: ArrayList<ChatItem> = arrayListOf()
-                for (itemId in itemIds) {
-                  val di = chatModel.controller.apiDeleteChatItem(
-                    chatRh, chatInfo.chatType, chatInfo.apiId, itemId, CIDeleteMode.cidmInternal
-                  )?.deletedChatItem?.chatItem
-                  if (di != null) {
-                    deletedItems.add(di)
+            },
+            showItemDetails = { cInfo, cItem ->
+              suspend fun loadChatItemInfo(): ChatItemInfo? {
+                val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
+                if (ciInfo != null) {
+                  if (chat.chatInfo is ChatInfo.Group) {
+                    setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
                  }
                }
-                for (di in deletedItems) {
-                  chatModel.removeChatItem(chatRh, chatInfo, di)
-                }
+                return ciInfo
              }
-            }
-          },
-          receiveFile = { fileId ->
-            withBGApi { chatModel.controller.receiveFile(chatRh, user, fileId) }
-          },
-          cancelFile = { fileId ->
-            withBGApi { chatModel.controller.cancelFile(chatRh, user, fileId) }
-          },
-          joinGroup = { groupId, onComplete ->
-            withBGApi {
-              chatModel.controller.apiJoinGroup(chatRh, groupId)
-              onComplete.invoke()
-            }
-          },
-          startCall = out@{ media ->
-            withBGApi {
-              val cInfo = chat.chatInfo
-              if (cInfo is ChatInfo.Direct) {
-                val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
-                val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
-                chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
-                chatModel.showCallView.value = true
-                chatModel.callCommand.add(WCallCommand.Capabilities(media))
-              }
-            }
-          },
-          endCall = {
-            val call = chatModel.activeCall.value
-            if (call != null) withBGApi { chatModel.callManager.endCall(call) }
-          },
-          acceptCall = { contact ->
-            hideKeyboard(view)
-            withBGApi {
-              val invitation = chatModel.callInvitations.remove(contact.id)
-                ?: controller.apiGetCallInvitations(chatModel.remoteHostId()).firstOrNull { it.contact.id == contact.id }
-              if (invitation == null) {
-                AlertManager.shared.showAlertMsg(generalGetString(MR.strings.call_already_ended))
-              } else {
-                chatModel.callManager.acceptIncomingCall(invitation = invitation)
-              }
-            }
-          },
-          acceptFeature = { contact, feature, param ->
-            withBGApi {
-              chatModel.controller.allowFeatureToContact(chatRh, contact, feature, param)
-            }
-          },
-          openDirectChat = { contactId ->
-            withBGApi {
-              openDirectChat(chatRh, contactId, chatModel)
-            }
-          },
-          updateContactStats = { contact ->
-            withBGApi {
-              val r = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-              if (r != null) {
-                val contactStats = r.first
-                if (contactStats != null)
-                  chatModel.updateContactConnectionStats(chatRh, contact, contactStats)
-              }
-            }
-          },
-          updateMemberStats = { groupInfo, member ->
-            withBGApi {
-              val r = chatModel.controller.apiGroupMemberInfo(chatRh, groupInfo.groupId, member.groupMemberId)
-              if (r != null) {
-                val memStats = r.second
-                if (memStats != null) {
-                  chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, memStats)
-                }
-              }
-            }
-          },
-          syncContactConnection = { contact ->
-            withBGApi {
-              val cStats = chatModel.controller.apiSyncContactRatchet(chatRh, contact.contactId, force = false)
-              if (cStats != null) {
-                chatModel.updateContactConnectionStats(chatRh, contact, cStats)
-              }
-            }
-          },
-          syncMemberConnection = { groupInfo, member ->
-            withBGApi {
-              val r = chatModel.controller.apiSyncGroupMemberRatchet(chatRh, groupInfo.apiId, member.groupMemberId, force = false)
-              if (r != null) {
-                chatModel.updateGroupMemberConnectionStats(chatRh, groupInfo, r.first, r.second)
-              }
-            }
-          },
-          findModelChat = { chatId ->
-            chatModel.getChat(chatId)
-          },
-          findModelMember = { memberId ->
-            chatModel.groupMembers.find { it.id == memberId }
-          },
-          setReaction = { cInfo, cItem, add, reaction ->
-            withBGApi {
-              val updatedCI = chatModel.controller.apiChatItemReaction(
-                rh = chatRh,
-                type = cInfo.chatType,
-                id = cInfo.apiId,
-                itemId = cItem.id,
-                add = add,
-                reaction = reaction
-              )
-              if (updatedCI != null) {
-                chatModel.updateChatItem(cInfo, updatedCI)
-              }
-            }
-          },
-          showItemDetails = { cInfo, cItem ->
-            suspend fun loadChatItemInfo(): ChatItemInfo? {
-              val ciInfo = chatModel.controller.apiGetChatItemInfo(chatRh, cInfo.chatType, cInfo.apiId, cItem.id)
-              if (ciInfo != null) {
-                if (chat.chatInfo is ChatInfo.Group) {
-                  setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
-                }
-              }
-              return ciInfo
-            }
-            withBGApi {
-              var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(endButtons = {
-                ShareButton {
-                  clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
-                }
-              }) { close ->
-                var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
-                ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
-                LaunchedEffect(cItem.id) {
-                  withContext(Dispatchers.Default) {
-                    for (apiResp in controller.messagesChannel) {
-                      val msg = apiResp.resp
-                      if (apiResp.remoteHostId == chatRh &&
-                        msg is CR.ChatItemStatusUpdated &&
-                        msg.chatItem.chatItem.id == cItem.id
-                      ) {
-                        ciInfo = loadChatItemInfo() ?: return@withContext
-                        initialCiInfo = ciInfo
+              withBGApi {
+                var initialCiInfo = loadChatItemInfo() ?: return@withBGApi
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(endButtons = {
+                  ShareButton {
+                    clipboard.shareText(itemInfoShareText(chatModel, cItem, initialCiInfo, chatModel.controller.appPrefs.developerTools.get()))
+                  }
+                }) { close ->
+                  var ciInfo by remember(cItem.id) { mutableStateOf(initialCiInfo) }
+                  ChatItemInfoView(chatRh, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
+                  LaunchedEffect(cItem.id) {
+                    withContext(Dispatchers.Default) {
+                      for (apiResp in controller.messagesChannel) {
+                        val msg = apiResp.resp
+                        if (apiResp.remoteHostId == chatRh &&
+                          msg is CR.ChatItemStatusUpdated &&
+                          msg.chatItem.chatItem.id == cItem.id
+                        ) {
+                          ciInfo = loadChatItemInfo() ?: return@withContext
+                          initialCiInfo = ciInfo
+                        }
                      }
                    }
                  }
-                }
-                KeyChangeEffect(chatModel.chatId.value) {
-                  close()
+                  KeyChangeEffect(chatModel.chatId.value) {
+                    close()
+                  }
                }
              }
-            }
-          },
-          addMembers = { groupInfo ->
-            hideKeyboard(view)
-            withBGApi {
-              setGroupMembers(chatRh, groupInfo, chatModel)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) { close ->
-                AddGroupMembersView(chatRh, groupInfo, false, chatModel, close)
+            },
+            addMembers = { groupInfo ->
+              hideKeyboard(view)
+              withBGApi {
+                setGroupMembers(chatRh, groupInfo, chatModel)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) { close ->
+                  AddGroupMembersView(chatRh, groupInfo, false, chatModel, close)
+                }
              }
-            }
-          },
-          openGroupLink = { groupInfo ->
-            hideKeyboard(view)
-            withBGApi {
-              val link = chatModel.controller.apiGetGroupLink(chatRh, groupInfo.groupId)
-              ModalManager.end.closeModals()
-              ModalManager.end.showModalCloseable(true) {
-                GroupLinkView(chatModel, chatRh, groupInfo, link?.first, link?.second, onGroupLinkUpdated = null)
+            },
+            openGroupLink = { groupInfo ->
+              hideKeyboard(view)
+              withBGApi {
+                val link = chatModel.controller.apiGetGroupLink(chatRh, groupInfo.groupId)
+                ModalManager.end.closeModals()
+                ModalManager.end.showModalCloseable(true) {
+                  GroupLinkView(chatModel, chatRh, groupInfo, link?.first, link?.second, onGroupLinkUpdated = null)
+                }
              }
-            }
-          },
-          markRead = { range, unreadCountAfter ->
-            chatModel.markChatItemsRead(chat, range, unreadCountAfter)
-            ntfManager.cancelNotificationsForChat(chat.id)
-            withBGApi {
-              chatModel.controller.apiChatRead(
-                chatRh,
-                chat.chatInfo.chatType,
-                chat.chatInfo.apiId,
-                range
-              )
-            }
-          },
-          changeNtfsState = { enabled, currentValue -> toggleNotifications(chat, enabled, chatModel, currentValue) },
-          onSearchValueChanged = { value ->
-            if (searchText.value == value) return@ChatLayout
-            if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
-            val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
-            withBGApi {
-              apiFindMessages(c, chatModel, value)
-              searchText.value = value
-            }
-          },
-          onComposed,
-          developerTools = chatModel.controller.appPrefs.developerTools.get(),
-        )
+            },
+            markRead = { range, unreadCountAfter ->
+              chatModel.markChatItemsRead(chat, range, unreadCountAfter)
+              ntfManager.cancelNotificationsForChat(chat.id)
+              withBGApi {
+                chatModel.controller.apiChatRead(
+                  chatRh,
+                  chat.chatInfo.chatType,
+                  chat.chatInfo.apiId,
+                  range
+                )
+              }
+            },
+            changeNtfsState = { enabled, currentValue -> toggleNotifications(chat, enabled, chatModel, currentValue) },
+            onSearchValueChanged = { value ->
+              if (searchText.value == value) return@ChatLayout
+              if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
+              val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout) ?: return@ChatLayout
+              withBGApi {
+                apiFindMessages(c, chatModel, value)
+                searchText.value = value
+              }
+            },
+            onComposed,
+            developerTools = chatModel.controller.appPrefs.developerTools.get(),
+            showViaProxy = chatModel.controller.appPrefs.showSentViaProxy.get(),
+          )
+        }
      }
      is ChatInfo.ContactConnection -> {
        val close = { chatModel.chatId.value = null }
@@ -548,6 +552,7 @@ fun ChatLayout(
  onSearchValueChanged: (String) -> Unit,
  onComposed: suspend (chatId: String) -> Unit,
  developerTools: Boolean,
+  showViaProxy: Boolean
 ) {
  val scope = rememberCoroutineScope()
  val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
@@ -596,9 +601,19 @@ fun ChatLayout(
          floatingActionButton = { floatingButton.value() },
          contentColor = LocalContentColor.current,
          drawerContentColor = LocalContentColor.current,
+          backgroundColor = Color.Unspecified
        ) { contentPadding ->
+          val wallpaperImage = MaterialTheme.wallpaper.type.image
+          val wallpaperType = MaterialTheme.wallpaper.type
+          val backgroundColor = MaterialTheme.wallpaper.background ?: wallpaperType.defaultBackgroundColor(CurrentColors.value.base, MaterialTheme.colors.background)
+          val tintColor = MaterialTheme.wallpaper.tint ?: wallpaperType.defaultTintColor(CurrentColors.value.base)
          BoxWithConstraints(Modifier
-            .fillMaxHeight()
+            .fillMaxSize()
+            .background(MaterialTheme.colors.background)
+            .then(if (wallpaperImage != null)
+              Modifier.drawBehind { chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor) }
+            else
+              Modifier)
            .padding(contentPadding)
          ) {
            ChatItemsList(
@@ -606,7 +621,7 @@ fun ChatLayout(
              useLinkPreviews, linkMode, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat,
              updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools,
+              setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
            )
          }
        }
@@ -885,6 +900,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
  setFloatingButton: (@Composable () -> Unit) -> Unit,
  onComposed: suspend (chatId: String) -> Unit,
  developerTools: Boolean,
+  showViaProxy: Boolean
 ) {
  val listState = rememberLazyListState()
  val scope = rememberCoroutineScope()
@@ -975,7 +991,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
          tryOrShowError("${cItem.id}ChatItem", error = {
            CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
          }) {
-            ChatItemView(chat.remoteHostId, chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools)
+            ChatItemView(chat.remoteHostId, chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools, showViaProxy = showViaProxy)
          }
        }

@@ -1003,7 +1019,8 @@ fun BoxWithConstraintsScope.ChatItemsList(
                    Text(
                      memberNames(member, prevMember, memCount),
                      Modifier.padding(start = MEMBER_IMAGE_SIZE + 10.dp),
-                      style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary)
+                      style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
+                      maxLines = 2
                    )
                  }
                  Row(
@@ -1258,7 +1275,7 @@ val MEMBER_IMAGE_SIZE: Dp = 38.dp

@Composable
 fun MemberImage(member: GroupMember) {
-  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image)
+  ProfileImage(MEMBER_IMAGE_SIZE, member.memberProfile.image, backgroundColor = MaterialTheme.colors.background)
 }

@Composable
@@ -1542,6 +1559,7 @@ fun PreviewChatLayout() {
      onSearchValueChanged = {},
      onComposed = {},
      developerTools = false,
+      showViaProxy = false,
    )
  }
 }
@@ -1614,6 +1632,7 @@ fun PreviewGroupChatLayout() {
      onSearchValueChanged = {},
      onComposed = {},
      developerTools = false,
+      showViaProxy = false,
    )
  }
 }
@@ -16,7 +16,7 @@ import dev.icerock.moko.resources.compose.stringResource

@Composable
 fun ComposeContextInvitingContactMemberView() {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
  Row(
    Modifier
      .height(60.dp)
@@ -16,7 +16,7 @@ import chat.simplex.res.MR

@Composable
 fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
  Row(
    Modifier
      .height(60.dp)
@@ -20,7 +20,7 @@ import chat.simplex.common.views.helpers.UploadContent

@Composable
 fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
  Row(
    Modifier
      .padding(top = 8.dp)
@@ -408,14 +408,15 @@ fun ComposeView(
      composeState.value = composeState.value.copy(inProgress = true)
    }

-    suspend fun forwardItem(rhId: Long?, forwardedItem: ChatItem, fromChatInfo: ChatInfo): ChatItem? {
+    suspend fun forwardItem(rhId: Long?, forwardedItem: ChatItem, fromChatInfo: ChatInfo, ttl: Int?): ChatItem? {
      val chatItem = controller.apiForwardChatItem(
        rh = rhId,
        toChatType = chat.chatInfo.chatType,
        toChatId = chat.chatInfo.apiId,
        fromChatType = fromChatInfo.chatType,
        fromChatId = fromChatInfo.apiId,
-        itemId = forwardedItem.id
+        itemId = forwardedItem.id,
+        ttl = ttl
      )
      if (chatItem != null) {
        chatModel.addChatItem(rhId, chat.chatInfo, chatItem)
@@ -490,9 +491,9 @@ fun ComposeView(
      sendMemberContactInvitation()
      sent = null
    } else if (cs.contextItem is ComposeContextItem.ForwardingItem) {
-      sent = forwardItem(chat.remoteHostId, cs.contextItem.chatItem, cs.contextItem.fromChatInfo)
+      sent = forwardItem(chat.remoteHostId, cs.contextItem.chatItem, cs.contextItem.fromChatInfo, ttl = ttl)
      if (cs.message.isNotEmpty()) {
-        sent = send(chat, checkLinkPreview(), quoted = sent?.id, live = false, ttl = null)
+        sent = send(chat, checkLinkPreview(), quoted = sent?.id, live = false, ttl = ttl)
      }
    } else if (cs.contextItem is ComposeContextItem.EditingItem) {
      val ei = cs.contextItem.chatItem
@@ -775,7 +776,7 @@ fun ComposeView(

  @Composable
  fun MsgNotAllowedView(reason: String, icon: Painter) {
-    val color = CurrentColors.collectAsState().value.appColors.receivedMessage
+    val color = MaterialTheme.appColors.receivedMessage
    Row(Modifier.padding(top = 5.dp).fillMaxWidth().background(color).padding(horizontal = DEFAULT_PADDING_HALF, vertical = DEFAULT_PADDING_HALF * 1.5f), verticalAlignment = Alignment.CenterVertically) {
      Icon(icon, null, tint = MaterialTheme.colors.secondary)
      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
@@ -861,7 +862,7 @@ fun ComposeView(
      }
    }
    Row(
-      modifier = Modifier.padding(end = 8.dp),
+      modifier = Modifier.background(MaterialTheme.colors.background).padding(end = 8.dp),
      verticalAlignment = Alignment.Bottom,
    ) {
      val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
@@ -973,7 +974,7 @@ fun ComposeView(
      val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
      val sendButtonColor =
        if (chat.chatInfo.incognito)
-          if (isSystemInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
+          if (isInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
        else MaterialTheme.colors.primary
      SendMsgView(
        composeState,
@@ -35,7 +35,7 @@ fun ComposeVoiceView(
 ) {
  val progress = rememberSaveable { mutableStateOf(0) }
  val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
  Box {
    Box(
      Modifier
@@ -32,8 +32,8 @@ fun ContactPreferencesView(
 ) {
  val contact = remember { derivedStateOf { (m.getContactChat(contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }
  val ct = contact.value ?: return
-  var featuresAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
-  var currentFeaturesAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
+  var featuresAllowed by rememberSaveable(ct, user, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
+  var currentFeaturesAllowed by rememberSaveable(ct, user, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }

  fun savePrefs(afterSave: () -> Unit = {}) {
    withBGApi {
@@ -30,8 +30,8 @@ fun ContextItemView(
  cancelContextItem: () -> Unit
 ) {
  val sent = contextItem.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage

  @Composable
  fun MessageText(attachment: ImageResource?, lines: Int) {
@@ -157,7 +157,7 @@ fun SendMsgView(
          fun MenuItems(): List<@Composable () -> Unit> {
            val menuItems = mutableListOf<@Composable () -> Unit>()

-            if (cs.liveMessage == null && !cs.editing && !cs.forwarding && !nextSendGrpInv || sendMsgEnabled) {
+            if (cs.liveMessage == null && !cs.editing && !nextSendGrpInv || sendMsgEnabled) {
              if (
                cs.preview !is ComposePreview.VoicePreview &&
                cs.contextItem is ComposeContextItem.NoContextItem &&
@@ -9,7 +9,6 @@ import SectionSpacer
 import SectionTextFooter
 import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.material.*
@@ -233,6 +232,16 @@ fun GroupChatInfoLayout(
        } else {
          SendReceiptsOptionDisabled()
        }
+
+        WallpaperButton {
+          ModalManager.end.showModal {
+            val chat = remember { derivedStateOf { chatModel.chats.firstOrNull { it.id == chat.id } } }
+            val c = chat.value
+            if (c != null) {
+              ChatWallpaperEditorModal(c)
+            }
+          }
+        }
      }
      SectionTextFooter(stringResource(MR.strings.only_group_owners_can_change_prefs))
      SectionDividerSpaced(maxTopPadding = true)
@@ -123,13 +123,12 @@ private fun GroupPreferencesLayout(
      applyPrefs(preferences.copy(files = RoleGroupPreference(enable = enable, role)))
    }

-    // TODO enable simplexLinks preference in 5.8
-//    SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowSimplexLinks = remember(preferences) { mutableStateOf(preferences.simplexLinks.enable) }
-//    val simplexLinksRole = remember(preferences) { mutableStateOf(preferences.simplexLinks.role) }
-//    FeatureSection(GroupFeature.SimplexLinks, allowSimplexLinks, simplexLinksRole, groupInfo, preferences, onTTLUpdated) { enable, role ->
-//      applyPrefs(preferences.copy(simplexLinks = RoleGroupPreference(enable = enable, role)))
-//    }
+    SectionDividerSpaced(true, maxBottomPadding = false)
+    val allowSimplexLinks = remember(preferences) { mutableStateOf(preferences.simplexLinks.enable) }
+    val simplexLinksRole = remember(preferences) { mutableStateOf(preferences.simplexLinks.role) }
+    FeatureSection(GroupFeature.SimplexLinks, allowSimplexLinks, simplexLinksRole, groupInfo, preferences, onTTLUpdated) { enable, role ->
+      applyPrefs(preferences.copy(simplexLinks = RoleGroupPreference(enable = enable, role)))
+    }

    SectionDividerSpaced(true, maxBottomPadding = false)
    val enableHistory = remember(preferences) { mutableStateOf(preferences.history.enable) }
@@ -189,8 +188,6 @@ private fun FeatureSection(
          generalGetString(MR.strings.feature_enabled_for),
          featureRoles,
          enableForRole,
-          // remove in v5.8
-          enabled = remember { mutableStateOf(false) },
          onSelected = { value ->
            onSelected(enableFeature.value, value)
          }
@@ -47,7 +47,7 @@ fun CICallItemView(
      CICallStatus.Error -> {}
    }

-    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false)
+    CIMetaView(cItem, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false)
  }
 }

@@ -1,6 +1,6 @@
 package chat.simplex.common.views.chat.item

-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -28,6 +28,7 @@ import java.net.URI
 fun CIFileView(
  file: CIFile?,
  edited: Boolean,
+  showMenu: MutableState<Boolean>,
  receiveFile: (Long) -> Unit
 ) {
  val saveFileLauncher = rememberSaveFileLauncher(ciFile = file)
@@ -62,7 +63,7 @@ fun CIFileView(
  fun fileAction() {
    if (file != null) {
      when {
-        file.fileStatus is CIFileStatus.RcvInvitation -> {
+        file.fileStatus is CIFileStatus.RcvInvitation || file.fileStatus is CIFileStatus.RcvAborted -> {
          if (fileSizeValid(file)) {
            receiveFile(file.fileId)
          } else {
@@ -86,7 +87,7 @@ fun CIFileView(
              )
            FileProtocol.LOCAL -> {}
          }
-        file.fileStatus is CIFileStatus.RcvComplete || (file.fileStatus is CIFileStatus.SndStored && file.fileProtocol == FileProtocol.LOCAL) -> {
+        file.forwardingAllowed() -> {
          withLongRunningApi(slow = 600_000) {
            var filePath = getLoadedFilePath(file)
            if (chatModel.connectedToRemote() && filePath == null) {
@@ -136,8 +137,7 @@ fun CIFileView(
    Box(
      Modifier
        .size(42.dp)
-        .clip(RoundedCornerShape(4.dp))
-        .clickable(onClick = { fileAction() }),
+        .clip(RoundedCornerShape(4.dp)),
      contentAlignment = Alignment.Center
    ) {
      if (file != null) {
@@ -154,7 +154,13 @@ fun CIFileView(
              FileProtocol.SMP -> progressIndicator()
              FileProtocol.LOCAL -> {}
            }
-          is CIFileStatus.SndComplete -> fileIcon(innerIcon = painterResource(MR.images.ic_check_filled))
+          is CIFileStatus.SndComplete -> {
+            if ((file.forwardingAllowed() || (chatModel.connectedToRemote() && CIFile.cachedRemoteFileRequests[file.fileSource] == true))) {
+              fileIcon()
+            } else {
+              fileIcon(innerIcon = painterResource(MR.images.ic_check_filled))
+            }
+          }
          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
          is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
          is CIFileStatus.RcvInvitation ->
@@ -169,6 +175,8 @@ fun CIFileView(
            } else {
              progressIndicator()
            }
+          is CIFileStatus.RcvAborted ->
+            fileIcon(innerIcon = painterResource(MR.images.ic_sync_problem), color = MaterialTheme.colors.primary)
          is CIFileStatus.RcvComplete -> fileIcon()
          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
          is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(MR.images.ic_close))
@@ -181,7 +189,13 @@ fun CIFileView(
  }

  Row(
-    Modifier.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
+    Modifier
+      .combinedClickable(
+        onClick = { fileAction() },
+        onLongClick = { showMenu.value = true }
+      )
+      .padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
+    //Modifier.clickable(enabled = file?.fileSource != null) { if (file?.fileSource != null && getLoadedFilePath(file) != null) openFile(file.fileSource) }.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 12.dp),
    verticalAlignment = Alignment.Bottom,
    horizontalArrangement = Arrangement.spacedBy(2.dp)
  ) {
@@ -83,8 +83,8 @@ fun CIGroupInvitationView(
    }
  }

-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    modifier = if (action && !inProgress.value) Modifier.clickable(onClick = {
      inProgress.value = true
@@ -110,6 +110,7 @@ fun CIGroupInvitationView(
            .padding(bottom = 4.dp),
        ) {
          groupInfoView()
+          val secondaryColor = MaterialTheme.colors.secondary
          Column(Modifier.padding(top = 2.dp, start = 5.dp)) {
            Divider(Modifier.fillMaxWidth().padding(bottom = 4.dp))
            if (action) {
@@ -117,7 +118,7 @@ fun CIGroupInvitationView(
              Text(
                buildAnnotatedString {
                  append(generalGetString(if (chatIncognito) MR.strings.group_invitation_tap_to_join_incognito else MR.strings.group_invitation_tap_to_join))
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false)) }
+                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor)) }
                },
                color = if (inProgress.value)
                  MaterialTheme.colors.secondary
@@ -128,7 +129,7 @@ fun CIGroupInvitationView(
              Text(
                buildAnnotatedString {
                  append(groupInvitationStr())
-                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false)) }
+                  withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, timedMessagesTTL, encrypted = null, showStatus = false, showEdited = false, secondaryColor = secondaryColor)) }
                }
              )
            }
@@ -144,7 +145,7 @@ fun CIGroupInvitationView(
        }
      }

-      CIMetaView(ci, timedMessagesTTL, showStatus = false, showEdited = false)
+      CIMetaView(ci, timedMessagesTTL, showStatus = false, showEdited = false, showViaProxy = false)
    }
  }
 }
@@ -2,8 +2,7 @@ package chat.simplex.common.views.chat.item

 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
+import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -22,17 +21,12 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.DEFAULT_MAX_IMAGE_WIDTH
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.runBlocking
-import java.io.File
-import java.net.URI

@Composable
 fun CIImageView(
  image: String,
  file: CIFile?,
-  metaColor: Color,
  imageProvider: () -> ImageGalleryProvider,
  showMenu: MutableState<Boolean>,
  receiveFile: (Long) -> Unit
@@ -52,7 +46,7 @@ fun CIImageView(
      icon,
      stringResource(stringId),
      Modifier.fillMaxSize(),
-      tint = metaColor
+      tint = Color.White
    )
  }

@@ -79,6 +73,7 @@ fun CIImageView(
          is CIFileStatus.RcvInvitation -> fileIcon(painterResource(MR.images.ic_arrow_downward), MR.strings.icon_descr_asked_to_receive)
          is CIFileStatus.RcvAccepted -> fileIcon(painterResource(MR.images.ic_more_horiz), MR.strings.icon_descr_waiting_for_image)
          is CIFileStatus.RcvTransfer -> progressIndicator()
+          is CIFileStatus.RcvAborted -> fileIcon(painterResource(MR.images.ic_sync_problem), MR.strings.icon_descr_file)
          is CIFileStatus.RcvCancelled -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
          is CIFileStatus.RcvError -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
          is CIFileStatus.Invalid -> fileIcon(painterResource(MR.images.ic_question_mark), MR.strings.icon_descr_file)
@@ -113,21 +108,49 @@ fun CIImageView(
  }

  @Composable
-  fun ImageView(painter: Painter, onClick: () -> Unit) {
-    Image(
-      painter,
-      contentDescription = stringResource(MR.strings.image_descr),
-      // .width(DEFAULT_MAX_IMAGE_WIDTH) is a hack for image to increase IntrinsicSize of FramedItemView
-      // if text is short and take all available width if text is long
-      modifier = Modifier
+  fun ImageView(painter: Painter, image: String, fileSource: CryptoFile?, onClick: () -> Unit) {
+    // On my Android device Compose fails to display 6000x6000 px WebP image with exception:
+    // IllegalStateException: Recording currently in progress - missing #endRecording() call?
+    // but can display 5000px image. Using even lower value here just to feel safer.
+    // It happens to WebP because it's not compressed while sending since it can be animated.
+    if (painter.intrinsicSize.width <= 4320 && painter.intrinsicSize.height <= 4320) {
+      Image(
+        painter,
+        contentDescription = stringResource(MR.strings.image_descr),
+        // .width(DEFAULT_MAX_IMAGE_WIDTH) is a hack for image to increase IntrinsicSize of FramedItemView
+        // if text is short and take all available width if text is long
+        modifier = Modifier
+          .width(if (painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH)
+          .combinedClickable(
+            onLongClick = { showMenu.value = true },
+            onClick = onClick
+          )
+          .onRightClick { showMenu.value = true },
+        contentScale = ContentScale.FillWidth,
+      )
+    } else {
+      Box(Modifier
        .width(if (painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH)
        .combinedClickable(
          onLongClick = { showMenu.value = true },
-          onClick = onClick
+          onClick = {}
        )
        .onRightClick { showMenu.value = true },
-      contentScale = ContentScale.FillWidth,
-    )
+        contentAlignment = Alignment.Center
+      ) {
+        imageView(base64ToBitmap(image), onClick = {
+          if (fileSource != null) {
+            openFile(fileSource)
+          }
+        })
+        Icon(
+          painterResource(MR.images.ic_open_in_new),
+          contentDescription = stringResource(MR.strings.image_descr),
+          modifier = Modifier.size(30.dp),
+          tint = MaterialTheme.colors.primary,
+        )
+      }
+    }
  }

  fun fileSizeValid(): Boolean {
@@ -172,14 +195,14 @@ fun CIImageView(
      }
    }
    val loaded = res.value
-    if (loaded != null) {
+    if (loaded != null && file != null) {
      val (imageBitmap, data, _) = loaded
-      SimpleAndAnimatedImageView(data, imageBitmap, file, imageProvider, @Composable { painter, onClick -> ImageView(painter, onClick) })
+      SimpleAndAnimatedImageView(data, imageBitmap, file, imageProvider, @Composable { painter, onClick -> ImageView(painter, image, file.fileSource, onClick) })
    } else {
      imageView(base64ToBitmap(image), onClick = {
        if (file != null) {
          when (file.fileStatus) {
-            CIFileStatus.RcvInvitation ->
+            CIFileStatus.RcvInvitation, CIFileStatus.RcvAborted ->
              if (fileSizeValid()) {
                receiveFile(file.fileId)
              } else {
@@ -12,7 +12,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.isInDarkTheme
 import chat.simplex.res.MR
@@ -35,7 +34,8 @@ fun CIMetaView(
      blue = minOf(metaColor.red * 1.33F, 1F))
  },
  showStatus: Boolean = true,
-  showEdited: Boolean = true
+  showEdited: Boolean = true,
+  showViaProxy: Boolean
 ) {
  Row(Modifier.padding(start = 3.dp), verticalAlignment = Alignment.CenterVertically) {
    if (chatItem.isDeletedContent) {
@@ -53,7 +53,8 @@ fun CIMetaView(
        metaColor,
        paleMetaColor,
        showStatus = showStatus,
-        showEdited = showEdited
+        showEdited = showEdited,
+        showViaProxy = showViaProxy
      )
    }
  }
@@ -68,7 +69,8 @@ private fun CIMetaText(
  color: Color,
  paleColor: Color,
  showStatus: Boolean = true,
-  showEdited: Boolean = true
+  showEdited: Boolean = true,
+  showViaProxy: Boolean
 ) {
  if (showEdited && meta.itemEdited) {
    StatusIconText(painterResource(MR.images.ic_edit), color)
@@ -82,6 +84,9 @@ private fun CIMetaText(
    }
    Spacer(Modifier.width(4.dp))
  }
+  if (showViaProxy && meta.sentViaProxy == true) {
+    Icon(painterResource(MR.images.ic_arrow_forward), null, Modifier.height(17.dp), tint = MaterialTheme.colors.secondary)
+  }
  if (showStatus) {
    val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color, paleColor)
    if (statusIcon != null) {
@@ -105,7 +110,15 @@ private fun CIMetaText(
 }

 // the conditions in this function should match CIMetaText
-fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?, encrypted: Boolean?, showStatus: Boolean = true, showEdited: Boolean = true): String {
+fun reserveSpaceForMeta(
+  meta: CIMeta,
+  chatTTL: Int?,
+  encrypted: Boolean?,
+  secondaryColor: Color,
+  showStatus: Boolean = true,
+  showEdited: Boolean = true,
+  showViaProxy: Boolean = false
+): String {
  val iconSpace = "    "
  var res = ""
  if (showEdited && meta.itemEdited) res += iconSpace
@@ -116,7 +129,10 @@ fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?, encrypted: Boolean?, showSt
      res += shortTimeText(ttl)
    }
  }
-  if (showStatus && (meta.statusIcon(CurrentColors.value.colors.secondary) != null || !meta.disappearing)) {
+  if (showViaProxy && meta.sentViaProxy == true) {
+    res += iconSpace
+  }
+  if (showStatus && (meta.statusIcon(secondaryColor) != null || !meta.disappearing)) {
    res += iconSpace
  }
  if (encrypted != null) {
@@ -137,7 +153,8 @@ fun PreviewCIMetaView() {
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -149,7 +166,8 @@ fun PreviewCIMetaViewUnread() {
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
      status = CIStatus.RcvNew()
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -159,9 +177,10 @@ fun PreviewCIMetaViewSendFailed() {
  CIMetaView(
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.SndError("CMD SYNTAX")
+      status = CIStatus.CISSndError(SndError.Other("CMD SYNTAX"))
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -172,7 +191,8 @@ fun PreviewCIMetaViewSendNoAuth() {
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndErrorAuth()
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -183,7 +203,8 @@ fun PreviewCIMetaViewSendSent() {
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndSent(SndCIStatusProgress.Complete)
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -195,7 +216,8 @@ fun PreviewCIMetaViewEdited() {
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
      itemEdited = true
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -208,7 +230,8 @@ fun PreviewCIMetaViewEditedUnread() {
      itemEdited = true,
      status= CIStatus.RcvNew()
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -221,7 +244,8 @@ fun PreviewCIMetaViewEditedSent() {
      itemEdited = true,
      status= CIStatus.SndSent(SndCIStatusProgress.Complete)
    ),
-    null
+    null,
+    showViaProxy = false
  )
 }

@@ -230,6 +254,7 @@ fun PreviewCIMetaViewEditedSent() {
 fun PreviewCIMetaViewDeletedContent() {
  CIMetaView(
    chatItem = ChatItem.getDeletedContentSampleData(),
-    null
+    null,
+    showViaProxy = false
  )
 }
@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.CurrentColors
+import chat.simplex.common.ui.theme.appColors
 import chat.simplex.common.views.helpers.AlertManager
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
@@ -137,7 +138,7 @@ fun DecryptionErrorItemFixButton(
  onClick: () -> Unit,
  syncSupported: Boolean
 ) {
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -164,17 +165,18 @@ fun DecryptionErrorItemFixButton(
            tint = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
          )
          Spacer(Modifier.padding(2.dp))
+          val secondaryColor = MaterialTheme.colors.secondary
          Text(
            buildAnnotatedString {
              append(generalGetString(MR.strings.fix_connection))
-              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null)) }
+              withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor)) }
              withStyle(reserveTimestampStyle) { append("    ") } // for icon
            },
            color = if (syncSupported) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
          )
        }
      }
-      CIMetaView(ci, timedMessagesTTL = null)
+      CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false)
    }
  }
 }
@@ -184,7 +186,7 @@ fun DecryptionErrorItem(
  ci: ChatItem,
  onClick: () -> Unit
 ) {
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -195,14 +197,15 @@ fun DecryptionErrorItem(
      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
      contentAlignment = Alignment.BottomEnd,
    ) {
+      val secondaryColor = MaterialTheme.colors.secondary
      Text(
        buildAnnotatedString {
          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
-          withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null)) }
+          withStyle(reserveTimestampStyle) { append(reserveSpaceForMeta(ci.meta, null, encrypted = null, secondaryColor = secondaryColor)) }
        },
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
      )
-      CIMetaView(ci, timedMessagesTTL = null)
+      CIMetaView(ci, timedMessagesTTL = null, showViaProxy = false)
    }
  }
 }
@@ -73,7 +73,7 @@ fun CIVideoView(
        VideoPreviewImageView(preview, onClick = {
          if (file != null) {
            when (file.fileStatus) {
-              CIFileStatus.RcvInvitation ->
+              CIFileStatus.RcvInvitation, CIFileStatus.RcvAborted ->
                receiveFileIfValidSize(file, receiveFile)
              CIFileStatus.RcvAccepted ->
                when (file.fileProtocol) {
@@ -102,7 +102,7 @@ fun CIVideoView(
        if (file != null) {
          DurationProgress(file, remember { mutableStateOf(false) }, remember { mutableStateOf(duration * 1000L) }, remember { mutableStateOf(0L) }/*, soundEnabled*/)
        }
-        if (file?.fileStatus is CIFileStatus.RcvInvitation) {
+        if (file?.fileStatus is CIFileStatus.RcvInvitation || file?.fileStatus is CIFileStatus.RcvAborted) {
          PlayButton(error = false, { showMenu.value = true }) { receiveFileIfValidSize(file, receiveFile) }
        }
      }
@@ -396,6 +396,7 @@ private fun loadingIndicator(file: CIFile?) {
          } else {
            progressIndicator()
          }
+        is CIFileStatus.RcvAborted -> fileIcon(painterResource(MR.images.ic_sync_problem), MR.strings.icon_descr_file)
        is CIFileStatus.RcvCancelled -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
        is CIFileStatus.RcvError -> fileIcon(painterResource(MR.images.ic_close), MR.strings.icon_descr_file)
        is CIFileStatus.Invalid -> fileIcon(painterResource(MR.images.ic_question_mark), MR.strings.icon_descr_file)
@@ -22,6 +22,7 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.ImageResource
 import kotlinx.coroutines.flow.*

 // TODO refactor https://github.com/simplex-chat/simplex-chat/pull/1451#discussion_r1033429901
@@ -35,6 +36,7 @@ fun CIVoiceView(
  hasText: Boolean,
  ci: ChatItem,
  timedMessagesTTL: Int?,
+  showViaProxy: Boolean,
  longClick: () -> Unit,
  receiveFile: (Long) -> Unit,
 ) {
@@ -76,7 +78,7 @@ fun CIVoiceView(
          durationText(time / 1000)
        }
      }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick, receiveFile) {
+      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, showViaProxy, play, pause, longClick, receiveFile) {
        AudioPlayer.seekTo(it, progress, fileSource.value?.filePath)
      }
    } else {
@@ -102,6 +104,7 @@ private fun VoiceLayout(
  sent: Boolean,
  hasText: Boolean,
  timedMessagesTTL: Int?,
+  showViaProxy: Boolean,
  play: () -> Unit,
  pause: () -> Unit,
  longClick: () -> Unit,
@@ -151,8 +154,8 @@ private fun VoiceLayout(
  }
  when {
    hasText -> {
-      val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-      val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+      val sentColor = MaterialTheme.appColors.sentMessage
+      val receivedColor = MaterialTheme.appColors.receivedMessage
      Spacer(Modifier.width(6.dp))
      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
      Row(verticalAlignment = Alignment.CenterVertically) {
@@ -171,7 +174,7 @@ private fun VoiceLayout(
          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
        }
        Box(Modifier.padding(top = 6.dp, end = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+          CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy)
        }
      }
    }
@@ -186,7 +189,7 @@ private fun VoiceLayout(
          }
        }
        Box(Modifier.padding(top = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+          CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy)
        }
      }
    }
@@ -218,10 +221,11 @@ private fun PlayPauseButton(
  error: Boolean,
  play: () -> Unit,
  pause: () -> Unit,
-  longClick: () -> Unit
+  longClick: () -> Unit,
+  icon: ImageResource = MR.images.ic_play_arrow_filled,
 ) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
    color = if (sent) sentColor else receivedColor,
@@ -239,7 +243,7 @@ private fun PlayPauseButton(
      contentAlignment = Alignment.Center
    ) {
      Icon(
-        if (audioPlaying) painterResource(MR.images.ic_pause_filled) else painterResource(MR.images.ic_play_arrow_filled),
+        if (audioPlaying) painterResource(MR.images.ic_pause_filled) else painterResource(icon),
        contentDescription = null,
        Modifier.size(36.dp),
        tint = if (error) WarningOrange else if (!enabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
@@ -292,6 +296,8 @@ private fun VoiceMsgIndicator(
      ) {
        ProgressIndicator()
      }
+    } else if (file?.fileStatus is CIFileStatus.RcvAborted) {
+      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, true, error, { receiveFile(file.fileId) }, {}, longClick = longClick, icon = MR.images.ic_sync_problem)
    } else {
      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, false, false, {}, {}, longClick)
    }
@@ -68,6 +68,7 @@ fun ChatItemView(
  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  developerTools: Boolean,
+  showViaProxy: Boolean
 ) {
  val uriHandler = LocalUriHandler.current
  val sent = cItem.chatDir.sent
@@ -83,17 +84,15 @@ fun ChatItemView(
      .fillMaxWidth(),
    contentAlignment = alignment,
  ) {
-    val onClick = {
-      when (cItem.meta.itemStatus) {
-        is CIStatus.SndErrorAuth -> {
-          showMsgDeliveryErrorAlert(generalGetString(MR.strings.message_delivery_error_desc))
-        }
-        is CIStatus.SndError -> {
-          showMsgDeliveryErrorAlert(generalGetString(MR.strings.unknown_error) + ": ${cItem.meta.itemStatus.agentError}")
-        }
-        else -> {}
+    val info = cItem.meta.itemStatus.statusInto
+    val onClick = if (info != null) {
+      {
+        AlertManager.shared.showAlertMsg(
+          title = info.first,
+          text = info.second,
+        )
      }
-    }
+    } else { {} }

    @Composable
    fun ChatItemReactions() {
@@ -130,7 +129,7 @@ fun ChatItemView(
      ) {
        @Composable
        fun framedItemView() {
-          FramedItemView(cInfo, cItem, uriHandler, imageProvider, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
+          FramedItemView(cInfo, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, receiveFile, onLinkLongClick, scrollToItem)
        }

        fun deleteMessageQuestionText(): String {
@@ -204,14 +203,10 @@ fun ChatItemView(
                }
                val clipboard = LocalClipboardManager.current
                val cachedRemoteReqs = remember { CIFile.cachedRemoteFileRequests }
-                fun fileForwardingAllowed() = when {
-                  cItem.file != null && chatModel.connectedToRemote() && cachedRemoteReqs[cItem.file.fileSource] != false && cItem.file.loaded -> true
-                  getLoadedFilePath(cItem.file) != null -> true
-                  else -> false
-                }
+
                val copyAndShareAllowed = when {
                  cItem.content.text.isNotEmpty() -> true
-                  fileForwardingAllowed() -> true
+                  cItem.file?.forwardingAllowed() == true -> true
                  else -> false
                }

@@ -261,7 +256,7 @@ fun ChatItemView(
                  })
                }
                if (cItem.meta.itemDeleted == null &&
-                  (cItem.file == null || fileForwardingAllowed()) &&
+                  (cItem.file == null || cItem.file.forwardingAllowed()) &&
                  !cItem.isLiveDummy && !live
                  ) {
                  ItemAction(stringResource(MR.strings.forward_chat_item), painterResource(MR.images.ic_forward), onClick = {
@@ -338,14 +333,14 @@ fun ChatItemView(
        fun ContentItem() {
          val mc = cItem.content.msgContent
          if (cItem.meta.itemDeleted != null && (!revealed.value || cItem.isDeletedContent)) {
-            MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, revealed)
+            MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy)
            MarkedDeletedItemDropdownMenu()
          } else {
            if (cItem.quotedItem == null && cItem.meta.itemForwarded == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
              if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-                EmojiItemView(cItem, cInfo.timedMessagesTTL)
+                EmojiItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy)
              } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-                CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") }, receiveFile)
+                CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy, longClick = { onLinkLongClick("") }, receiveFile)
              } else {
                framedItemView()
              }
@@ -357,7 +352,7 @@ fun ChatItemView(
        }

        @Composable fun LegacyDeletedItem() {
-          DeletedItemView(cItem, cInfo.timedMessagesTTL)
+          DeletedItemView(cItem, cInfo.timedMessagesTTL, showViaProxy = showViaProxy)
          DefaultDropdownMenu(showMenu) {
            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
            DeleteItemAction(cItem, revealed, showMenu, questionText = deleteMessageQuestionText(), deleteMessage, deleteMessages)
@@ -410,7 +405,7 @@ fun ChatItemView(

        @Composable
        fun DeletedItem() {
-          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, revealed)
+          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy)
          DefaultDropdownMenu(showMenu) {
            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
            DeleteItemAction(cItem, revealed, showMenu, questionText = generalGetString(MR.strings.delete_message_cannot_be_undone_warning), deleteMessage, deleteMessages)
@@ -820,50 +815,42 @@ fun moderateMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteM
  )
 }

-private fun showMsgDeliveryErrorAlert(description: String) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.message_delivery_error_title),
-    text = description,
-  )
-}
-
 expect fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager)

@Preview
@Composable
-fun PreviewChatItemView() {
-  SimpleXTheme {
-    ChatItemView(
-      rhId = null,
-      ChatInfo.Direct.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
-      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      revealed = remember { mutableStateOf(false) },
-      range = 0..1,
-      deleteMessage = { _, _ -> },
-      deleteMessages = { _ -> },
-      receiveFile = { _ -> },
-      cancelFile = {},
-      joinGroup = { _, _ -> },
-      acceptCall = { _ -> },
-      scrollToItem = {},
-      acceptFeature = { _, _, _ -> },
-      openDirectChat = { _ -> },
-      updateContactStats = { },
-      updateMemberStats = { _, _ -> },
-      syncContactConnection = { },
-      syncMemberConnection = { _, _ -> },
-      findModelChat = { null },
-      findModelMember = { null },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
-      developerTools = false,
-    )
-  }
+fun PreviewChatItemView(
+  chatItem: ChatItem = ChatItem.getSampleData(1, CIDirection.DirectSnd(), Clock.System.now(), "hello")
+) {
+  ChatItemView(
+    rhId = null,
+    ChatInfo.Direct.sampleData,
+    chatItem,
+    useLinkPreviews = true,
+    linkMode = SimplexLinkMode.DESCRIPTION,
+    composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
+    revealed = remember { mutableStateOf(false) },
+    range = 0..1,
+    deleteMessage = { _, _ -> },
+    deleteMessages = { _ -> },
+    receiveFile = { _ -> },
+    cancelFile = {},
+    joinGroup = { _, _ -> },
+    acceptCall = { _ -> },
+    scrollToItem = {},
+    acceptFeature = { _, _, _ -> },
+    openDirectChat = { _ -> },
+    updateContactStats = { },
+    updateMemberStats = { _, _ -> },
+    syncContactConnection = { },
+    syncMemberConnection = { _, _ -> },
+    findModelChat = { null },
+    findModelMember = { null },
+    setReaction = { _, _, _, _ -> },
+    showItemDetails = { _, _ -> },
+    developerTools = false,
+    showViaProxy = false,
+  )
 }

@Preview
@@ -897,6 +884,7 @@ fun PreviewChatItemViewDeletedContent() {
      setReaction = { _, _, _, _ -> },
      showItemDetails = { _, _ -> },
      developerTools = false,
+      showViaProxy = false
    )
  }
 }
@@ -16,10 +16,10 @@ import chat.simplex.common.model.ChatItem
 import chat.simplex.common.ui.theme.*

@Composable
-fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?) {
+fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean) {
  val sent = ci.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
    color = if (sent) sentColor else receivedColor,
@@ -36,7 +36,7 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?) {
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
        modifier = Modifier.padding(end = 8.dp)
      )
-      CIMetaView(ci, timedMessagesTTL)
+      CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy)
    }
  }
 }
@@ -50,7 +50,8 @@ fun PreviewDeletedItemView() {
  SimpleXTheme {
    DeletedItemView(
      ChatItem.getDeletedContentSampleData(),
-      null
+      null,
+      showViaProxy = false
    )
  }
 }
@@ -17,13 +17,13 @@ val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp, fontFamily = EmojiFo
 val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp, fontFamily = EmojiFont)

@Composable
-fun EmojiItemView(chatItem: ChatItem, timedMessagesTTL: Int?) {
+fun EmojiItemView(chatItem: ChatItem, timedMessagesTTL: Int?, showViaProxy: Boolean) {
  Column(
    Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
    horizontalAlignment = Alignment.CenterHorizontally
  ) {
    EmojiText(chatItem.content.text)
-    CIMetaView(chatItem, timedMessagesTTL)
+    CIMetaView(chatItem, timedMessagesTTL, showViaProxy = showViaProxy)
  }
 }

@@ -23,7 +23,6 @@ import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.chat.MEMBER_IMAGE_SIZE
 import chat.simplex.res.MR
 import kotlin.math.min

@@ -34,6 +33,7 @@ fun FramedItemView(
  uriHandler: UriHandler? = null,
  imageProvider: (() -> ImageGalleryProvider)? = null,
  linkMode: SimplexLinkMode,
+  showViaProxy: Boolean,
  showMenu: MutableState<Boolean>,
  receiveFile: (Long) -> Unit,
  onLinkLongClick: (link: String) -> Unit = {},
@@ -46,9 +46,6 @@ fun FramedItemView(
    return if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.membership else null
  }

-  @Composable
-  fun Color.toQuote(): Color = if (isInDarkTheme()) lighter(0.12f) else darker(0.12f)
-
  @Composable
  fun ciQuotedMsgTextView(qi: CIQuote, lines: Int) {
    MarkdownText(
@@ -76,7 +73,8 @@ fun FramedItemView(
        ) {
          Text(
            sender,
-            style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary)
+            style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
+            maxLines = 1
          )
          ciQuotedMsgTextView(qi, lines = 2)
        }
@@ -88,11 +86,11 @@ fun FramedItemView(

  @Composable
  fun FramedItemHeader(caption: String, italic: Boolean, icon: Painter? = null, pad: Boolean = false) {
-    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+    val sentColor = MaterialTheme.appColors.sentQuote
+    val receivedColor = MaterialTheme.appColors.receivedQuote
    Row(
      Modifier
-        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
+        .background(if (sent) sentColor else receivedColor)
        .fillMaxWidth()
        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (pad || (ci.quotedItem == null && ci.meta.itemForwarded == null)) 6.dp else 0.dp),
      horizontalArrangement = Arrangement.spacedBy(4.dp),
@@ -121,11 +119,11 @@ fun FramedItemView(

  @Composable
  fun ciQuoteView(qi: CIQuote) {
-    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+    val sentColor = MaterialTheme.appColors.sentQuote
+    val receivedColor = MaterialTheme.appColors.receivedQuote
    Row(
      Modifier
-        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
+        .background(if (sent) sentColor else receivedColor)
        .fillMaxWidth()
        .combinedClickable(
          onLongClick = { showMenu.value = true },
@@ -178,19 +176,26 @@ fun FramedItemView(

  @Composable
  fun ciFileView(ci: ChatItem, text: String) {
-    CIFileView(ci.file, ci.meta.itemEdited, receiveFile)
+    CIFileView(ci.file, ci.meta.itemEdited, showMenu, receiveFile)
    if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(ci, chatTTL, linkMode = linkMode, uriHandler)
+      CIMarkdownText(ci, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy)
    }
  }

  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null && ci.meta.itemForwarded == null

-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Box(Modifier
    .clip(RoundedCornerShape(18.dp))
+    .background(
+      when {
+        transparentBackground -> Color.Transparent
+        sent -> MaterialTheme.colors.background
+        else -> MaterialTheme.colors.background
+      }
+    )
    .background(
      when {
        transparentBackground -> Color.Transparent
@@ -240,11 +245,11 @@ fun FramedItemView(
          } else {
            when (val mc = ci.content.msgContent) {
              is MsgContent.MCImage -> {
-                CIImageView(image = mc.image, file = ci.file, metaColor = metaColor, imageProvider ?: return@PriorityLayout, showMenu, receiveFile)
+                CIImageView(image = mc.image, file = ci.file, imageProvider ?: return@PriorityLayout, showMenu, receiveFile)
                if (mc.text == "" && !ci.meta.isLive) {
                  metaColor = Color.White
                } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler)
+                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
                }
              }
              is MsgContent.MCVideo -> {
@@ -252,35 +257,35 @@ fun FramedItemView(
                if (mc.text == "" && !ci.meta.isLive) {
                  metaColor = Color.White
                } else {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler)
+                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
                }
              }
              is MsgContent.MCVoice -> {
-                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") }, receiveFile)
+                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, showViaProxy = showViaProxy, longClick = { onLinkLongClick("") }, receiveFile)
                if (mc.text != "") {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler)
+                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy)
                }
              }
              is MsgContent.MCFile -> ciFileView(ci, mc.text)
              is MsgContent.MCUnknown ->
                if (ci.file == null) {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick)
+                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
                } else {
                  ciFileView(ci, mc.text)
                }
              is MsgContent.MCLink -> {
                ChatItemLinkView(mc.preview)
                Box(Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
-                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick)
+                  CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
                }
              }
-              else -> CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick)
+              else -> CIMarkdownText(ci, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy)
            }
          }
        }
      }
      Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
-        CIMetaView(ci, chatTTL, metaColor)
+        CIMetaView(ci, chatTTL, metaColor, showViaProxy = showViaProxy)
      }
    }
  }
@@ -292,14 +297,15 @@ fun CIMarkdownText(
  chatTTL: Int?,
  linkMode: SimplexLinkMode,
  uriHandler: UriHandler?,
-  onLinkLongClick: (link: String) -> Unit = {}
+  onLinkLongClick: (link: String) -> Unit = {},
+  showViaProxy: Boolean
 ) {
  Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
    val text = if (ci.meta.isLive) ci.content.msgContent?.text ?: ci.text else ci.text
    MarkdownText(
      text, if (text.isEmpty()) emptyList() else ci.formattedText, toggleSecrets = true,
      meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
-      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick
+      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick, showViaProxy = showViaProxy
    )
  }
 }
@@ -17,8 +17,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatItem
 import chat.simplex.common.model.MsgErrorType
-import chat.simplex.common.ui.theme.CurrentColors
-import chat.simplex.common.ui.theme.SimpleXTheme
+import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.AlertManager
 import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
@@ -51,7 +50,7 @@ fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, timedMessagesTT

@Composable
 fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, onClick: () -> Unit) {
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    Modifier.clickable(onClick = onClick),
    shape = RoundedCornerShape(18.dp),
@@ -69,7 +68,7 @@ fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, onClick: () -> Unit) {
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
        modifier = Modifier.padding(end = 8.dp)
      )
-      CIMetaView(ci, timedMessagesTTL)
+      CIMetaView(ci, timedMessagesTTL, showViaProxy = false)
    }
  }
 }
@@ -20,9 +20,9 @@ import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.datetime.Clock

@Composable
-fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, revealed: MutableState<Boolean>) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, revealed: MutableState<Boolean>, showViaProxy: Boolean) {
+  val sentColor = MaterialTheme.appColors.sentMessage
+  val receivedColor = MaterialTheme.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
    color = if (ci.chatDir.sent) sentColor else receivedColor,
@@ -35,7 +35,7 @@ fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, revealed: Mutabl
      Box(Modifier.weight(1f, false)) {
        MergedMarkedDeletedText(ci, revealed)
      }
-      CIMetaView(ci, timedMessagesTTL)
+      CIMetaView(ci, timedMessagesTTL, showViaProxy = showViaProxy)
    }
  }
 }
@@ -112,7 +112,8 @@ fun PreviewMarkedDeletedItemView() {
  SimpleXTheme {
    DeletedItemView(
      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted(Clock.System.now())),
-      null
+      null,
+      showViaProxy = false
    )
  }
 }
@@ -69,7 +69,8 @@ fun MarkdownText (
  modifier: Modifier = Modifier,
  linkMode: SimplexLinkMode,
  inlineContent: Pair<AnnotatedString.Builder.() -> Unit, Map<String, InlineTextContent>>? = null,
-  onLinkLongClick: (link: String) -> Unit = {}
+  onLinkLongClick: (link: String) -> Unit = {},
+  showViaProxy: Boolean = false
 ) {
  val textLayoutDirection = remember (text) {
    if (isRtl(text.subSequence(0, kotlin.math.min(50, text.length)))) LayoutDirection.Rtl else LayoutDirection.Ltr
@@ -77,7 +78,7 @@ fun MarkdownText (
  val reserve = if (textLayoutDirection != LocalLayoutDirection.current && meta != null) {
    "\n"
  } else if (meta != null) {
-    reserveSpaceForMeta(meta, chatTTL, null) // LALAL
+    reserveSpaceForMeta(meta, chatTTL, null, secondaryColor = MaterialTheme.colors.secondary, showViaProxy = showViaProxy)
  } else {
    "    "
  }
@@ -486,6 +486,8 @@ fun deleteChatDatabaseFilesAndState() {
  tmpDir.deleteRecursively()
  getMigrationTempFilesDirectory().deleteRecursively()
  tmpDir.mkdir()
+  wallpapersDir.deleteRecursively()
+  wallpapersDir.mkdirs()
  DatabaseUtils.ksDatabasePassword.remove()
  controller.appPrefs.storeDBPassphrase.set(true)
  controller.ctrl = null
--- a/Show More
+++ b/Show More