Merge branch 'stable' into stable-ios

core: 5.4.4.0
ci: disable *-armv7a tags
2024-12-17 17:20:21 +01:00 · 2024-01-18 20:59:49 +00:00 · 2024-01-18 20:56:45 +00:00 · 2024-01-17 19:27:07 +00:00 · 2024-01-17 15:23:43 +00:00 · 2024-01-16 23:42:29 +00:00
588 changed files with 43163 additions and 11496 deletions
@@ -8,6 +8,8 @@ on:
      - users
    tags:
      - "v*"
+      - "!*-fdroid"
+      - "!*-armv7a"
  pull_request:

 jobs:
@@ -78,10 +80,10 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
        with:
-          ghc-version: "9.6.2"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"

      - name: Cache dependencies
        uses: actions/cache@v3
@@ -187,7 +189,7 @@ jobs:
          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
        run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
          echo "package_path=$path" >> $GITHUB_OUTPUT
          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -258,13 +260,40 @@ jobs:
      # Unix /

      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
+
+      - name: 'Setup MSYS2'
+        if: matrix.os == 'windows-latest'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ucrt64
+          update: true
+          install: >-
+            git
+            perl
+            make
+          pacboy: >-
+            toolchain:p
+            cmake:p
+

      - name: Windows build
        id: windows_build
        if: matrix.os == 'windows-latest'
-        shell: bash
+        shell: msys2 {0}
        run: |
+          export PATH=$PATH:/c/ghcup/bin
+          scripts/desktop/prepare-openssl-windows.sh
+          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
+          rm cabal.project.local 2>/dev/null || true
+          echo "ignore-project: False" >> cabal.project.local
+          echo "package direct-sqlcipher" >> cabal.project.local
+          echo "    flags: +openssl" >> cabal.project.local
+          echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
+          echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
+
          rm -rf dist-newstyle/src/direct-sq*
          sed -i "s/, unix /--, unix /" simplex-chat.cabal
          cabal build --enable-tests
@@ -292,4 +321,36 @@ jobs:
          body: |
            ${{ steps.windows_build.outputs.bin_hash }}

+      - name: Windows build desktop
+        id: windows_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        shell: msys2 {0}
+        run: |
+          export PATH=$PATH:/c/ghcup/bin
+          scripts/desktop/build-lib-windows.sh
+          cd apps/multiplatform
+          ./gradlew packageMsi
+          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+      
+      - name: Windows upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.windows_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Windows update desktop package hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.windows_desktop_build.outputs.package_hash }}
+
      # Windows /
@@ -9,6 +9,7 @@ on:
      - website/**
      - images/**
      - blog/**
+      - docs/**
      - .github/workflows/web.yml

 jobs:
@@ -8,12 +8,12 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
    chmod +x /usr/bin/ghcup

 # Install ghc
-RUN ghcup install ghc 8.10.7
+RUN ghcup install ghc 9.6.3
 # Install cabal
-RUN ghcup install cabal
+RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal
+RUN ghcup set ghc 9.6.3 && \
+    ghcup set cabal 3.10.1.0

 COPY . /project
 WORKDIR /project
@@ -119,19 +119,22 @@ Join our translators to help SimpleX grow!
 |locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 en|English   | |✓|✓|✓|✓|
-|ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
-|🇧🇬 bg|Български |-|[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>-|||
+|ar|العربية   |[jermanuts](https://github.com/jermanuts)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/ar/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ar/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|🇧🇬 bg|Български | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>[![ios app](https://hosted.weblate.org/widget/simplex-chat/ios/bg/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/bg/)|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
+|🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
+|🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|||
+|🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
 |🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
 |🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
+|🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||

 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -227,24 +230,20 @@ You can use SimpleX with your own servers and still communicate with people usin

 ## News and updates

-Recent updates:
+Recent and important updates:

-[July 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+[Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).
+
+[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
+
+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).

 [May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).

 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).

-[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
-
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).

-[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
-
-[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
-
-[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
-
 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
@@ -290,18 +289,20 @@ What is already implemented:
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
 4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
 5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
 7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
 8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
 12. Manual messaging queue rotations to move conversation to another SMP relay.
+13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+14. Local files encryption, except videos (to be added later).

 We plan to add:

-1. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. This is currently in progress.
-2. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+2. Post-quantum resistant key exchange in double ratchet protocol.
 3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
 4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
 5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
@@ -365,22 +366,26 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
 - ✅ Message delivery confirmation (with sender opt-out per contact).
- 🏗 Desktop client.
+- ✅ Desktop client.
+- ✅ Encryption of local files stored in the app.
+- ✅ Using mobile profiles from the desktop app.
+- 🏗 Improve experience for the new users.
+- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
+- 🏗 Large groups, communities and public channels.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
- Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
- Large groups, communities and public channels.
 - Feeds/broadcasts.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
 - Privately share your location.
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
- Supporting the same profile on multiple devices.
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
  - keep all your contacts and groups even if you lose the domain.
  - the server doesn't have information about your contacts and groups.
- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.

 ## Disclaimers
@@ -42,6 +42,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        let m = ChatModel.shared
        let deviceToken = DeviceToken(pushProvider: PushProvider(env: pushEnvironment), token: token)
        m.deviceToken = deviceToken
+        // savedToken is set in startChat, when it is started before this method is called
        if m.savedToken != nil {
            registerToken(token: deviceToken)
        }
@@ -55,7 +56,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                     didReceiveRemoteNotification userInfo: [AnyHashable : Any],
                     fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
        logger.debug("AppDelegate: didReceiveRemoteNotification")
-        print("*** userInfo", userInfo)
        let m = ChatModel.shared
        if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
           m.notificationMode != .off {
@@ -81,7 +81,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                }
            } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
+                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
                    receiveMessages(completionHandler)
                } else {
                    completionHandler(.noData)
@@ -121,6 +121,10 @@ class AppDelegate: NSObject, UIApplicationDelegate {

        BGManager.shared.receiveMessages(complete)
    }
+
+    static func keepScreenOn(_ on: Bool) {
+        UIApplication.shared.isIdleTimerDisabled = on
+    }
 }

 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
@@ -14,11 +14,14 @@ struct ContentView: View {
    @ObservedObject var alertManager = AlertManager.shared
    @ObservedObject var callController = CallController.shared
    @Environment(\.colorScheme) var colorScheme
-    @Binding var doAuthenticate: Bool
-    @Binding var userAuthorized: Bool?
-    @Binding var canConnectCall: Bool
-    @Binding var lastSuccessfulUnlock: TimeInterval?
-    @Binding var showInitializationView: Bool
+
+    var contentAccessAuthenticationExtended: Bool
+
+    @Environment(\.scenePhase) var scenePhase
+    @State private var automaticAuthenticationAttempted = false
+    @State private var canConnectViewCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+
    @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
    @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -31,18 +34,28 @@ struct ContentView: View {
    @State private var chatListActionSheet: ChatListActionSheet? = nil

    private enum ChatListActionSheet: Identifiable {
-        case connectViaUrl(action: ConnReqType, link: String)
+        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)

        var id: String {
            switch self {
-            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
+            case let .planAndConnectSheet(sheet): return sheet.id
            }
        }
    }

+    private var accessAuthenticated: Bool {
+        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
+    }
+
    var body: some View {
        ZStack {
-            contentView()
+            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
+            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
+            if !prefPerformLA || accessAuthenticated {
+                contentView()
+            } else {
+                lockButton()
+            }
            if chatModel.showCallView, let call = chatModel.activeCall {
                callView(call)
            }
@@ -50,6 +63,7 @@ struct ContentView: View {
                LocalAuthView(authRequest: la)
            } else if showSetPasscode {
                SetAppPasscodeView {
+                    chatModel.contentViewAccessAuthenticated = true
                    prefPerformLA = true
                    showSetPasscode = false
                    privacyLocalAuthModeDefault.set(.passcode)
@@ -60,13 +74,9 @@ struct ContentView: View {
                    alertManager.showAlert(laPasscodeNotSetAlert())
                }
            }
-        }
-        .onAppear {
-            if prefPerformLA { requestNtfAuthorization() }
-            initAuthenticate()
-        }
-        .onChange(of: doAuthenticate) { _ in
-            initAuthenticate()
+            if chatModel.chatDbStatus == nil {
+                initializationView()
+            }
        }
        .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
        .sheet(isPresented: $showSettings) {
@@ -76,14 +86,44 @@ struct ContentView: View {
            Button("System authentication") { initialEnableLA() }
            Button("Passcode entry") { showSetPasscode = true }
        }
+        .onChange(of: scenePhase) { phase in
+            logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
+            switch (phase) {
+            case .background:
+                // also see .onChange(of: scenePhase) in SimpleXApp: on entering background
+                // it remembers enteredBackgroundAuthenticated and sets chatModel.contentViewAccessAuthenticated to false
+                automaticAuthenticationAttempted = false
+                canConnectViewCall = false
+            case .active:
+                canConnectViewCall = !prefPerformLA || contentAccessAuthenticationExtended || unlockedRecently()
+                
+                // condition `!chatModel.contentViewAccessAuthenticated` is required for when authentication is enabled in settings or on initial notice
+                if prefPerformLA && !chatModel.contentViewAccessAuthenticated {
+                    if AppChatState.shared.value != .stopped {
+                        if contentAccessAuthenticationExtended {
+                            chatModel.contentViewAccessAuthenticated = true
+                        } else {
+                            if !automaticAuthenticationAttempted {
+                                automaticAuthenticationAttempted = true
+                                // authenticate if call kit call is not in progress
+                                if !(CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil) {
+                                    authenticateContentViewAccess()
+                                }
+                            }
+                        }
+                    } else {
+                        // when app is stopped automatic authentication is not attempted
+                        chatModel.contentViewAccessAuthenticated = contentAccessAuthenticationExtended
+                    }
+                }
+            default:
+                break
+            }
+        }
    }

    @ViewBuilder private func contentView() -> some View {
-        if prefPerformLA && userAuthorized != true {
-            lockButton()
-        } else if chatModel.chatDbStatus == nil && showInitializationView {
-            initializationView()
-        } else if let status = chatModel.chatDbStatus, status != .ok {
+        if let status = chatModel.chatDbStatus, status != .ok {
            DatabaseErrorView(status: status)
        } else if !chatModel.v3DBMigration.startChat {
            MigrateToAppGroupView()
@@ -93,7 +133,7 @@ struct ContentView: View {
                mainView()
                .actionSheet(item: $chatListActionSheet) { sheet in
                    switch sheet {
-                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
+                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
                    }
                }
            } else {
@@ -106,11 +146,11 @@ struct ContentView: View {
        if CallController.useCallKit() {
            ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                .onDisappear {
-                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
+                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
                }
        } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectCall)
-            if prefPerformLA && userAuthorized != true {
+            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
+            if prefPerformLA && !accessAuthenticated {
                Rectangle()
                    .fill(colorScheme == .dark ? .black : .white)
                    .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -120,22 +160,27 @@ struct ContentView: View {
    }

    private func lockButton() -> some View {
-        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
+        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
    }

    private func initializationView() -> some View {
        VStack {
            ProgressView().scaleEffect(2)
-            Text("Opening database…")
+            Text("Opening app…")
                .padding()
        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity )
+        .background(
+            Rectangle()
+                .fill(.background)
+        ) 
    }

    private func mainView() -> some View {
        ZStack(alignment: .top) {
            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
            .onAppear {
-                if !prefPerformLA { requestNtfAuthorization() }
+                requestNtfAuthorization()
                // Local Authentication notice is to be shown on next start after onboarding is complete
                if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                    prefLANoticeShown = true
@@ -187,48 +232,37 @@ struct ContentView: View {
        }
    }

-    private func initAuthenticate() {
-        logger.debug("initAuthenticate")
-        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
-            userAuthorized = false
-        } else if doAuthenticate {
-            runAuthenticate()
-        }
-    }
-
-    private func runAuthenticate() {
-        logger.debug("DEBUGGING: runAuthenticate")
-        if !prefPerformLA {
-            userAuthorized = true
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
        } else {
-            logger.debug("DEBUGGING: before dismissAllSheets")
-            dismissAllSheets(animated: false) {
-                logger.debug("DEBUGGING: in dismissAllSheets callback")
-                chatModel.chatId = nil
-                justAuthenticate()
-            }
+            return false
        }
    }

-    private func justAuthenticate() {
-        userAuthorized = false
-        let laMode = privacyLocalAuthModeDefault.get()
-        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
-            switch (laResult) {
-            case .success:
-                userAuthorized = true
-                canConnectCall = true
-                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
-            case .failed:
-                if laMode == .passcode {
-                    AlertManager.shared.showAlert(laFailedAlert())
+    private func authenticateContentViewAccess() {
+        logger.debug("DEBUGGING: authenticateContentViewAccess")
+        dismissAllSheets(animated: false) {
+            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
+            chatModel.chatId = nil
+
+            authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+                logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
+                switch (laResult) {
+                case .success:
+                    chatModel.contentViewAccessAuthenticated = true
+                    canConnectViewCall = true
+                    lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
+                case .failed:
+                    chatModel.contentViewAccessAuthenticated = false
+                    if privacyLocalAuthModeDefault.get() == .passcode {
+                        AlertManager.shared.showAlert(laFailedAlert())
+                    }
+                case .unavailable:
+                    prefPerformLA = false
+                    canConnectViewCall = true
+                    AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
                }
-            case .unavailable:
-                userAuthorized = true
-                prefPerformLA = false
-                canConnectCall = true
-                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
            }
        }
    }
@@ -259,6 +293,7 @@ struct ContentView: View {
        authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
            switch laResult {
            case .success:
+                chatModel.contentViewAccessAuthenticated = true
                prefPerformLA = true
                alertManager.showAlert(laTurnedOnAlert())
            case .failed:
@@ -290,12 +325,16 @@ struct ContentView: View {
            if let url = m.appOpenUrl {
                m.appOpenUrl = nil
                var path = url.path
-                logger.debug("ContentView.connectViaUrl path: \(path)")
                if (path == "/contact" || path == "/invitation") {
                    path.removeFirst()
-                    let action: ConnReqType = path == "contact" ? .contact : .invitation
                    let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                    chatListActionSheet = .connectViaUrl(action: action, link: link)
+                    planAndConnect(
+                        link,
+                        showAlert: showPlanAndConnectAlert,
+                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
+                        dismiss: false,
+                        incognito: nil
+                    )
                } else {
                    AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
                }
@@ -303,20 +342,8 @@ struct ContentView: View {
        }
    }

-    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
-        let title: LocalizedStringKey
-        switch action {
-        case .contact: title = "Connect via contact link"
-        case .invitation: title = "Connect via one-time link"
-        }
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
-                .cancel()
-            ]
-        )
+    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
+        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
    }
 }

@@ -46,6 +46,7 @@ class AudioRecorder {
            audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)

            await MainActor.run {
+                AppDelegate.keepScreenOn(true)
                recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
                    guard let time = self.audioRecorder?.currentTime else { return }
                    self.onTimer?(time)
@@ -57,6 +58,10 @@ class AudioRecorder {
            }
            return nil
        } catch let error {
+            await MainActor.run {
+                AppDelegate.keepScreenOn(false)
+            }
+            try? av.setCategory(AVAudioSession.Category.soloAmbient)
            logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
            return .error(error.localizedDescription)
        }
@@ -71,6 +76,8 @@ class AudioRecorder {
            timer.invalidate()
        }
        recordingTimer = nil
+        AppDelegate.keepScreenOn(false)
+        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
    }

    private func checkPermission() async -> Bool {
@@ -121,14 +128,19 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {

        playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
            if self.audioPlayer?.isPlaying ?? false {
+                AppDelegate.keepScreenOn(true)
                guard let time = self.audioPlayer?.currentTime else { return }
                self.onTimer?(time)
+                AudioPlayer.changeAudioSession(true)
+            } else {
+                AudioPlayer.changeAudioSession(false)
            }
        }
    }

    func pause() {
        audioPlayer?.pause()
+        AppDelegate.keepScreenOn(false)
    }

    func play() {
@@ -149,6 +161,8 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
    func stop() {
        if let player = audioPlayer {
            player.stop()
+            AppDelegate.keepScreenOn(false)
+            AudioPlayer.changeAudioSession(false)
        }
        audioPlayer = nil
        if let timer = playbackTimer {
@@ -157,6 +171,24 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        playbackTimer = nil
    }

+    static func changeAudioSession(_ playback: Bool) {
+        // When there is a audio recording, setting any other category will disable sound
+        if AVAudioSession.sharedInstance().category == .playAndRecord {
+            return
+        }
+        if playback {
+            if AVAudioSession.sharedInstance().category != .playback {
+                logger.log("AudioSession: playback")
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
+            }
+        } else {
+            if AVAudioSession.sharedInstance().category != .soloAmbient {
+                logger.log("AudioSession: soloAmbient")
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
+            }
+        }
+    }
+
    func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
        stop()
        self.onFinishPlayback?()
@@ -15,7 +15,13 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6

-private let bgRefreshInterval: TimeInterval = 450
+// This is the smallest interval between refreshes, and also target interval in "off" mode
+private let bgRefreshInterval: TimeInterval = 600 // 10 minutes
+
+// This intervals are used for background refresh in instant and periodic modes
+private let periodicBgRefreshInterval: TimeInterval = 1200 // 20 minutes
+
+private let maxBgRefreshInterval: TimeInterval = 2400 // 40 minutes

 private let maxTimerCount = 9

@@ -33,14 +39,14 @@ class BGManager {
        }
    }

-    func schedule() {
+    func schedule(interval: TimeInterval? = nil) {
        if !ChatModel.shared.ntfEnableLocal {
            logger.debug("BGManager.schedule: disabled")
            return
        }
        logger.debug("BGManager.schedule")
        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
        do {
            try BGTaskScheduler.shared.submit(request)
        } catch {
@@ -48,20 +54,34 @@ class BGManager {
        }
    }

+    var runInterval: TimeInterval {
+        switch ChatModel.shared.notificationMode {
+        case .instant: maxBgRefreshInterval
+        case .periodic: periodicBgRefreshInterval
+        case .off: bgRefreshInterval
+        }
+    }
+
+    var lastRanLongAgo: Bool {
+        Date.now.timeIntervalSince(chatLastBackgroundRunGroupDefault.get()) > runInterval
+    }
+
    private func handleRefresh(_ task: BGAppRefreshTask) {
        if !ChatModel.shared.ntfEnableLocal {
            logger.debug("BGManager.handleRefresh: disabled")
            return
        }
        logger.debug("BGManager.handleRefresh")
-        schedule()
-        if appStateGroupDefault.get().inactive {
+        let shouldRun_ = lastRanLongAgo
+        if allowBackgroundRefresh() && shouldRun_ {
+            schedule()
            let completeRefresh = completionHandler {
                task.setTaskCompleted(success: true)
            }
            task.expirationHandler = { completeRefresh("expirationHandler") }
            receiveMessages(completeRefresh)
        } else {
+            schedule(interval: shouldRun_ ? bgRefreshInterval : runInterval)
            logger.debug("BGManager.completionHandler: already active, not started")
            task.setTaskCompleted(success: true)
        }
@@ -90,20 +110,22 @@ class BGManager {
        }
        self.completed = false
        DispatchQueue.main.async {
+            chatLastBackgroundRunGroupDefault.set(Date.now)
            let m = ChatModel.shared
            if (!m.chatInitialized) {
+                setAppState(.bgRefresh)
                do {
                    try initializeChat(start: true)
                } catch let error {
                    fatalError("Failed to start or load chats: \(responseError(error))")
                }
            }
+            activateChat(appState: .bgRefresh)
            if m.currentUser == nil {
                completeReceiving("no current user")
                return
            }
            logger.debug("BGManager.receiveMessages: starting chat")
-            activateChat(appState: .bgRefresh)
            let cr = ChatReceiver()
            self.chatReceiver = cr
            cr.start()
@@ -54,6 +54,8 @@ final class ChatModel: ObservableObject {
    @Published var chatDbChanged = false
    @Published var chatDbEncrypted: Bool?
    @Published var chatDbStatus: DBMigrationResult?
+    // local authentication
+    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
    @Published var chats: [Chat] = []
@@ -62,8 +64,9 @@ final class ChatModel: ObservableObject {
    // current chat
    @Published var chatId: String?
    @Published var reversedChatItems: [ChatItem] = []
+    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
    @Published var chatToTop: String?
-    @Published var groupMembers: [GroupMember] = []
+    @Published var groupMembers: [GMember] = []
    // items in the terminal view
    @Published var showingTerminal = false
    @Published var terminalItems: [TerminalItem] = []
@@ -82,8 +85,10 @@ final class ChatModel: ObservableObject {
    // current WebRTC call
    @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
    @Published var activeCall: Call?
-    @Published var callCommand: WCallCommand?
+    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
    @Published var showCallView = false
+    // remote desktop
+    @Published var remoteCtrlSession: RemoteCtrlSession?
    // currently showing QR code
    @Published var connReqInv: String?
    // audio recording and playback
@@ -101,12 +106,14 @@ final class ChatModel: ObservableObject {

    static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }

-    var ntfEnableLocal: Bool {
-        notificationMode == .off || ntfEnableLocalGroupDefault.get()
-    }
+    let ntfEnableLocal = true

    var ntfEnablePeriodic: Bool {
-        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+        notificationMode != .off
+    }
+
+    var activeRemoteCtrl: Bool {
+        remoteCtrlSession?.active ?? false
    }

    func getUser(_ userId: Int64) -> User? {
@@ -152,6 +159,20 @@ final class ChatModel: ObservableObject {
        }
    }

+    func getGroupChat(_ groupId: Int64) -> Chat? {
+        chats.first { chat in
+            if case let .group(groupInfo) = chat.chatInfo {
+                return groupInfo.groupId == groupId
+            } else {
+                return false
+            }
+        }
+    }
+
+    func getGroupMember(_ groupMemberId: Int64) -> GMember? {
+        groupMembers.first { $0.groupMemberId == groupMemberId }
+    }
+
    private func getChatIndex(_ id: String) -> Int? {
        chats.firstIndex(where: { $0.id == id })
    }
@@ -165,6 +186,7 @@ final class ChatModel: ObservableObject {
    func updateChatInfo(_ cInfo: ChatInfo) {
        if let i = getChatIndex(cInfo.id) {
            chats[i].chatInfo = cInfo
+            chats[i].created = Date.now
        }
    }

@@ -178,7 +200,7 @@ final class ChatModel: ObservableObject {

    func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
        var updatedConn = contact.activeConn
-        updatedConn.connectionStats = connectionStats
+        updatedConn?.connectionStats = connectionStats
        var updatedContact = contact
        updatedContact.activeConn = updatedConn
        updateContact(updatedContact)
@@ -245,7 +267,20 @@ final class ChatModel: ObservableObject {
    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
        // update previews
        if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = [cItem]
+            chats[i].chatItems = switch cInfo {
+            case .group:
+                if let currentPreviewItem = chats[i].chatItems.first {
+                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
+                        [cItem]
+                    } else {
+                        [currentPreviewItem]
+                    }
+                } else {
+                    [cItem]
+                }
+            default:
+                [cItem]
+            }
            if case .rcvNew = cItem.meta.itemStatus {
                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                increaseUnreadCounter(user: currentUser!)
@@ -296,7 +331,11 @@ final class ChatModel: ObservableObject {
            return false
        } else {
            withAnimation(itemAnimation()) {
-                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
+                var ci = cItem
+                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
+                    ci.meta.itemStatus = status
+                }
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
            }
            return true
        }
@@ -309,26 +348,22 @@ final class ChatModel: ObservableObject {
        }
    }

-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
            withAnimation {
                _updateChatItem(at: i, with: cItem)
            }
+        } else if let status = status {
+            chatItemStatuses.updateValue(status, forKey: cItem.id)
        }
    }

    private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        let ci = reversedChatItems[i]
        reversedChatItems[i] = cItem
        reversedChatItems[i].viewTimestamp = .now
-        // on some occasions the confirmation of message being accepted by the server (tick)
-        // arrives earlier than the response from API, and item remains without tick
-        if case .sndNew = cItem.meta.itemStatus {
-            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
-        }
    }

-    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
        reversedChatItems.firstIndex(where: { $0.id == cItem.id })
    }

@@ -464,6 +499,7 @@ final class ChatModel: ObservableObject {
        }
        // clear current chat
        if chatId == cInfo.id {
+            chatItemStatuses = [:]
            reversedChatItems = []
        }
    }
@@ -516,27 +552,62 @@ final class ChatModel: ObservableObject {
            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
    }

-    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
-        guard var i = getChatItemIndex(ci) else { return [] }
+    // this function analyses "connected" events and assumes that each member will be there only once
+    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
+        var count = 0
        var ns: [String] = []
-        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
-            ns.append(m.displayName)
-            i += 1
+        if let ciCategory = chatItem.mergeCategory,
+           var i = getChatItemIndex(chatItem) {
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
+                if ci.mergeCategory != ciCategory { break }
+                if let m = ci.memberConnected {
+                    ns.append(m.displayName)
+                }
+                count += 1
+                i += 1
+            }
        }
-        return ns
+        return (count, ns)
    }

-    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
-        if let i = getChatItemIndex(ci)  {
-            return (
-                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
-                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
-            )
+    // returns the index of the passed item and the next item (it has smaller index)
+    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
+        if let i = getChatItemIndex(ci) {
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
        } else {
-            return (nil, nil)
+            (nil, nil)
        }
    }

+    // returns the index of the first item in the same merged group (the first hidden item)
+    // and the previous visible item with another merge category
+    func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
+        guard var i = ciIndex else { return (nil, nil) }
+        let fst = reversedChatItems.count - 1
+        while i < fst {
+            i = i + 1
+            let ci = reversedChatItems[i]
+            if ciCategory == nil || ciCategory != ci.mergeCategory {
+                return (i - 1, ci)
+            }
+        }
+        return (i, nil)
+    }
+
+    // returns the previous member in the same merge group and the count of members in this group
+    func getPrevHiddenMember(_ member: GroupMember, _ range: ClosedRange<Int>) -> (GroupMember?, Int) {
+        var prevMember: GroupMember? = nil
+        var memberIds: Set<Int64> = []
+        for i in range {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
+                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
+                memberIds.insert(m.groupMemberId)
+            }
+        }
+        return (prevMember, memberIds.count)
+    }
+
    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
            popChat_(i)
@@ -571,13 +642,14 @@ final class ChatModel: ObservableObject {
        }
        // update current chat
        if chatId == groupInfo.id {
-            if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
+            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
                withAnimation(.default) {
-                    self.groupMembers[i] = member
+                    self.groupMembers[i].wrapped = member
+                    self.groupMembers[i].created = Date.now
                }
                return false
            } else {
-                withAnimation { groupMembers.append(member) }
+                withAnimation { groupMembers.append(GMember(member)) }
                return true
            }
        } else {
@@ -586,11 +658,10 @@ final class ChatModel: ObservableObject {
    }

    func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
-        if let conn = member.activeConn {
-            var updatedConn = conn
-            updatedConn.connectionStats = connectionStats
+        if var conn = member.activeConn {
+            conn.connectionStats = connectionStats
            var updatedMember = member
-            updatedMember.activeConn = updatedConn
+            updatedMember.activeConn = conn
            _ = upsertGroupMember(groupInfo, updatedMember)
        }
    }
@@ -619,11 +690,17 @@ final class ChatModel: ObservableObject {
    }

    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        networkStatuses[contact.activeConn.agentConnId] = status
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
    }

    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
    }
 }

@@ -689,40 +766,53 @@ final class Chat: ObservableObject, Identifiable {
    public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }

-enum NetworkStatus: Decodable, Equatable {
-    case unknown
-    case connected
-    case disconnected
-    case error(String)
+final class GMember: ObservableObject, Identifiable {
+    @Published var wrapped: GroupMember
+    var created = Date.now

-    var statusString: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "connected"
-            case .error: return "error"
-            default: return "connecting"
-            }
-        }
+    init(_ member: GroupMember) {
+        self.wrapped = member
    }

-    var statusExplanation: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "You are connected to the server used to receive messages from this contact."
-            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-            default: return "Trying to connect to the server used to receive messages from this contact."
-            }
-        }
+    var id: String { wrapped.id }
+    var groupId: Int64 { wrapped.groupId }
+    var groupMemberId: Int64 { wrapped.groupMemberId }
+    var displayName: String { wrapped.displayName }
+    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
+    static let sampleData = GMember(GroupMember.sampleData)
+}
+
+struct RemoteCtrlSession {
+    var ctrlAppInfo: CtrlAppInfo?
+    var appVersion: String
+    var sessionState: UIRemoteCtrlSessionState
+
+    func updateState(_ state: UIRemoteCtrlSessionState) -> RemoteCtrlSession {
+        RemoteCtrlSession(ctrlAppInfo: ctrlAppInfo, appVersion: appVersion, sessionState: state)
    }

-    var imageName: String {
-        get {
-            switch self {
-            case .unknown: return "circle.dotted"
-            case .connected: return "circle.fill"
-            case .disconnected: return "ellipsis.circle.fill"
-            case .error: return "exclamationmark.circle.fill"
-            }
+    var active: Bool {
+        if case .connected = sessionState { true } else { false }
+    }
+
+    var discovery: Bool {
+        if case .searching = sessionState { true } else { false }
+    }
+
+    var sessionCode: String? {
+        switch sessionState {
+        case let .pendingConfirmation(_, sessionCode): sessionCode
+        case let .connected(_, sessionCode): sessionCode
+        default: nil
        }
    }
 }
+
+enum UIRemoteCtrlSessionState {
+    case starting
+    case searching
+    case found(remoteCtrl: RemoteCtrlInfo, compatible: Bool)
+    case connecting(remoteCtrl_: RemoteCtrlInfo?)
+    case pendingConfirmation(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
+    case connected(remoteCtrl: RemoteCtrlInfo, sessionCode: String)
+}
@@ -195,18 +195,18 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    }
 }

-func generateNewFileName(_ prefix: String, _ ext: String) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
+func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }

-private func uniqueCombine(_ fileName: String) -> String {
+private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
    func tryCombine(_ fileName: String, _ n: Int) -> String {
        let ns = fileName as NSString
        let name = ns.deletingPathExtension
        let ext = ns.pathExtension
        let suffix = (n == 0) ? "" : "_\(n)"
        let f = "\(name)\(suffix).\(ext)"
-        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
    }
    return tryCombine(fileName, 0)
 }
@@ -0,0 +1,83 @@
+//
+//  NSESubscriber.swift
+//  SimpleXChat
+//
+//  Created by Evgeny on 09/12/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SimpleXChat
+
+private var nseSubscribers: [UUID:NSESubscriber] = [:]
+
+// timeout for active notification service extension going into "suspending" state.
+// If in two seconds the state does not change, we assume that it was not running and proceed with app activation/answering call.
+private let SUSPENDING_TIMEOUT: TimeInterval = 2
+
+// timeout should be larger than SUSPENDING_TIMEOUT
+func waitNSESuspended(timeout: TimeInterval, suspended: @escaping (Bool) -> Void) {
+    if timeout <= SUSPENDING_TIMEOUT {
+        logger.warning("waitNSESuspended: small timeout \(timeout), using \(SUSPENDING_TIMEOUT + 1)")
+    }
+    var state = nseStateGroupDefault.get()
+    if case .suspended = state {
+        DispatchQueue.main.async { suspended(true) }
+        return
+    }
+    let id = UUID()
+    var suspendedCalled = false
+    checkTimeout()
+    nseSubscribers[id] = nseMessageSubscriber { msg in
+        if case let .state(newState) = msg {
+            state = newState
+            logger.debug("waitNSESuspended state: \(state.rawValue)")
+            if case .suspended = newState {
+                notifySuspended(true)
+            }
+        }
+    }
+    return
+
+    func notifySuspended(_ ok: Bool) {
+        logger.debug("waitNSESuspended notifySuspended: \(ok)")
+        if !suspendedCalled {
+            logger.debug("waitNSESuspended notifySuspended: calling suspended(\(ok))")
+            suspendedCalled = true
+            nseSubscribers.removeValue(forKey: id)
+            DispatchQueue.main.async { suspended(ok) }
+        }
+    }
+
+    func checkTimeout() {
+        if !suspending() {
+            checkSuspendingTimeout()
+        } else if state == .suspending {
+            checkSuspendedTimeout()
+        }
+    }
+
+    func suspending() -> Bool {
+        suspendedCalled || state == .suspended || state == .suspending
+    }
+
+    func checkSuspendingTimeout() {
+        DispatchQueue.global().asyncAfter(deadline: .now() + SUSPENDING_TIMEOUT) {
+            logger.debug("waitNSESuspended check suspending timeout")
+            if !suspending() {
+                notifySuspended(false)
+            } else if state != .suspended {
+                checkSuspendedTimeout()
+            }
+        }
+    }
+
+    func checkSuspendedTimeout() {
+        DispatchQueue.global().asyncAfter(deadline: .now() + min(timeout - SUSPENDING_TIMEOUT, 1)) {
+            logger.debug("waitNSESuspended check suspended timeout")
+            if state != .suspended {
+                notifySuspended(false)
+            }
+        }
+    }
+}
@@ -211,7 +211,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
 }

 func apiStartChat() throws -> Bool {
-    let r = chatSendCmdSync(.startChat(subscribe: true, expire: true, xftp: true))
+    let r = chatSendCmdSync(.startChat(mainApp: true))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -228,7 +228,8 @@ func apiStopChat() async throws {
 }

 func apiActivateChat() {
-    let r = chatSendCmdSync(.apiActivateChat)
+    chatReopenStore()
+    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
    if case .cmdOk = r { return }
    logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -257,6 +258,12 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
    throw r
 }

+func apiSetEncryptLocalFiles(_ enable: Bool) throws {
+    let r = chatSendCmdSync(.apiSetEncryptLocalFiles(enable: enable))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiExportArchive(config: ArchiveConfig) async throws {
    try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -306,6 +313,7 @@ func loadChat(chat: Chat, search: String = "") {
    do {
        let cInfo = chat.chatInfo
        let m = ChatModel.shared
+        m.chatItemStatuses = [:]
        m.reversedChatItems = []
        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
        m.updateChatInfo(chat.chatInfo)
@@ -395,7 +403,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
    case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
    default:
-        logger.debug("apiGetNtfToken response: \(String(describing: r), privacy: .public)")
+        logger.debug("apiGetNtfToken response: \(String(describing: r))")
        return (nil, nil, .off)
    }
 }
@@ -495,6 +503,10 @@ func apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings) a
    try await sendCommandOkResp(.apiSetChatSettings(type: type, id: id, chatSettings: chatSettings))
 }

+func apiSetMemberSettings(_ groupId: Int64, _ groupMemberId: Int64, _ memberSettings: GroupMemberSettings) async throws {
+    try await sendCommandOkResp(.apiSetMemberSettings(groupId: groupId, groupMemberId: groupMemberId, memberSettings: memberSettings))
+}
+
 func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profile?) {
    let r = await chatSendCmd(.apiContactInfo(contactId: contactId))
    if case let .contactInfo(_, _, connStats, customUserProfile) = r { return (connStats, customUserProfile) }
@@ -586,34 +598,41 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
    throw r
 }

-func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
-    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
+    let userId = try currentUserId("apiConnectPlan")
+    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
+    if case let .connectionPlan(_, connectionPlan) = r { return connectionPlan }
+    logger.error("apiConnectPlan error: \(responseError(r))")
+    throw r
+}
+
+func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
+    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
    if let alert = alert {
        AlertManager.shared.showAlert(alert)
        return nil
    } else {
-        return connReqType
+        return r
    }
 }

-func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiConnect: no current user")
        return (nil, nil)
    }
    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
+    let m = ChatModel.shared
    switch r {
-    case .sentConfirmation: return (.invitation, nil)
-    case .sentInvitation: return (.contact, nil)
+    case let .sentConfirmation(_, connection):
+        return ((.invitation, connection), nil)
+    case let .sentInvitation(_, connection):
+        return ((.contact, connection), nil)
    case let .contactAlreadyExists(_, contact):
-        let m = ChatModel.shared
        if let c = m.getContactChat(contact.contactId) {
            await MainActor.run { m.chatId = c.id }
        }
-        let alert = mkAlert(
-            title: "Contact already exists",
-            message: "You are already connected to \(contact.displayName)."
-        )
+        let alert = contactAlreadyExistsAlert(contact)
        return (nil, alert)
    case .chatCmdError(_, .error(.invalidConnReq)):
        let alert = mkAlert(
@@ -641,6 +660,13 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
    return (nil, alert)
 }

+func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
+    mkAlert(
+        title: "Contact already exists",
+        message: "You are already connected to \(contact.displayName)."
+    )
+}
+
 private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
    if let networkErrorAlert = networkErrorAlert(r) {
        return networkErrorAlert
@@ -652,18 +678,30 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
    }
 }

-func apiDeleteChat(type: ChatType, id: Int64) async throws {
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id), bgTask: false)
+func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Contact?, Alert?) {
+    guard let userId = ChatModel.shared.currentUser?.userId else {
+        logger.error("apiConnectContactViaAddress: no current user")
+        return (nil, nil)
+    }
+    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
+    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
+    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
+    let alert = connectionErrorAlert(r)
+    return (nil, alert)
+}
+
+func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
    if case .contactConnection = type, case .contactConnectionDeleted = r { return }
    if case .group = type, case .groupDeletedUser = r { return }
    throw r
 }

-func deleteChat(_ chat: Chat) async {
+func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
    do {
        let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
        DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
    } catch let error {
        logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -701,8 +739,9 @@ func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
    let userId = try currentUserId("apiUpdateProfile")
    let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
    switch r {
-    case .userProfileNoChange: return nil
+    case .userProfileNoChange: return (profile, [])
    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
+    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
    default: throw r
    }
 }
@@ -869,6 +908,46 @@ func apiCancelFile(fileId: Int64) async -> AChatItem? {
    }
 }

+func setLocalDeviceName(_ displayName: String) throws {
+    try sendCommandOkRespSync(.setLocalDeviceName(displayName: displayName))
+}
+
+func connectRemoteCtrl(desktopAddress: String) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
+    let r = await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
+    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
+    throw r
+}
+
+func findKnownRemoteCtrl() async throws {
+    try await sendCommandOkResp(.findKnownRemoteCtrl)
+}
+
+func confirmRemoteCtrl(_ rcId: Int64) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
+    let r = await chatSendCmd(.confirmRemoteCtrl(remoteCtrlId: rcId))
+    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
+    throw r
+}
+
+func verifyRemoteCtrlSession(_ sessCode: String) async throws -> RemoteCtrlInfo {
+    let r = await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
+    if case let .remoteCtrlConnected(rc) = r { return rc }
+    throw r
+}
+
+func listRemoteCtrls() throws -> [RemoteCtrlInfo] {
+    let r = chatSendCmdSync(.listRemoteCtrls)
+    if case let .remoteCtrlList(rcInfo) = r { return rcInfo }
+    throw r
+}
+
+func stopRemoteCtrl() async throws {
+    try await sendCommandOkResp(.stopRemoteCtrl)
+}
+
+func deleteRemoteCtrl(_ rcId: Int64) async throws {
+    try await sendCommandOkResp(.deleteRemoteCtrl(remoteCtrlId: rcId))
+}
+
 func networkErrorAlert(_ r: ChatResponse) -> Alert? {
    switch r {
    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
@@ -944,6 +1023,12 @@ func apiCallStatus(_ contact: Contact, _ status: String) async throws {
    }
 }

+func apiGetNetworkStatuses() throws -> [ConnNetworkStatus] {
+    let r = chatSendCmdSync(.apiGetNetworkStatuses)
+    if case let .networkStatuses(_, statuses) = r { return statuses }
+    throw r
+}
+
 func markChatRead(_ chat: Chat, aboveItem: ChatItem? = nil) async {
    do {
        if chat.chatStats.unreadCount > 0 {
@@ -991,9 +1076,15 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
    throw r
 }

-func apiNewGroup(_ p: GroupProfile) throws -> GroupInfo {
+private func sendCommandOkRespSync(_ cmd: ChatCommand) throws {
+    let r = chatSendCmdSync(cmd)
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
    let userId = try currentUserId("apiNewGroup")
-    let r = chatSendCmdSync(.apiNewGroup(userId: userId, groupProfile: p))
+    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
    if case let .groupCreated(_, groupInfo) = r { return groupInfo }
    throw r
 }
@@ -1053,8 +1144,8 @@ func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
    return []
 }

-func filterMembersToAdd(_ ms: [GroupMember]) -> [Contact] {
-    let memberContactIds = ms.compactMap{ m in m.memberCurrent ? m.memberContactId : nil }
+func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
+    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
    return ChatModel.shared.chats
        .compactMap{ $0.chatInfo.contact }
        .filter{ !memberContactIds.contains($0.apiId) }
@@ -1133,6 +1224,7 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
    try setXFTPConfig(getXFTPCfg())
+    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
    if m.currentUser == nil {
@@ -1143,6 +1235,9 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
        try startChat(refreshInvitations: refreshInvitations)
    } else {
        m.chatRunning = false
+        try getUserChatData()
+        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
+        m.onboardingStage = onboardingStageDefault.get()
    }
 }

@@ -1159,6 +1254,8 @@ func startChat(refreshInvitations: Bool = true) throws {
            try refreshCallInvitations()
        }
        (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
+        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
+        // when it is called before startChat
        if let token = m.deviceToken {
            registerToken(token: token)
        }
@@ -1273,24 +1370,20 @@ func processReceivedMsg(_ res: ChatResponse) async {
    let m = ChatModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
-    case let .newContactConnection(user, connection):
-        if active(user) {
+    case let .contactDeletedByContact(user, contact):
+        if active(user) && contact.directOrUsed {
            await MainActor.run {
-                m.updateContactConnection(connection)
-            }
-        }
-    case let .contactConnectionDeleted(user, connection):
-        if active(user) {
-            await MainActor.run {
-                m.removeChat(connection.id)
+                m.updateContact(contact)
            }
        }
    case let .contactConnected(user, contact, _):
        if active(user) && contact.directOrUsed {
            await MainActor.run {
                m.updateContact(contact)
-                m.dismissConnReqView(contact.activeConn.id)
-                m.removeChat(contact.activeConn.id)
+                if let conn = contact.activeConn {
+                    m.dismissConnReqView(conn.id)
+                    m.removeChat(conn.id)
+                }
            }
        }
        if contact.directOrUsed {
@@ -1303,8 +1396,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && contact.directOrUsed {
            await MainActor.run {
                m.updateContact(contact)
-                m.dismissConnReqView(contact.activeConn.id)
-                m.removeChat(contact.activeConn.id)
+                if let conn = contact.activeConn {
+                    m.dismissConnReqView(conn.id)
+                    m.removeChat(conn.id)
+                }
            }
        }
    case let .receivedContactRequest(user, contactRequest):
@@ -1329,6 +1424,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.updateChatInfo(cInfo)
            }
        }
+    case let .groupMemberUpdated(user, groupInfo, _, toMember):
+        if active(user) {
+            await MainActor.run {
+                _ = m.upsertGroupMember(groupInfo, toMember)
+            }
+        }
    case let .contactsMerged(user, intoContact, mergedContact):
        if active(user) && m.hasChat(mergedContact.id) {
            await MainActor.run {
@@ -1342,13 +1443,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await updateContactsStatus(contactRefs, status: .connected)
    case let .contactsDisconnected(_, contactRefs):
        await updateContactsStatus(contactRefs, status: .disconnected)
-    case let .contactSubError(user, contact, chatError):
-        await MainActor.run {
-            if active(user) {
-                m.updateContact(contact)
-            }
-            processContactSubError(contact, chatError)
-        }
    case let .contactSubSummary(_, contactSubscriptions):
        await MainActor.run {
            for sub in contactSubscriptions {
@@ -1363,6 +1457,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
                }
            }
        }
+    case let .networkStatus(status, connections):
+        await MainActor.run {
+            for cId in connections {
+                m.networkStatuses[cId] = status
+            }
+        }
+    case let .networkStatuses(_, statuses): ()
+        await MainActor.run {
+            for s in statuses {
+                m.networkStatuses[s.agentConnId] = s.networkStatus
+            }
+        }
    case let .newChatItem(user, aChatItem):
        let cInfo = aChatItem.chatInfo
        let cItem = aChatItem.chatItem
@@ -1384,11 +1490,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
    case let .chatItemStatusUpdated(user, aChatItem):
        let cInfo = aChatItem.chatInfo
        let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent {
-            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
-            if added && cItem.showNotification {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-            }
+        if !cItem.isDeletedContent && active(user) {
+            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
        }
        if let endTask = m.messageDelivery[cItem.id] {
            switch cItem.meta.itemStatus {
@@ -1435,9 +1538,19 @@ func processReceivedMsg(_ res: ChatResponse) async {

        await MainActor.run {
            m.updateGroup(groupInfo)
-            if let hostContact = hostContact {
-                m.dismissConnReqView(hostContact.activeConn.id)
-                m.removeChat(hostContact.activeConn.id)
+            if let conn = hostContact?.activeConn {
+                m.dismissConnReqView(conn.id)
+                m.removeChat(conn.id)
+            }
+        }
+    case let .groupLinkConnecting(user, groupInfo, hostMember):
+        if !active(user) { return }
+        
+        await MainActor.run {
+            m.updateGroup(groupInfo)
+            if let hostConn = hostMember.activeConn {
+                m.dismissConnReqView(hostConn.id)
+                m.removeChat(hostConn.id)
            }
        }
    case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
@@ -1499,10 +1612,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.updateGroup(toGroup)
            }
        }
-    case let .memberRole(user, groupInfo, _, _, _, _):
+    case let .memberRole(user, groupInfo, byMember: _, member: member, fromRole: _, toRole: _):
        if active(user) {
            await MainActor.run {
                m.updateGroup(groupInfo)
+                _ = m.upsertGroupMember(groupInfo, member)
            }
        }
    case let .newMemberContactReceivedInv(user, contact, _, _):
@@ -1548,36 +1662,40 @@ func processReceivedMsg(_ res: ChatResponse) async {
        activateCall(invitation)
    case let .callOffer(_, contact, callType, offer, sharedKey, _):
        await withCall(contact) { call in
-            call.callState = .offerReceived
-            call.peerMedia = callType.media
-            call.sharedKey = sharedKey
+            await MainActor.run {
+                call.callState = .offerReceived
+                call.peerMedia = callType.media
+                call.sharedKey = sharedKey
+            }
            let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
            let iceServers = getIceServers()
            logger.debug(".callOffer useRelay \(useRelay)")
            logger.debug(".callOffer iceServers \(String(describing: iceServers))")
-            m.callCommand = .offer(
+            await m.callCommand.processCommand(.offer(
                offer: offer.rtcSession,
                iceCandidates: offer.rtcIceCandidates,
                media: callType.media, aesKey: sharedKey,
                iceServers: iceServers,
                relay: useRelay
-            )
+            ))
        }
    case let .callAnswer(_, contact, answer):
        await withCall(contact) { call in
-            call.callState = .answerReceived
-            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
+            await MainActor.run {
+                call.callState = .answerReceived
+            }
+            await m.callCommand.processCommand(.answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates))
        }
    case let .callExtraInfo(_, contact, extraInfo):
        await withCall(contact) { _ in
-            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
+            await m.callCommand.processCommand(.ice(iceCandidates: extraInfo.rtcIceCandidates))
        }
    case let .callEnded(_, contact):
        if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
            CallController.shared.reportCallRemoteEnded(invitation: invitation)
        }
        await withCall(contact) { call in
-            m.callCommand = .end
+            await m.callCommand.processCommand(.end)
            CallController.shared.reportCallRemoteEnded(call: call)
        }
    case .chatSuspended:
@@ -1598,19 +1716,67 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await MainActor.run {
            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
        }
+    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
+        await MainActor.run {
+            if let sess = m.remoteCtrlSession, case .searching = sess.sessionState {
+                let state = UIRemoteCtrlSessionState.found(remoteCtrl: remoteCtrl, compatible: compatible)
+                m.remoteCtrlSession = RemoteCtrlSession(
+                    ctrlAppInfo: ctrlAppInfo_,
+                    appVersion: appVersion,
+                    sessionState: state
+                )
+            }
+        }
+    case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode):
+        await MainActor.run {
+            let state = UIRemoteCtrlSessionState.pendingConfirmation(remoteCtrl_: remoteCtrl_, sessionCode: sessionCode)
+            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
+        }
+    case let .remoteCtrlConnected(remoteCtrl):
+        // TODO currently it is returned in response to command, so it is redundant
+        await MainActor.run {
+            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
+            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
+        }
+    case .remoteCtrlStopped:
+        // This delay is needed to cancel the session that fails on network failure,
+        // e.g. when user did not grant permission to access local network yet.
+        if let sess = m.remoteCtrlSession {
+            await MainActor.run {
+                m.remoteCtrlSession = nil
+            }
+            if case .connected = sess.sessionState {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    switchToLocalSession()
+                }
+            }
+        }
    default:
        logger.debug("unsupported event: \(res.responseType)")
    }

-    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
+    func withCall(_ contact: Contact, _ perform: (Call) async -> Void) async {
        if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await MainActor.run { perform(call) }
+            await perform(call)
        } else {
            logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
        }
    }
 }

+func switchToLocalSession() {
+    let m = ChatModel.shared
+    m.remoteCtrlSession = nil
+    do {
+        m.users = try listUsers()
+        try getUserChatData()
+        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
+        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
+    } catch let error {
+        logger.debug("error updating chat data: \(responseError(error))")
+    }
+}
+
 func active(_ user: any UserLike) -> Bool {
    user.userId == ChatModel.shared.currentUser?.id
 }
@@ -1643,7 +1809,7 @@ func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
    case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
    default: err = String(describing: chatError)
    }
-    m.setContactNetworkStatus(contact, .error(err))
+    m.setContactNetworkStatus(contact, .error(connectionError: err))
 }

 func refreshCallInvitations() throws {
@@ -9,51 +9,63 @@
 import Foundation
 import UIKit
 import SimpleXChat
+import SwiftUI

 private let suspendLockQueue = DispatchQueue(label: "chat.simplex.app.suspend.lock")

-let appSuspendTimeout: Int = 15 // seconds
-
 let bgSuspendTimeout: Int = 5 // seconds

 let terminationTimeout: Int = 3 // seconds

+let activationDelay: TimeInterval = 1.5
+
+let nseSuspendTimeout: TimeInterval = 5
+
 private func _suspendChat(timeout: Int) {
-    if ChatModel.ok {
-        appStateGroupDefault.set(.suspending)
+    // this is a redundant check to prevent logical errors, like the one fixed in this PR
+    let state = AppChatState.shared.value
+    if !state.canSuspend {
+        logger.error("_suspendChat called, current state: \(state.rawValue)")
+    } else if ChatModel.ok {
+        AppChatState.shared.set(.suspending)
        apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
        let endTask = beginBGTask(chatSuspended)
        DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
    } else {
-        appStateGroupDefault.set(.suspended)
+        AppChatState.shared.set(.suspended)
    }
 }

 func suspendChat() {
    suspendLockQueue.sync {
-        if appStateGroupDefault.get() != .stopped {
-            _suspendChat(timeout: appSuspendTimeout)
-        }
+        _suspendChat(timeout: appSuspendTimeout)
    }
 }

 func suspendBgRefresh() {
    suspendLockQueue.sync {
-        if case .bgRefresh = appStateGroupDefault.get()  {
+        if case .bgRefresh = AppChatState.shared.value  {
            _suspendChat(timeout: bgSuspendTimeout)
        }
    }
 }

 func terminateChat() {
+    logger.debug("terminateChat")
    suspendLockQueue.sync {
-        switch appStateGroupDefault.get() {
+        switch AppChatState.shared.value {
        case .suspending:
            // suspend instantly if already suspending
            _chatSuspended()
+            // when apiSuspendChat is called with timeout 0, it won't send any events on suspension
            if ChatModel.ok { apiSuspendChat(timeoutMicroseconds: 0) }
-        case .stopped: ()
+            chatCloseStore()
+        case .suspended:
+            chatCloseStore()
+        case .stopped:
+            chatCloseStore()
        default:
+            // the store will be closed in _chatSuspended when event is received
            _suspendChat(timeout: terminationTimeout)
        }
    }
@@ -61,7 +73,7 @@ func terminateChat() {

 func chatSuspended() {
    suspendLockQueue.sync {
-        if case .suspending = appStateGroupDefault.get() {
+        if case .suspending = AppChatState.shared.value {
            _chatSuspended()
        }
    }
@@ -69,16 +81,23 @@ func chatSuspended() {

 private func _chatSuspended() {
    logger.debug("_chatSuspended")
-    appStateGroupDefault.set(.suspended)
+    AppChatState.shared.set(.suspended)
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.stop()
    }
+    chatCloseStore()
+}
+
+func setAppState(_ appState: AppState) {
+    suspendLockQueue.sync {
+        AppChatState.shared.set(appState)
+    }
 }

 func activateChat(appState: AppState = .active) {
    logger.debug("DEBUGGING: activateChat")
    suspendLockQueue.sync {
-        appStateGroupDefault.set(appState)
+        AppChatState.shared.set(appState)
        if ChatModel.ok { apiActivateChat() }
        logger.debug("DEBUGGING: activateChat: after apiActivateChat")
    }
@@ -87,24 +106,96 @@ func activateChat(appState: AppState = .active) {
 func initChatAndMigrate(refreshInvitations: Bool = true) {
    let m = ChatModel.shared
    if (!m.chatInitialized) {
+        m.v3DBMigration = v3DBMigrationDefault.get()
+        if AppChatState.shared.value == .stopped {
+            AlertManager.shared.showAlert(Alert(
+                title: Text("Start chat?"),
+                message: Text("Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat."),
+                primaryButton: .default(Text("Ok")) {
+                    AppChatState.shared.set(.active)
+                    initialize(start: true)
+                },
+                secondaryButton: .cancel {
+                    initialize(start: false)
+                }
+            ))
+        } else {
+            initialize(start: true)
+        }
+    }
+
+    func initialize(start: Bool) {
        do {
-            m.v3DBMigration = v3DBMigrationDefault.get()
-            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
+            try initializeChat(start: m.v3DBMigration.startChat && start, refreshInvitations: refreshInvitations)
        } catch let error {
-            fatalError("Failed to start or load chats: \(responseError(error))")
+            AlertManager.shared.showAlertMsg(
+                title: start ? "Error starting chat" : "Error opening chat",
+                message: "Please contact developers.\nError: \(responseError(error))"
+            )
        }
    }
 }

-func startChatAndActivate() {
+func startChatForCall() {
+    logger.debug("DEBUGGING: startChatForCall")
+    if ChatModel.shared.chatRunning == true {
+        ChatReceiver.shared.start()
+        logger.debug("DEBUGGING: startChatForCall: after ChatReceiver.shared.start")
+    }
+    if .active != AppChatState.shared.value {
+        logger.debug("DEBUGGING: startChatForCall: before activateChat")
+        activateChat()
+        logger.debug("DEBUGGING: startChatForCall: after activateChat")
+    }
+}
+
+func startChatAndActivate(_ completion: @escaping () -> Void) {
    logger.debug("DEBUGGING: startChatAndActivate")
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.start()
        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
    }
-    if .active != appStateGroupDefault.get()  {
+    if case .active = AppChatState.shared.value {
+        completion()
+    } else if nseStateGroupDefault.get().inactive {
+        activate()
+    } else {
+        // setting app state to "activating" to notify NSE that it should suspend
+        setAppState(.activating)
+        waitNSESuspended(timeout: nseSuspendTimeout) { ok in
+            if !ok {
+                // if for some reason NSE failed to suspend,
+                // e.g., it crashed previously without setting its state to "suspended",
+                // set it to "suspended" state anyway, so that next time app
+                // does not have to wait when activating.
+                nseStateGroupDefault.set(.suspended)
+            }
+            if AppChatState.shared.value == .activating {
+                activate()
+            }
+        }
+    }
+
+    func activate() {
        logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
        activateChat()
+        completion()
        logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
    }
 }
+
+// appStateGroupDefault must not be used in the app directly, only via this singleton
+class AppChatState {
+    static let shared = AppChatState()
+    private var value_ = appStateGroupDefault.get()
+
+    var value: AppState {
+        value_
+    }
+
+    func set(_ state: AppState) {
+        appStateGroupDefault.set(state)
+        sendAppState(state)
+        value_ = state
+    }
+}
@@ -16,17 +16,15 @@ struct SimpleXApp: App {
    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
    @StateObject private var chatModel = ChatModel.shared
    @ObservedObject var alertManager = AlertManager.shared
+
    @Environment(\.scenePhase) var scenePhase
-    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
-    @State private var userAuthorized: Bool?
-    @State private var doAuthenticate = false
-    @State private var enteredBackground: TimeInterval? = nil
-    @State private var canConnectCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-    @State private var showInitializationView = false
+    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil

    init() {
-        hs_init(0, nil)
+        DispatchQueue.global(qos: .background).sync {
+            haskell_init()
+//            hs_init(0, nil)
+        }
        UserDefaults.standard.register(defaults: appDefaults)
        setGroupDefaults()
        registerGroupDefaults()
@@ -36,22 +34,17 @@ struct SimpleXApp: App {
    }

    var body: some Scene {
-        return WindowGroup {
-            ContentView(
-                doAuthenticate: $doAuthenticate,
-                userAuthorized: $userAuthorized,
-                canConnectCall: $canConnectCall,
-                lastSuccessfulUnlock: $lastSuccessfulUnlock,
-                showInitializationView: $showInitializationView
-            )
+        WindowGroup {
+            // contentAccessAuthenticationExtended has to be passed to ContentView on view initialization,
+            // so that it's computed by the time view renders, and not on event after rendering
+            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
                .environmentObject(chatModel)
                .onOpenURL { url in
                    logger.debug("ContentView.onOpenURL: \(url)")
                    chatModel.appOpenUrl = url
                }
                .onAppear() {
-                    showInitializationView = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
                        initChatAndMigrate()
                    }
                }
@@ -59,30 +52,35 @@ struct SimpleXApp: App {
                    logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                    switch (phase) {
                    case .background:
+                        // --- authentication
+                        // see ContentView .onChange(of: scenePhase) for remaining authentication logic
+                        if chatModel.contentViewAccessAuthenticated {
+                            enteredBackgroundAuthenticated = ProcessInfo.processInfo.systemUptime
+                        }
+                        chatModel.contentViewAccessAuthenticated = false
+                        // authentication ---
+
                        if CallController.useCallKit() && chatModel.activeCall != nil {
                            CallController.shared.shouldSuspendChat = true
                        } else {
                            suspendChat()
                            BGManager.shared.schedule()
                        }
-                        if userAuthorized == true {
-                            enteredBackground = ProcessInfo.processInfo.systemUptime
-                        }
-                        doAuthenticate = false
-                        canConnectCall = false
                        NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                    case .active:
                        CallController.shared.shouldSuspendChat = false
-                        let appState = appStateGroupDefault.get()
-                        startChatAndActivate()
-                        if appState.inactive && chatModel.chatRunning == true {
-                            updateChats()
-                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                updateCallInvitations()
+                        let appState = AppChatState.shared.value
+
+                        if appState != .stopped {
+                            startChatAndActivate {
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
+                                    }
+                                }
                            }
                        }
-                        doAuthenticate = authenticationExpired()
-                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                    default:
                        break
                    }
@@ -100,12 +98,12 @@ struct SimpleXApp: App {
        if legacyDatabase, case .documents = dbContainerGroupDefault.get() {
            dbContainerGroupDefault.set(.documents)
            setMigrationState(.offer)
-            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath(), privacy: .public)*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
        } else {
            dbContainerGroupDefault.set(.group)
            setMigrationState(.ready)
-            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath(), privacy: .public)*.db")
-            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not", privacy: .public) present")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
        }
    }

@@ -115,22 +113,14 @@ struct SimpleXApp: App {
    }

    private func authenticationExpired() -> Bool {
-        if let enteredBackground = enteredBackground {
+        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
            let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
        } else {
            return true
        }
    }

-    private func unlockedRecently() -> Bool {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
-        } else {
-            return false
-        }
-    }
-
    private func updateChats() {
        do {
            let chats = try apiGetChats()
@@ -38,19 +38,21 @@ struct ActiveCallView: View {
            }
        }
        .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
+            AppDelegate.keepScreenOn(true)
            createWebRTCClient()
            dismissAllSheets()
        }
        .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
            createWebRTCClient()
        }
        .onDisappear {
            logger.debug("ActiveCallView: disappear")
+            Task { await m.callCommand.setClient(nil) }
+            AppDelegate.keepScreenOn(false)
            client?.endCall()
        }
-        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
        .background(.black)
        .preferredColorScheme(.dark)
    }
@@ -58,19 +60,8 @@ struct ActiveCallView: View {
    private func createWebRTCClient() {
        if client == nil && canConnectCall {
            client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
-            sendCommandToClient()
-        }
-    }
-
-    private func sendCommandToClient() {
-        if call == m.activeCall,
-           m.activeCall != nil,
-           let client = client,
-           let cmd = m.callCommand {
-            m.callCommand = nil
-            logger.debug("sendCallCommand: \(cmd.cmdType)")
            Task {
-                await client.sendCallCommand(command: cmd)
+                await m.callCommand.setClient(client)
            }
        }
    }
@@ -166,8 +157,10 @@ struct ActiveCallView: View {
                }
            case let .error(message):
                logger.debug("ActiveCallView: command error: \(message)")
+                AlertManager.shared.showAlert(Alert(title: Text("Error"), message: Text(message)))
            case let .invalid(type):
                logger.debug("ActiveCallView: invalid response: \(type)")
+                AlertManager.shared.showAlert(Alert(title: Text("Invalid response"), message: Text(type)))
            }
        }
    }
@@ -253,7 +246,6 @@ struct ActiveCallOverlay: View {
                HStack {
                    Text(call.encryptionStatus)
                    if let connInfo = call.connectionInfo {
-//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
                        Text("(") + Text(connInfo.text) + Text(")")
                    }
                }
@@ -108,7 +108,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
            try audioSession.setActive(true)
            logger.debug("audioSession activated")
        } catch {
-            print(error)
            logger.error("failed activating audio session")
        }
    }
@@ -121,7 +120,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
            try audioSession.setActive(false)
            logger.debug("audioSession deactivated")
        } catch {
-            print(error)
            logger.error("failed deactivating audio session")
        }
        suspendOnEndCall()
@@ -132,7 +130,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
            // The delay allows to accept the second call before suspending a chat
            // see `.onChange(of: scenePhase)` in SimpleXApp
            DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
                if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                    self?.shouldSuspendChat = false
                    suspendChat()
@@ -144,33 +142,46 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    @objc(pushRegistry:didUpdatePushCredentials:forType:)
    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
    }

    func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
+        logger.debug("CallController: did receive push with type \(type.rawValue)")
        if type != .voIP {
            completion()
            return
        }
-        logger.debug("CallController: initializing chat")
-        if (!ChatModel.shared.chatInitialized) {
-            initChatAndMigrate(refreshInvitations: false)
+        if AppChatState.shared.value == .stopped {
+            self.reportExpiredCall(payload: payload, completion)
+            return
        }
-        startChatAndActivate()
-        shouldSuspendChat = true
+        if (!ChatModel.shared.chatInitialized) {
+            logger.debug("CallController: initializing chat")
+            do {
+                try initializeChat(start: true, refreshInvitations: false)
+            } catch let error {
+                logger.error("CallController: initializing chat error: \(error)")
+                self.reportExpiredCall(payload: payload, completion)
+                return
+            }
+        }
+        logger.debug("CallController: initialized chat")
+        startChatForCall()
+        logger.debug("CallController: started chat")
+        self.shouldSuspendChat = true
        // There are no invitations in the model, as it was processed by NSE
        _ = try? justRefreshCallInvitations()
+        logger.debug("CallController: updated call invitations chat")
        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
        // Extract the call information from the push notification payload
        let m = ChatModel.shared
        if let contactId = payload.dictionaryPayload["contactId"] as? String,
           let invitation = m.callInvitations[contactId] {
-            let update = cxCallUpdate(invitation: invitation)
+            let update = self.cxCallUpdate(invitation: invitation)
            if let uuid = invitation.callkitUUID {
                logger.debug("CallController: report pushkit call via CallKit")
-                let update = cxCallUpdate(invitation: invitation)
-                provider.reportNewIncomingCall(with: uuid, update: update) { error in
+                let update = self.cxCallUpdate(invitation: invitation)
+                self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
                    if error != nil {
                        m.callInvitations.removeValue(forKey: contactId)
                    }
@@ -178,10 +189,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                    completion()
                }
            } else {
-                reportExpiredCall(update: update, completion)
+                self.reportExpiredCall(update: update, completion)
            }
        } else {
-            reportExpiredCall(payload: payload, completion)
+            self.reportExpiredCall(payload: payload, completion)
        }
    }

@@ -212,7 +223,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    }

    func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
            if invitation.callTs.timeIntervalSinceNow >= -180 {
                let update = cxCallUpdate(invitation: invitation)
@@ -352,7 +363,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
        controller.request(CXTransaction(action: action)) { error in
            if let error = error {
-                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
            } else {
                logger.debug("CallController.requestTransaction requested transaction successfully")
                onSuccess()
@@ -22,7 +22,7 @@ class CallManager {
        let m = ChatModel.shared
        if let call = m.activeCall, call.callkitUUID == callUUID {
            m.showCallView = true
-            m.callCommand = .capabilities(media: call.localMedia)
+            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
            return true
        }
        return false
@@ -57,19 +57,21 @@ class CallManager {
            m.activeCall = call
            m.showCallView = true

-            m.callCommand = .start(
+            Task {
+                await m.callCommand.processCommand(.start(
                media: invitation.callType.media,
                aesKey: invitation.sharedKey,
                iceServers: iceServers,
                relay: useRelay
-            )
+                ))
+            }
        }
    }

    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
            let m = ChatModel.shared
-            m.callCommand = .media(media: media, enable: enable)
+            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
            return true
        }
        return false
@@ -94,11 +96,13 @@ class CallManager {
            completed()
        } else {
            logger.debug("CallManager.endCall: ending call...")
-            m.callCommand = .end
-            m.activeCall = nil
-            m.showCallView = false
-            completed()
            Task {
+                await m.callCommand.processCommand(.end)
+                await MainActor.run {
+                    m.activeCall = nil
+                    m.showCallView = false
+                    completed()
+                }
                do {
                    try await apiEndCall(call.contact)
                } catch {
@@ -335,6 +335,50 @@ extension WCallResponse: Encodable {
    }
 }

+actor WebRTCCommandProcessor {
+    private var client: WebRTCClient? = nil
+    private var commands: [WCallCommand] = []
+    private var running: Bool = false
+
+    func setClient(_ client: WebRTCClient?) async {
+        logger.debug("WebRTC: setClient, commands count \(self.commands.count)")
+        self.client = client
+        if client != nil {
+            await processAllCommands()
+        } else {
+            commands.removeAll()
+        }
+    }
+
+    func processCommand(_ c: WCallCommand) async {
+//        logger.debug("WebRTC: process command \(c.cmdType)")
+        commands.append(c)
+        if !running && client != nil {
+            await processAllCommands()
+        }
+    }
+
+    func processAllCommands() async {
+        logger.debug("WebRTC: process all commands, commands count \(self.commands.count), client == nil \(self.client == nil)")
+        if let client = client {
+            running = true
+            while let c = commands.first, shouldRunCommand(client, c) {
+                commands.remove(at: 0)
+                await client.sendCallCommand(command: c)
+                logger.debug("WebRTC: processed cmd \(c.cmdType)")
+            }
+            running = false
+        }
+    }
+
+    func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
+        switch c {
+        case .capabilities, .start, .offer, .end: true
+        default: client.activeCall.wrappedValue != nil
+        }
+    }
+}
+
 struct ConnectionState: Codable, Equatable {
    var connectionState: String
    var iceConnectionState: String
@@ -358,26 +402,12 @@ struct ConnectionInfo: Codable, Equatable {
            return "\(local?.rawValue ?? unknown) / \(remote?.rawValue ?? unknown)"
        }
    }
-
-    var protocolText: String {
-        let unknown = NSLocalizedString("unknown", comment: "connection info")
-        let local = localCandidate?.protocol?.uppercased() ?? unknown
-        let localRelay = localCandidate?.relayProtocol?.uppercased() ?? unknown
-        let remote = remoteCandidate?.protocol?.uppercased() ?? unknown
-        let localText = localRelay == local || localCandidate?.relayProtocol == nil
-                        ? local
-                        : "\(local) (\(localRelay))"
-        return local == remote
-                ? localText
-                : "\(localText) / \(remote)"
-    }
 }

 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
 struct RTCIceCandidate: Codable, Equatable {
    var candidateType: RTCIceCandidateType?
    var `protocol`: String?
-    var relayProtocol: String?
    var sdpMid: String?
    var sdpMLineIndex: Int?
    var candidate: String
@@ -18,10 +18,11 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }()
    private static let ivTagBytes: Int = 28
    private static let enableEncryption: Bool = true
+    private var chat_ctrl = getChatCtrl()

    struct Call {
        var connection: RTCPeerConnection
-        var iceCandidates: [RTCIceCandidate]
+        var iceCandidates: IceCandidates
        var localMedia: CallMediaType
        var localCamera: RTCVideoCapturer?
        var localVideoSource: RTCVideoSource?
@@ -33,10 +34,24 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        var frameDecryptor: RTCFrameDecryptor?
    }

+    actor IceCandidates {
+        private var candidates: [RTCIceCandidate] = []
+
+        func getAndClear() async -> [RTCIceCandidate] {
+            let cs = candidates
+            candidates = []
+            return cs
+        }
+
+        func append(_ c: RTCIceCandidate) async {
+            candidates.append(c)
+        }
+    }
+
    private let rtcAudioSession =  RTCAudioSession.sharedInstance()
    private let audioQueue = DispatchQueue(label: "audio")
    private var sendCallResponse: (WVAPIMessage) async -> Void
-    private var activeCall: Binding<Call?>
+    var activeCall: Binding<Call?>
    private var localRendererAspectRatio: Binding<CGFloat?>

    @available(*, unavailable)
@@ -60,7 +75,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
    ]

-    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
        let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
        connection.delegate = self
        createAudioSender(connection)
@@ -87,7 +102,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
        return Call(
            connection: connection,
-            iceCandidates: remoteIceCandidates,
+            iceCandidates: IceCandidates(),
            localMedia: mediaType,
            localCamera: localCamera,
            localVideoSource: localVideoSource,
@@ -144,26 +159,18 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            logger.debug("starting incoming call - create webrtc session")
            if activeCall.wrappedValue != nil { endCall() }
            let encryption = WebRTCClient.enableEncryption
-            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
            activeCall.wrappedValue = call
-            call.connection.offer { answer in
-                Task {
-                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
-                    if gotCandidates {
-                        await self.sendCallResponse(.init(
-                            corrId: nil,
-                            resp: .offer(
-                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
-                                capabilities: CallCapabilities(encryption: encryption)
-                            ),
-                            command: command)
-                        )
-                    } else {
-                        self.endCall()
-                    }
-                }
-
+            let (offer, error) = await call.connection.offer()
+            if let offer = offer {
+                resp = .offer(
+                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
+                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
+                    capabilities: CallCapabilities(encryption: encryption)
+                )
+                self.waitForMoreIceCandidates()
+            } else {
+                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
            }
        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
            if activeCall.wrappedValue != nil {
@@ -172,26 +179,21 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                resp = .error(message: "accept: encryption is not supported")
            } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                      let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
-                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
                activeCall.wrappedValue = call
                let pc = call.connection
                if let type = offer.type, let sdp = offer.sdp {
                    if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        pc.answer { answer in
+                        let (answer, error) = await pc.answer()
+                        if let answer = answer {
                            self.addIceCandidates(pc, remoteIceCandidates)
-//                            Task {
-//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
-                            Task {
-                                await self.sendCallResponse(.init(
-                                    corrId: nil,
-                                    resp: .answer(
-                                        answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
-                                    ),
-                                    command: command)
-                                )
-                            }
-//                            }
+                            resp = .answer(
+                                answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates()))
+                            )
+                            self.waitForMoreIceCandidates()
+                        } else {
+                            resp = .error(message: "answer error: \(error?.localizedDescription ?? "unknown error")")
                        }
                    } else {
                        resp = .error(message: "accept: remote description is not set")
@@ -234,6 +236,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                resp = .ok
            }
        case .end:
+            // TODO possibly, endCall should be called before returning .ok
            await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
            endCall()
        }
@@ -242,6 +245,33 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
    }

+    func getInitialIceCandidates() async -> [RTCIceCandidate] {
+        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
+        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
+        return candidates
+    }
+
+    func waitForMoreIceCandidates() {
+        Task {
+            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
+                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+                if candidates.count > 0 {
+                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
+                    await self.sendIceCandidates(candidates)
+                }
+            }
+        }
+    }
+
+    func sendIceCandidates(_ candidates: [RTCIceCandidate]) async {
+        await self.sendCallResponse(.init(
+            corrId: nil,
+            resp: .ice(iceCandidates: compressToBase64(input: encodeJSON(candidates))),
+            command: nil)
+        )
+    }
+
    func enableMedia(_ media: CallMediaType, _ enable: Bool) {
        logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
        media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
@@ -279,7 +309,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
            let isKeyFrame = unencrypted[0] & 1 == 0
            let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
-            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
            return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
        } else {
            return nil
@@ -387,12 +417,13 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        audioSessionToDefaults()
    }

-    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
-        let startedAt = DispatchTime.now()
-        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
-            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
-        }
-        return success()
+    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
+        var t: UInt64 = 0
+        repeat {
+            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
+            t += stepMs
+            await action()
+        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
    }
 }

@@ -405,25 +436,33 @@ extension WebRTC.RTCPeerConnection {
            optionalConstraints: nil)
    }

-    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
-        offer(for: mediaConstraints()) { (sdp, error) in
-            guard let sdp = sdp else {
-                return
+    func offer() async -> (RTCSessionDescription?, Error?) {
+        await withCheckedContinuation { cont in
+            offer(for: mediaConstraints()) { (sdp, error) in
+                self.processSDP(cont, sdp, error)
            }
-            self.setLocalDescription(sdp, completionHandler: { (error) in
-                completion(sdp)
-            })
        }
    }

-    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
-        answer(for: mediaConstraints()) { (sdp, error) in
-            guard let sdp = sdp else {
-                return
+    func answer() async -> (RTCSessionDescription?, Error?)  {
+        await withCheckedContinuation { cont in
+            answer(for: mediaConstraints()) { (sdp, error) in
+                self.processSDP(cont, sdp, error)
            }
+        }
+    }
+
+    private func processSDP(_ cont: CheckedContinuation<(RTCSessionDescription?, Error?), Never>, _ sdp: RTCSessionDescription?, _ error: Error?) {
+        if let sdp = sdp {
            self.setLocalDescription(sdp, completionHandler: { (error) in
-                completion(sdp)
+                if let error = error {
+                    cont.resume(returning: (nil, error))
+                } else {
+                    cont.resume(returning: (sdp, nil))
+                }
            })
+        } else {
+            cont.resume(returning: (nil, error))
        }
    }
 }
@@ -479,6 +518,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                default: enableSpeaker = false
                }
                setSpeakerEnabledAndConfigureSession(enableSpeaker)
+            case .connected: sendConnectedEvent(connection)
            case .disconnected, .failed: endCall()
            default: do {}
            }
@@ -491,7 +531,9 @@ extension WebRTCClient: RTCPeerConnectionDelegate {

    func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
-        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
+        Task {
+            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
+        }
    }

    func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -506,10 +548,9 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                        lastReceivedMs lastDataReceivedMs: Int32,
                        changeReason reason: String) {
 //        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
-        sendConnectedEvent(connection, local: local, remote: remote)
    }

-    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
        connection.statistics { (stats: RTCStatisticsReport) in
            stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -517,24 +558,25 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                   let localId = stat.values["localCandidateId"] as? String,
                   let remoteId = stat.values["remoteCandidateId"] as? String,
                   let localStats = stats.statistics[localId],
-                   let remoteStats = stats.statistics[remoteId],
-                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
-                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
+                   let remoteStats = stats.statistics[remoteId]
                {
                    Task {
                        await self.sendCallResponse(.init(
                            corrId: nil,
                            resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: local.toCandidate(
-                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    localStats.values["protocol"] as? String,
-                                    localStats.values["relayProtocol"] as? String
+                                localCandidate: RTCIceCandidate(
+                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    protocol: localStats.values["protocol"] as? String,
+                                    sdpMid: nil,
+                                    sdpMLineIndex: nil,
+                                    candidate: ""
                                ),
-                                remoteCandidate: remote.toCandidate(
-                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
-                                    remoteStats.values["protocol"] as? String,
-                                    remoteStats.values["relayProtocol"] as? String
-                                ))),
+                                remoteCandidate: RTCIceCandidate(
+                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    protocol: remoteStats.values["protocol"] as? String,
+                                    sdpMid: nil,
+                                    sdpMLineIndex: nil,
+                                    candidate: ""))),
                            command: nil)
                        )
                    }
@@ -634,11 +676,10 @@ extension RTCIceCandidate {
 }

 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
        RTCIceCandidate(
            candidateType: candidateType,
            protocol: `protocol`,
-            relayProtocol: relayProtocol,
            sdpMid: sdpMid,
            sdpMLineIndex: Int(sdpMLineIndex),
            candidate: sdp
@@ -99,12 +99,12 @@ struct ChatInfoView: View {
    @Binding var connectionCode: String?
    @FocusState private var aliasTextFieldFocused: Bool
    @State private var alert: ChatInfoViewAlert? = nil
+    @State private var showDeleteContactActionSheet = false
    @State private var sendReceipts = SendReceipts.userDefault(true)
    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

    enum ChatInfoViewAlert: Identifiable {
-        case deleteContactAlert
        case clearChatAlert
        case networkStatusAlert
        case switchAddressAlert
@@ -114,7 +114,6 @@ struct ChatInfoView: View {

        var id: String {
            switch self {
-            case .deleteContactAlert: return "deleteContactAlert"
            case .clearChatAlert: return "clearChatAlert"
            case .networkStatusAlert: return "networkStatusAlert"
            case .switchAddressAlert: return "switchAddressAlert"
@@ -164,13 +163,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                }
-                .disabled(!contact.ready)
+                .disabled(!contact.ready || !contact.active)

                if let contactLink = contact.contactLink {
                    Section {
-                        QRCode(uri: contactLink)
+                        SimpleXLinkQRCode(uri: contactLink)
                        Button {
-                            showShareSheet(items: [contactLink])
+                            showShareSheet(items: [simplexChatLink(contactLink)])
                        } label: {
                            Label("Share address", systemImage: "square.and.arrow.up")
                        }
@@ -181,7 +180,7 @@ struct ChatInfoView: View {
                    }
                }

-                if contact.ready {
+                if contact.ready && contact.active {
                    Section("Servers") {
                        networkStatusRow()
                            .onTapGesture {
@@ -192,8 +191,7 @@ struct ChatInfoView: View {
                                alert = .switchAddressAlert
                            }
                            .disabled(
-                                !contact.ready
-                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                || connStats.ratchetSyncSendProhibited
                            )
                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
@@ -234,7 +232,6 @@ struct ChatInfoView: View {
        }
        .alert(item: $alert) { alertItem in
            switch(alertItem) {
-            case .deleteContactAlert: return deleteContactAlert()
            case .clearChatAlert: return clearChatAlert()
            case .networkStatusAlert: return networkStatusAlert()
            case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
@@ -243,6 +240,26 @@ struct ChatInfoView: View {
            case let .error(title, error): return mkAlert(title: title, message: error)
            }
        }
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
+                        .destructive(Text("Delete")) { deleteContact(notify: false) },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { deleteContact() },
+                        .cancel()
+                    ]
+                )
+            }
+        }
    }

    private func contactInfoHeader() -> some View {
@@ -321,7 +338,7 @@ struct ChatInfoView: View {
                verify: { code in
                    if let r = apiVerifyContact(chat.chatInfo.apiId, connectionCode: code) {
                        let (verified, existingCode) = r
-                        contact.activeConn.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
+                        contact.activeConn?.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                        connectionCode = existingCode
                        DispatchQueue.main.async {
                            chat.chatInfo = .direct(contact: contact)
@@ -415,7 +432,7 @@ struct ChatInfoView: View {

    private func deleteContactButton() -> some View {
        Button(role: .destructive) {
-            alert = .deleteContactAlert
+            showDeleteContactActionSheet = true
        } label: {
            Label("Delete contact", systemImage: "trash")
                .foregroundColor(Color.red)
@@ -431,30 +448,23 @@ struct ChatInfoView: View {
        }
    }

-    private func deleteContactAlert() -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Delete")) {
-                Task {
-                    do {
-                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
-                        await MainActor.run {
-                            dismiss()
-                            chatModel.chatId = nil
-                            chatModel.removeChat(chat.chatInfo.id)
-                        }
-                    } catch let error {
-                        logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error deleting contact")
-                        await MainActor.run {
-                            alert = .error(title: a.title, error: a.message)
-                        }
-                    }
+    private func deleteContact(notify: Bool? = nil) {
+        Task {
+            do {
+                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
+                await MainActor.run {
+                    dismiss()
+                    chatModel.chatId = nil
+                    chatModel.removeChat(chat.chatInfo.id)
                }
-            },
-            secondaryButton: .cancel()
-        )
+            } catch let error {
+                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error deleting contact")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
    }

    private func clearChatAlert() -> Alert {
@@ -11,7 +11,7 @@ import SimpleXChat

 struct CICallItemView: View {
    @EnvironmentObject var m: ChatModel
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var status: CICallStatus
    var duration: Int
@@ -60,7 +60,7 @@ struct CICallItemView: View {


    @ViewBuilder private func acceptCallButton() -> some View {
-        if case let .direct(contact) = chatInfo {
+        if case let .direct(contact) = chat.chatInfo {
            Button {
                if let invitation = m.callInvitations[contact.id] {
                    CallController.shared.answerCall(invitation: invitation)
@@ -10,20 +10,92 @@ import SwiftUI
 import SimpleXChat

 struct CIChatFeatureView: View {
+    @EnvironmentObject var m: ChatModel
    var chatItem: ChatItem
+    @Binding var revealed: Bool
    var feature: Feature
    var icon: String? = nil
    var iconColor: Color

    var body: some View {
+        if !revealed, let fs = mergedFeautures() {
+            HStack {
+                ForEach(fs, content: featureIconView)
+            }
+            .padding(.horizontal, 6)
+            .padding(.vertical, 6)
+        } else {
+            fullFeatureView
+        }
+    }
+
+    private struct FeatureInfo: Identifiable {
+        var icon: String
+        var scale: CGFloat
+        var color: Color
+        var param: String?
+
+        init(_ f: Feature, _ color: Color, _ param: Int?) {
+            self.icon = f.iconFilled
+            self.scale = f.iconScale
+            self.color = color
+            self.param = f.hasParam && param != nil ? timeText(param) : nil
+        }
+
+        var id: String {
+            "\(icon) \(color) \(param ?? "")"
+        }
+    }
+
+    private func mergedFeautures() -> [FeatureInfo]? {
+        var fs: [FeatureInfo] = []
+        var icons: Set<String> = []
+        if var i = m.getChatItemIndex(chatItem) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
+                if !icons.contains(f.icon) {
+                    fs.insert(f, at: 0)
+                    icons.insert(f.icon)
+                }
+                i += 1
+            }
+        }
+        return fs.count > 1 ? fs : nil
+    }
+
+    private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
+        switch ci.content {
+        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        default: nil
+        }
+    }
+
+    @ViewBuilder private func featureIconView(_ f: FeatureInfo) -> some View {
+        let i = Image(systemName: f.icon)
+            .foregroundColor(f.color)
+            .scaleEffect(f.scale)
+        if let param = f.param {
+            HStack {
+                i
+                chatEventText(Text(param)).lineLimit(1)
+            }
+        } else {
+            i
+        }
+    }
+
+    private var fullFeatureView: some View {
        HStack(alignment: .bottom, spacing: 4) {
            Image(systemName: icon ?? feature.iconFilled)
                .foregroundColor(iconColor)
                .scaleEffect(feature.iconScale)
            chatEventText(chatItem)
        }
-        .padding(.leading, 6)
-        .padding(.bottom, 6)
+        .padding(.horizontal, 6)
+        .padding(.vertical, 4)
        .textSelection(.disabled)
    }
 }
@@ -31,6 +103,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
    static var previews: some View {
        let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
    }
 }
@@ -13,11 +13,9 @@ struct CIEventView: View {
    var eventText: Text

    var body: some View {
-        HStack(alignment: .bottom, spacing: 0) {
-            eventText
-        }
-        .padding(.leading, 6)
-        .padding(.bottom, 6)
+        eventText
+        .padding(.horizontal, 6)
+        .padding(.vertical, 4)
        .textSelection(.disabled)
    }
 }
@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIFeaturePreferenceView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var feature: ChatFeature
    var allowed: FeatureAllowed
@@ -80,7 +80,6 @@ struct CIFeaturePreferenceView_Previews: PreviewProvider {
            quotedItem: nil,
            file: nil
        )
-        CIFeaturePreferenceView(chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
-            .environmentObject(Chat.sampleData)
+        CIFeaturePreferenceView(chat: Chat.sampleData, chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
    }
 }
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIFileView: View {
+    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
    let file: CIFile?
    let edited: Bool
@@ -83,7 +84,7 @@ struct CIFileView: View {
                if fileSizeValid() {
                    Task {
                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
-                        if let user = ChatModel.shared.currentUser {
+                        if let user = m.currentUser {
                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                        }
@@ -234,18 +235,17 @@ struct CIFileView_Previews: PreviewProvider {
            file: nil
        )
        Group {
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile, revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
        }
        .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
    }
 }
@@ -17,34 +17,45 @@ struct CIGroupInvitationView: View {
    var memberRole: GroupMemberRole
    var chatIncognito: Bool = false
    @State private var frameWidth: CGFloat = 0
+    @State private var inProgress = false
+    @State private var progressByTimeout = false

    var body: some View {
        let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
        let v = ZStack(alignment: .bottomTrailing) {
-            VStack(alignment: .leading) {
-                groupInfoView(action)
-                .padding(.horizontal, 2)
-                .padding(.top, 8)
-                .padding(.bottom, 6)
-                .overlay(DetermineWidth())
+            ZStack {
+                VStack(alignment: .leading) {
+                    groupInfoView(action)
+                        .padding(.horizontal, 2)
+                        .padding(.top, 8)
+                        .padding(.bottom, 6)
+                        .overlay(DetermineWidth())

-                Divider().frame(width: frameWidth)
+                    Divider().frame(width: frameWidth)

-                if action {
-                    groupInvitationText()
-                        .overlay(DetermineWidth())
-                    Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                        .foregroundColor(chatIncognito ? .indigo : .accentColor)
-                        .font(.callout)
-                        .padding(.trailing, 60)
-                        .overlay(DetermineWidth())
-                } else {
-                    groupInvitationText()
-                        .padding(.trailing, 60)
-                        .overlay(DetermineWidth())
+                    if action {
+                        VStack(alignment: .leading, spacing: 2) {
+                            groupInvitationText()
+                                .overlay(DetermineWidth())
+                            Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                                .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
+                                .font(.callout)
+                                .padding(.trailing, 60)
+                                .overlay(DetermineWidth())
+                        }
+                    } else {
+                        groupInvitationText()
+                            .padding(.trailing, 60)
+                            .overlay(DetermineWidth())
+                    }
+                }
+                .padding(.bottom, 2)
+
+                if progressByTimeout {
+                    ProgressView().scaleEffect(2)
                }
            }
-            .padding(.bottom, 2)
+
            chatItem.timestampText
                .font(.caption)
                .foregroundColor(.secondary)
@@ -55,11 +66,24 @@ struct CIGroupInvitationView: View {
        .cornerRadius(18)
        .textSelection(.disabled)
        .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
+        .onChange(of: inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    progressByTimeout = inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
+        }

        if action {
            v.onTapGesture {
-                joinGroup(groupInvitation.groupId)
+                inProgress = true
+                joinGroup(groupInvitation.groupId) {
+                    await MainActor.run { inProgress = false }
+                }
            }
+            .disabled(inProgress)
        } else {
            v
        }
@@ -67,7 +91,7 @@ struct CIGroupInvitationView: View {

    private func groupInfoView(_ action: Bool) -> some View {
        var color: Color
-        if action {
+        if action && !inProgress {
            color = chatIncognito ? .indigo : .accentColor
        } else {
            color = Color(uiColor: .tertiaryLabel)
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIImageView: View {
+    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
    let chatItem: ChatItem
    let image: String
@@ -36,7 +37,7 @@ struct CIImageView: View {
                            switch file.fileStatus {
                            case .rcvInvitation:
                                Task {
-                                    if let user = ChatModel.shared.currentUser {
+                                    if let user = m.currentUser {
                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                    }
                                }
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIMemberCreatedContactView: View {
+    @EnvironmentObject var m: ChatModel
    var chatItem: ChatItem
    
    var body: some View {
@@ -21,7 +22,7 @@ struct CIMemberCreatedContactView: View {
                        .onTapGesture {
                            dismissAllSheets(animated: true)
                            DispatchQueue.main.async {
-                                ChatModel.shared.chatId = "@\(contactId)"
+                                m.chatId = "@\(contactId)"
                            }
                        }
                } else {
@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIMetaView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var metaColor = Color.secondary
    var paleMetaColor = Color(UIColor.tertiaryLabel)
@@ -95,15 +95,14 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
-            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
        }
        .previewLayout(.fixed(width: 360, height: 100))
-        .environmentObject(Chat.sampleData)
    }
 }
@@ -12,7 +12,8 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."

 struct CIRcvDecryptionError: View {
-    @EnvironmentObject var chat: Chat
+    @EnvironmentObject var m: ChatModel
+    @ObservedObject var chat: Chat
    var msgDecryptError: MsgDecryptError
    var msgCount: UInt32
    var chatItem: ChatItem
@@ -45,7 +46,7 @@ struct CIRcvDecryptionError: View {
                    do {
                        let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                        if let s = stats {
-                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
+                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
                        }
                    } catch let error {
                        logger.error("apiGroupMemberInfo error: \(responseError(error))")
@@ -65,7 +66,7 @@ struct CIRcvDecryptionError: View {

    @ViewBuilder private func viewBody() -> some View {
        if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn.connectionStats {
+           let contactStats = contact.activeConn?.connectionStats {
            if contactStats.ratchetSyncAllowed {
                decryptionErrorItemFixButton(syncSupported: true) {
                    alert = .syncAllowedAlert { syncContactConnection(contact) }
@@ -79,8 +80,8 @@ struct CIRcvDecryptionError: View {
            }
        } else if case let .group(groupInfo) = chat.chatInfo,
                  case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
-                  let memberStats = modelMember.activeConn?.connectionStats {
+                  let mem = m.getGroupMember(groupMember.groupMemberId),
+                  let memberStats = mem.wrapped.activeConn?.connectionStats {
            if memberStats.ratchetSyncAllowed {
                decryptionErrorItemFixButton(syncSupported: true) {
                    alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
@@ -122,7 +123,7 @@ struct CIRcvDecryptionError: View {
                )
            }
            .padding(.horizontal, 12)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
@@ -142,7 +143,7 @@ struct CIRcvDecryptionError: View {
                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
            }
            .padding(.horizontal, 12)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
@@ -164,6 +165,8 @@ struct CIRcvDecryptionError: View {
            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
        case .other:
            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+        case .ratchetSync:
+            message = Text("Encryption re-negotiation failed.")
        }
        return message
    }
@@ -173,7 +176,7 @@ struct CIRcvDecryptionError: View {
            do {
                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
                await MainActor.run {
-                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                    m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
                }
            } catch let error {
                logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
@@ -190,7 +193,7 @@ struct CIRcvDecryptionError: View {
            do {
                let stats = try apiSyncContactRatchet(contact.apiId, false)
                await MainActor.run {
-                    ChatModel.shared.updateContactConnectionStats(contact, stats)
+                    m.updateContactConnectionStats(contact, stats)
                }
            } catch let error {
                logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
@@ -9,8 +9,10 @@
 import SwiftUI
 import AVKit
 import SimpleXChat
+import Combine

 struct CIVideoView: View {
+    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
    private let chatItem: ChatItem
    private let image: String
@@ -27,6 +29,7 @@ struct CIVideoView: View {
    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
    @State private var fullScreenTimeObserver: Any? = nil
+    @State private var publisher: AnyCancellable? = nil

    init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
        self.chatItem = chatItem
@@ -101,7 +104,7 @@ struct CIVideoView: View {
                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                VideoPlayerView(player: player, url: url, showControls: false)
                .frame(width: w, height: w * preview.size.height / preview.size.width)
-                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
+                .onChange(of: m.stopPreviousRecPlay) { playingUrl in
                    if playingUrl != url {
                        player.pause()
                        videoPlaying = false
@@ -124,7 +127,7 @@ struct CIVideoView: View {
                }
                if !videoPlaying {
                    Button {
-                        ChatModel.shared.stopPreviousRecPlay = url
+                        m.stopPreviousRecPlay = url
                        player.play()
                    } label: {
                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
@@ -256,7 +259,7 @@ struct CIVideoView: View {
    // TODO encrypt: where file size is checked?
    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
        Task {
-            if let user = ChatModel.shared.currentUser {
+            if let user = m.currentUser {
                await receiveFile(user, file.fileId, encrypted, false)
            }
        }
@@ -290,9 +293,17 @@ struct CIVideoView: View {
            )
            .onAppear {
                DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    ChatModel.shared.stopPreviousRecPlay = url
+                    m.stopPreviousRecPlay = url
                    if let player = fullPlayer {
                        player.play()
+                        var played = false
+                        publisher = player.publisher(for: \.timeControlStatus).sink { status in
+                            if played || status == .playing {
+                                AppDelegate.keepScreenOn(status == .playing)
+                                AudioPlayer.changeAudioSession(status == .playing)
+                            }
+                            played = status == .playing
+                        }
                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
                            player.seek(to: CMTime.zero)
                            player.play()
@@ -307,6 +318,7 @@ struct CIVideoView: View {
                fullScreenTimeObserver = nil
                fullPlayer?.pause()
                fullPlayer?.seek(to: CMTime.zero)
+                publisher?.cancel()
            }
        }
    }
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct CIVoiceView: View {
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    let recordingFile: CIFile?
    let duration: Int
@@ -91,7 +92,7 @@ struct CIVoiceView: View {
    }

    private func metaView() -> some View {
-        CIMetaView(chatItem: chatItem)
+        CIMetaView(chat: chat, chatItem: chatItem)
    }
 }

@@ -219,7 +220,7 @@ struct VoiceMessagePlayer: View {
    private func downloadButton(_ recordingFile: CIFile) -> some View {
        Button {
            Task {
-                if let user = ChatModel.shared.currentUser {
+                if let user = chatModel.currentUser {
                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                }
            }
@@ -284,6 +285,7 @@ struct CIVoiceView_Previews: PreviewProvider {
        )
        Group {
            CIVoiceView(
+                chat: Chat.sampleData,
                chatItem: ChatItem.getVoiceMsgContentSample(),
                recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                duration: 30,
@@ -292,12 +294,11 @@ struct CIVoiceView_Previews: PreviewProvider {
                playbackTime: .constant(TimeInterval(20)),
                allowMenu: Binding.constant(true)
            )
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
        }
        .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
    }
 }
@@ -11,6 +11,7 @@ import SimpleXChat

 struct DeletedItemView: View {
    @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem

    var body: some View {
@@ -18,7 +19,7 @@ struct DeletedItemView: View {
            Text(chatItem.content.text)
                .foregroundColor(.secondary)
                .italic()
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .padding(.leading, 12)
@@ -32,8 +33,8 @@ struct DeletedItemView: View {
 struct DeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
+            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct EmojiItemView: View {
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem

    var body: some View {
@@ -17,7 +18,7 @@ struct EmojiItemView: View {
            emojiText(chatItem.content.text)
                .padding(.top, 8)
                .padding(.horizontal, 6)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.bottom, 8)
                .padding(.horizontal, 12)
        }
@@ -32,8 +33,8 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
-            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
+            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
+            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
        }
        .previewLayout(.fixed(width: 360, height: 70))
    }
@@ -88,13 +88,12 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
            file: CIFile.getSample(fileStatus: .sndComplete)
        )
        Group {
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
        }
        .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
    }
 }
@@ -150,7 +150,7 @@ struct FullScreenMediaView: View {

    private func startPlayerAndNotify() {
        if let player = player {
-            ChatModel.shared.stopPreviousRecPlay = url
+            m.stopPreviousRecPlay = url
            player.play()
        }
    }
@@ -10,11 +10,12 @@ import SwiftUI
 import SimpleXChat

 struct IntegrityErrorItemView: View {
+    @ObservedObject var chat: Chat
    var msgError: MsgErrorType
    var chatItem: ChatItem

    var body: some View {
-        CIMsgError(chatItem: chatItem) {
+        CIMsgError(chat: chat, chatItem: chatItem) {
            switch msgError {
            case .msgSkipped:
                AlertManager.shared.showAlertMsg(
@@ -52,6 +53,7 @@ struct IntegrityErrorItemView: View {
 }

 struct CIMsgError: View {
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var onTap: () -> Void

@@ -60,7 +62,7 @@ struct CIMsgError: View {
            Text(chatItem.content.text)
                .foregroundColor(.red)
                .italic()
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .padding(.leading, 12)
@@ -74,6 +76,6 @@ struct CIMsgError: View {

 struct IntegrityErrorItemView_Previews: PreviewProvider {
    static var previews: some View {
-        IntegrityErrorItemView(msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
+        IntegrityErrorItemView(chat: Chat.sampleData, msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
    }
 }
@@ -10,39 +10,70 @@ import SwiftUI
 import SimpleXChat

 struct MarkedDeletedItemView: View {
+    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
+    @Binding var revealed: Bool

    var body: some View {
-        HStack(alignment: .bottom, spacing: 0) {
-            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
-                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
-            } else {
-                markedDeletedText("marked deleted")
-            }
-            CIMetaView(chatItem: chatItem)
-                .padding(.horizontal, 12)
-        }
-        .padding(.leading, 12)
+        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .padding(.horizontal, 12)
        .padding(.vertical, 6)
        .background(chatItemFrameColor(chatItem, colorScheme))
        .cornerRadius(18)
        .textSelection(.disabled)
    }

-    func markedDeletedText(_ s: LocalizedStringKey) -> some View {
-        Text(s)
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .italic()
-            .lineLimit(1)
+    var mergedMarkedDeletedText: LocalizedStringKey {
+        if !revealed,
+           let ciCategory = chatItem.mergeCategory,
+           var i = m.getChatItemIndex(chatItem) {
+            var moderated = 0
+            var blocked = 0
+            var deleted = 0
+            var moderatedBy: Set<String> = []
+            while i < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
+                  ci.mergeCategory == ciCategory,
+                  let itemDeleted = ci.meta.itemDeleted {
+                switch itemDeleted {
+                case let .moderated(_, byGroupMember):
+                    moderated += 1
+                    moderatedBy.insert(byGroupMember.displayName)
+                case .blocked: blocked += 1
+                case .deleted: deleted += 1
+                }
+                i += 1
+            }
+            let total = moderated + blocked + deleted
+            return total <= 1
+            ? markedDeletedText
+            : total == moderated
+            ? "\(total) messages moderated by \(moderatedBy.joined(separator: ", "))"
+            : total == blocked
+            ? "\(total) messages blocked"
+            : "\(total) messages marked deleted"
+        } else {
+            return markedDeletedText
+        }
+    }
+
+    var markedDeletedText: LocalizedStringKey {
+        switch chatItem.meta.itemDeleted {
+        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
+        case .blocked: "blocked"
+        default: "marked deleted"
+        }
    }
 }

 struct MarkedDeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
+            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -25,7 +25,7 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 }

 struct MsgContentView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
    var text: String
    var formattedText: [FormattedText]? = nil
    var sender: String? = nil
@@ -121,13 +121,11 @@ private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
        case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, trustedUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, smpHosts):
            switch privacySimplexLinkModeDefault.get() {
            case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
            case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return trustedUri
-                                    ? linkText(t, t, preview, prefix: "")
-                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
+            case .browser: return linkText(t, simplexUri, preview, prefix: "")
            }
        case .email: return linkText(t, t, preview, prefix: "mailto:")
        case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
@@ -154,6 +152,7 @@ struct MsgContentView_Previews: PreviewProvider {
    static var previews: some View {
        let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
        return MsgContentView(
+            chat: Chat.sampleData,
            text: chatItem.text,
            formattedText: chatItem.formattedText,
            sender: chatItem.memberDisplayName,
@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct ChatItemInfoView: View {
+    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.colorScheme) var colorScheme
    var ci: ChatItem
    @Binding var chatItemInfo: ChatItemInfo?
@@ -290,8 +291,8 @@ struct ChatItemInfoView: View {

    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
        memberDeliveryStatuses.compactMap({ mds in
-            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
-                return (mem, mds.memberDeliveryStatus)
+            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
+                return (mem.wrapped, mds.memberDeliveryStatus)
            } else {
                return nil
            }
@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct ChatItemView: View {
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var maxWidth: CGFloat = .infinity
    @State var scrollProxy: ScrollViewProxy? = nil
@@ -19,8 +19,19 @@ struct ChatItemView: View {
    @Binding var audioPlayer: AudioPlayer?
    @Binding var playbackState: VoiceMessagePlaybackState
    @Binding var playbackTime: TimeInterval?
-    init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
-        self.chatInfo = chatInfo
+    init(
+        chat: Chat,
+        chatItem: ChatItem,
+        showMember: Bool = false,
+        maxWidth: CGFloat = .infinity,
+        scrollProxy: ScrollViewProxy? = nil,
+        revealed: Binding<Bool>,
+        allowMenu: Binding<Bool> = .constant(false),
+        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
+        playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback),
+        playbackTime: Binding<TimeInterval?> = .constant(nil)
+    ) {
+        self.chat = chat
        self.chatItem = chatItem
        self.maxWidth = maxWidth
        _scrollProxy = .init(initialValue: scrollProxy)
@@ -33,15 +44,15 @@ struct ChatItemView: View {

    var body: some View {
        let ci = chatItem
-        if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chatItem: chatItem)
+        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
        } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
            if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
-                EmojiItemView(chatItem: ci)
+                EmojiItemView(chat: chat, chatItem: ci)
            } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
+                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
            } else if ci.content.msgContent == nil {
-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
                framedItemView()
            }
@@ -51,15 +62,17 @@ struct ChatItemView: View {
    }

    private func framedItemView() -> some View {
-        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
    }
 }

 struct ChatItemContentView<Content: View>: View {
    @EnvironmentObject var chatModel: ChatModel
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
    var chatItem: ChatItem
+    @Binding var revealed: Bool
    var msgContentView: () -> Content
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

    var body: some View {
        switch chatItem.content {
@@ -69,11 +82,16 @@ struct ChatItemContentView<Content: View>: View {
        case .rcvDeleted: deletedItemView()
        case let .sndCall(status, duration): callItemView(status, duration)
        case let .rcvCall(status, duration): callItemView(status, duration)
-        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
+        case let .rcvIntegrityError(msgError):
+            if developerTools {
+                IntegrityErrorItemView(chat: chat, msgError: msgError, chatItem: chatItem)
+            } else {
+                ZStack {}
+            }
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(chat: chat, msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
        case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
        case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
+        case .rcvDirectEvent: eventItemView()
        case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
        case .rcvGroupEvent: eventItemView()
        case .sndGroupEvent: eventItemView()
@@ -82,9 +100,9 @@ struct ChatItemContentView<Content: View>: View {
        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
        case let .rcvChatPreference(feature, allowed, param):
-            CIFeaturePreferenceView(chatItem: chatItem, feature: feature, allowed: allowed, param: param)
+            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
        case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: .secondary)
+            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
        case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
        case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
        case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -96,15 +114,15 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func deletedItemView() -> some View {
-        DeletedItemView(chatItem: chatItem)
+        DeletedItemView(chat: chat, chatItem: chatItem)
    }

    private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
-        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
+        CICallItemView(chat: chat, chatItem: chatItem, status: status, duration: duration)
    }

    private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
    }

    private func eventItemView() -> some View {
@@ -112,7 +130,9 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func eventItemViewText() -> Text {
-        if let member = chatItem.memberDisplayName {
+        if !revealed, let t = mergedGroupEventText {
+            return chatEventText(t + Text(" ") + chatItem.timestampText)
+        } else if let member = chatItem.memberDisplayName {
            return Text(member + " ")
                    .font(.caption)
                    .foregroundColor(.secondary)
@@ -124,36 +144,44 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
    }

-    private var membersConnectedItemText: Text {
-        if let t = membersConnectedText {
-            return chatEventText(t, chatItem.timestampText)
+    private var mergedGroupEventText: Text? {
+        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
+        let members: LocalizedStringKey =
+            switch ns.count {
+            case 1: "\(ns[0]) connected"
+            case 2: "\(ns[0]) and \(ns[1]) connected"
+            case 3: "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
+            default:
+                ns.count > 3
+                ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
+                : ""
+            }
+        return if count <= 1 {
+            nil
+        } else if ns.count == 0 {
+            Text("\(count) group events")
+        } else if count > ns.count {
+            Text(members) + Text(" ") + Text("and \(count - ns.count) other events")
        } else {
-            return eventItemViewText()
+            Text(members)
        }
    }
-
-    private var membersConnectedText: LocalizedStringKey? {
-        let ns = chatModel.getConnectedMemberNames(chatItem)
-        return ns.count > 3
-            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
-            : ns.count == 3
-            ? "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
-            : ns.count == 2
-            ? "\(ns[0]) and \(ns[1]) connected"
-            : nil
-    }
 }

-func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
-    (Text(eventText) + Text(" ") + ts)
+func chatEventText(_ text: Text) -> Text {
+    text
        .font(.caption)
        .foregroundColor(.secondary)
        .fontWeight(.light)
 }

+func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
+    chatEventText(Text(eventText) + Text(" ") + ts)
+}
+
 func chatEventText(_ ci: ChatItem) -> Text {
    chatEventText("\(ci.content.text)", ci.timestampText)
 }
@@ -161,15 +189,15 @@ func chatEventText(_ ci: ChatItem) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
        }
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
@@ -181,7 +209,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
        let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
        Group{
            ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                chatItem: ChatItem(
                    chatDir: .directRcv,
                    meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -192,7 +220,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                revealed: Binding.constant(true)
            )
            ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                chatItem: ChatItem(
                    chatDir: .directRcv,
                    meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
@@ -203,7 +231,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                revealed: Binding.constant(true)
            )
            ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                chatItem: ChatItem(
                    chatDir: .directRcv,
                    meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -214,7 +242,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                revealed: Binding.constant(true)
            )
            ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                chatItem: ChatItem(
                    chatDir: .directRcv,
                    meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -225,7 +253,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                revealed: Binding.constant(true)
            )
            ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                chatItem: ChatItem(
                    chatDir: .directRcv,
                    meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -21,9 +21,7 @@ struct ChatView: View {
    @State private var showChatInfoSheet: Bool = false
    @State private var showAddMembersSheet: Bool = false
    @State private var composeState = ComposeState()
-    @State private var deletingItem: ChatItem? = nil
    @State private var keyboardVisible = false
-    @State private var showDeleteMessage = false
    @State private var connectionStats: ConnectionStats?
    @State private var customUserProfile: Profile?
    @State private var connectionCode: String?
@@ -36,7 +34,12 @@ struct ChatView: View {
    @State private var searchText: String = ""
    @FocusState private var searchFocussed
    // opening GroupMemberInfoView on member icon
-    @State private var selectedMember: GroupMember? = nil
+    @State private var membersLoaded = false
+    @State private var selectedMember: GMember? = nil
+    // opening GroupLinkView on link button (incognito)
+    @State private var showGroupLinkSheet: Bool = false
+    @State private var groupLink: String?
+    @State private var groupLinkMemberRole: GroupMemberRole = .member

    var body: some View {
        if #available(iOS 16.0, *) {
@@ -91,7 +94,10 @@ struct ChatView: View {
                chatModel.chatId = nil
                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                    if chatModel.chatId == nil {
+                        chatModel.chatItemStatuses = [:]
                        chatModel.reversedChatItems = []
+                        chatModel.groupMembers = []
+                        membersLoaded = false
                    }
                }
            }
@@ -108,7 +114,7 @@ struct ChatView: View {
                                    connectionStats = stats
                                    customUserProfile = profile
                                    connectionCode = code
-                                    if contact.activeConn.connectionCode != ct.activeConn.connectionCode {
+                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
                                        chat.chatInfo = .direct(contact: ct)
                                    }
                                }
@@ -129,18 +135,21 @@ struct ChatView: View {
                    }
                } else if case let .group(groupInfo) = cInfo {
                    Button {
-                        Task {
-                            let groupMembers = await apiListMembers(groupInfo.groupId)
-                            await MainActor.run {
-                                ChatModel.shared.groupMembers = groupMembers
-                                showChatInfoSheet = true
-                            }
-                        }
+                        Task { await loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
                    } label: {
                        ChatInfoToolbar(chat: chat)
                    }
                    .appSheet(isPresented: $showChatInfoSheet) {
-                        GroupChatInfoView(chat: chat, groupInfo: groupInfo)
+                        GroupChatInfoView(
+                            chat: chat,
+                            groupInfo: Binding(
+                                get: { groupInfo },
+                                set: { gInfo in
+                                    chat.chatInfo = .group(groupInfo: gInfo)
+                                    chat.created = Date.now
+                                }
+                            )
+                        )
                    }
                }
            }
@@ -150,7 +159,7 @@ struct ChatView: View {
                    HStack {
                        if contact.allowsFeature(.calls) {
                            callButton(contact, .audio, imageName: "phone")
-                                .disabled(!contact.ready)
+                                .disabled(!contact.ready || !contact.active)
                        }
                        Menu {
                            if contact.allowsFeature(.calls) {
@@ -159,11 +168,11 @@ struct ChatView: View {
                                } label: {
                                    Label("Video call", systemImage: "video")
                                }
-                                .disabled(!contact.ready)
+                                .disabled(!contact.ready || !contact.active)
                            }
                            searchButton()
                            toggleNtfsButton(chat)
-                                .disabled(!contact.ready)
+                                .disabled(!contact.ready || !contact.active)
                        } label: {
                            Image(systemName: "ellipsis")
                        }
@@ -172,9 +181,16 @@ struct ChatView: View {
                    HStack {
                        if groupInfo.canAddMembers {
                            if (chat.chatInfo.incognito) {
-                                Image(systemName: "person.crop.circle.badge.plus")
-                                    .foregroundColor(Color(uiColor: .tertiaryLabel))
-                                    .onTapGesture { AlertManager.shared.showAlert(cantInviteIncognitoAlert()) }
+                                groupLinkButton()
+                                    .appSheet(isPresented: $showGroupLinkSheet) {
+                                        GroupLinkView(
+                                            groupId: groupInfo.groupId,
+                                            groupLink: $groupLink,
+                                            groupLinkMemberRole: $groupLinkMemberRole,
+                                            showTitle: true,
+                                            creatingGroup: false
+                                        )
+                                    }
                            } else {
                                addMembersButton()
                                    .appSheet(isPresented: $showAddMembersSheet) {
@@ -196,6 +212,17 @@ struct ChatView: View {
        }
    }

+    private func loadGroupMembers(_ groupInfo: GroupInfo, updateView: @escaping () -> Void = {}) async {
+        let groupMembers = await apiListMembers(groupInfo.groupId)
+        await MainActor.run {
+            if chatModel.chatId == groupInfo.id {
+                chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                membersLoaded = true
+                updateView()
+            }
+        }
+    }
+
    private func initChatView() {
        let cInfo = chat.chatInfo
        if case let .direct(contact) = cInfo {
@@ -321,6 +348,7 @@ struct ChatView: View {
    @ViewBuilder private func connectingText() -> some View {
        if case let .direct(contact) = chat.chatInfo,
           !contact.ready,
+           contact.active,
           !contact.nextSendGrpInv {
            Text("connecting…")
                .font(.caption)
@@ -403,19 +431,32 @@ struct ChatView: View {
    private func addMembersButton() -> some View {
        Button {
            if case let .group(gInfo) = chat.chatInfo {
-                Task {
-                    let groupMembers = await apiListMembers(gInfo.groupId)
-                    await MainActor.run {
-                        ChatModel.shared.groupMembers = groupMembers
-                        showAddMembersSheet = true
-                    }
-                }
+                Task { await loadGroupMembers(gInfo) { showAddMembersSheet = true } }
            }
        } label: {
            Image(systemName: "person.crop.circle.badge.plus")
        }
    }
-    
+
+    private func groupLinkButton() -> some View {
+        Button {
+            if case let .group(gInfo) = chat.chatInfo {
+                Task {
+                    do {
+                        if let link = try apiGetGroupLink(gInfo.groupId) {
+                            (groupLink, groupLinkMemberRole) = link
+                        }
+                    } catch let error {
+                        logger.error("ChatView apiGetGroupLink: \(responseError(error))")
+                    }
+                    showGroupLinkSheet = true
+                }
+            }
+        } label: {
+            Image(systemName: "link.badge.plus")
+        }
+    }
+
    private func loadChatItems(_ cInfo: ChatInfo, _ ci: ChatItem, _ proxy: ScrollViewProxy) {
        if let firstItem = chatModel.reversedChatItems.last, firstItem.id == ci.id {
            if loadingItems || firstPage { return }
@@ -445,73 +486,30 @@ struct ChatView: View {
    }
    
    @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
-        if case let .groupRcv(member) = ci.chatDir,
-           case let .group(groupInfo) = chat.chatInfo {
-            let (prevItem, nextItem) = chatModel.getChatItemNeighbors(ci)
-            if ci.memberConnected != nil && nextItem?.memberConnected != nil {
-                // memberConnected events are aggregated at the last chat item in a row of such events, see ChatItemView
-                ZStack {} // scroll doesn't work if it's EmptyView()
-            } else {
-                if prevItem == nil || showMemberImage(member, prevItem) {
-                    VStack(alignment: .leading, spacing: 4) {
-                        if ci.content.showMemberName {
-                            Text(member.displayName)
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                                .padding(.leading, memberImageSize + 14)
-                                .padding(.top, 7)
-                        }
-                        HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image)
-                                .frame(width: memberImageSize, height: memberImageSize)
-                                .onTapGesture { selectedMember = member }
-                                .appSheet(item: $selectedMember) { member in
-                                    GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
-                                }
-                            chatItemWithMenu(ci, maxWidth)
-                        }
-                    }
-                    .padding(.top, 5)
-                    .padding(.trailing)
-                    .padding(.leading, 12)
-                } else {
-                    chatItemWithMenu(ci, maxWidth)
-                        .padding(.top, 5)
-                        .padding(.trailing)
-                        .padding(.leading, memberImageSize + 8 + 12)
-                }
-            }
-        } else {
-            chatItemWithMenu(ci, maxWidth)
-                .padding(.horizontal)
-                .padding(.top, 5)
-        }
-    }
-
-    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
        ChatItemWithMenu(
-            ci: ci,
+            chat: chat,
+            chatItem: ci,
            maxWidth: maxWidth,
-            scrollProxy: scrollProxy,
-            deleteMessage: deleteMessage,
-            deletingItem: $deletingItem,
            composeState: $composeState,
-            showDeleteMessage: $showDeleteMessage
+            selectedMember: $selectedMember,
+            chatView: self
        )
-        .environmentObject(chat)
    }

    private struct ChatItemWithMenu: View {
-        @EnvironmentObject var chat: Chat
+        @EnvironmentObject var m: ChatModel
        @Environment(\.colorScheme) var colorScheme
-        var ci: ChatItem
+        @ObservedObject var chat: Chat
+        var chatItem: ChatItem
        var maxWidth: CGFloat
-        var scrollProxy: ScrollViewProxy?
-        var deleteMessage: (CIDeleteMode) -> Void
-        @Binding var deletingItem: ChatItem?
        @Binding var composeState: ComposeState
-        @Binding var showDeleteMessage: Bool
+        @Binding var selectedMember: GMember?
+        var chatView: ChatView

+        @State private var deletingItem: ChatItem? = nil
+        @State private var showDeleteMessage = false
+        @State private var deletingItems: [Int64] = []
+        @State private var showDeleteMessages = false
        @State private var revealed = false
        @State private var showChatItemInfoSheet: Bool = false
        @State private var chatItemInfo: ChatItemInfo?
@@ -523,18 +521,114 @@ struct ChatView: View {
        @State private var playbackTime: TimeInterval?

        var body: some View {
+            let (currIndex, nextItem) = m.getNextChatItem(chatItem)
+            let ciCategory = chatItem.mergeCategory
+            if (ciCategory != nil && ciCategory == nextItem?.mergeCategory) {
+                // memberConnected events and deleted items are aggregated at the last chat item in a row, see ChatItemView
+                ZStack {} // scroll doesn't work if it's EmptyView()
+            } else {
+                let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
+                let range = itemsRange(currIndex, prevHidden)
+                if revealed, let range = range {
+                    let items = Array(zip(Array(range), m.reversedChatItems[range]))
+                    ForEach(items, id: \.1.viewId) { (i, ci) in
+                        let prev = i == prevHidden ? prevItem : m.reversedChatItems[i + 1]
+                        chatItemView(ci, nil, prev)
+                    }
+                } else {
+                    chatItemView(chatItem, range, prevItem)
+                }
+            }
+        }
+
+        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?) -> some View {
+            if case let .groupRcv(member) = ci.chatDir,
+               case let .group(groupInfo) = chat.chatInfo {
+                let (prevMember, memCount): (GroupMember?, Int) =
+                    if let range = range {
+                        m.getPrevHiddenMember(member, range)
+                    } else {
+                        (nil, 1)
+                    }
+                if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
+                    VStack(alignment: .leading, spacing: 4) {
+                        if ci.content.showMemberName {
+                            Text(memberNames(member, prevMember, memCount))
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                                .padding(.leading, memberImageSize + 14)
+                                .padding(.top, 7)
+                        }
+                        HStack(alignment: .top, spacing: 8) {
+                            ProfileImage(imageStr: member.memberProfile.image)
+                                .frame(width: memberImageSize, height: memberImageSize)
+                                .onTapGesture {
+                                    if chatView.membersLoaded {
+                                        selectedMember = m.getGroupMember(member.groupMemberId)
+                                    } else {
+                                        Task {
+                                            await chatView.loadGroupMembers(groupInfo) {
+                                                selectedMember = m.getGroupMember(member.groupMemberId)
+                                            }
+                                        }
+                                    }
+                                }
+                                .appSheet(item: $selectedMember) { member in
+                                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                                }
+                            chatItemWithMenu(ci, range, maxWidth)
+                        }
+                    }
+                    .padding(.top, 5)
+                    .padding(.trailing)
+                    .padding(.leading, 12)
+                } else {
+                    chatItemWithMenu(ci, range, maxWidth)
+                        .padding(.top, 5)
+                        .padding(.trailing)
+                        .padding(.leading, memberImageSize + 8 + 12)
+                }
+            } else {
+                chatItemWithMenu(ci, range, maxWidth)
+                    .padding(.horizontal)
+                    .padding(.top, 5)
+            }
+        }
+
+        private func memberNames(_ member: GroupMember, _ prevMember: GroupMember?, _ memCount: Int) -> LocalizedStringKey {
+            let name = member.displayName
+            return if let prevName = prevMember?.displayName {
+                memCount > 2
+                ? "\(name), \(prevName) and \(memCount - 2) members"
+                : "\(name) and \(prevName)"
+            } else {
+                "\(name)"
+            }
+        }
+
+        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat) -> some View {
            let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
            let uiMenu: Binding<UIMenu> = Binding(
-                get: { UIMenu(title: "", children: menu(live: composeState.liveMessage != nil)) },
+                get: { UIMenu(title: "", children: menu(ci, range, live: composeState.liveMessage != nil)) },
                set: { _ in }
            )
            
            VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
-                    .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
-                    .accessibilityLabel("")
+                ChatItemView(
+                    chat: chat,
+                    chatItem: ci,
+                    maxWidth: maxWidth,
+                    scrollProxy: chatView.scrollProxy,
+                    revealed: $revealed,
+                    allowMenu: $allowMenu,
+                    audioPlayer: $audioPlayer,
+                    playbackState: $playbackState,
+                    playbackTime: $playbackTime
+                )
+                .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
+                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
-                    chatItemReactions()
+                    chatItemReactions(ci)
                        .padding(.bottom, 4)
                }
            }
@@ -548,6 +642,11 @@ struct ChatView: View {
                        }
                    }
                }
+                .confirmationDialog(deleteMessagesTitle, isPresented: $showDeleteMessages, titleVisibility: .visible) {
+                    Button("Delete for me", role: .destructive) {
+                        deleteMessages()
+                    }
+                }
                .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
                .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
                .onDisappear {
@@ -565,7 +664,15 @@ struct ChatView: View {
                }
        }

-        private func chatItemReactions() -> some View {
+        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
+            switch (prevItem?.chatDir) {
+            case .groupSnd: return true
+            case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
+            default: return false
+            }
+        }
+
+        private func chatItemReactions(_ ci: ChatItem) -> some View {
            HStack(spacing: 4) {
                ForEach(ci.reactions, id: \.reaction) { r in
                    let v = HStack(spacing: 4) {
@@ -585,7 +692,7 @@ struct ChatView: View {

                    if chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted) {
                        v.onTapGesture {
-                            setReaction(add: !r.userReacted, reaction: r.reaction)
+                            setReaction(ci, add: !r.userReacted, reaction: r.reaction)
                        }
                    } else {
                        v
@@ -594,10 +701,10 @@ struct ChatView: View {
            }
        }

-        private func menu(live: Bool) -> [UIMenuElement] {
+        private func menu(_ ci: ChatItem, _ range: ClosedRange<Int>?, live: Bool) -> [UIMenuElement] {
            var menu: [UIMenuElement] = []
            if let mc = ci.content.msgContent, ci.meta.itemDeleted == nil || revealed {
-                let rs = allReactions()
+                let rs = allReactions(ci)
                if chat.chatInfo.featureEnabled(.reactions) && ci.allowAddReaction,
                   rs.count > 0 {
                    var rm: UIMenu
@@ -614,11 +721,16 @@ struct ChatView: View {
                    menu.append(rm)
                }
                if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
-                    menu.append(replyUIAction())
+                    menu.append(replyUIAction(ci))
                }
-                menu.append(shareUIAction())
-                menu.append(copyUIAction())
-                if let fileSource = getLoadedFileSource(ci.file) {
+                let fileSource = getLoadedFileSource(ci.file)
+                let fileExists = if let fs = fileSource, FileManager.default.fileExists(atPath: getAppFilePath(fs.filePath).path) { true } else { false }
+                let copyAndShareAllowed = !ci.content.text.isEmpty || (ci.content.msgContent?.isImage == true && fileExists)
+                if copyAndShareAllowed {
+                    menu.append(shareUIAction(ci))
+                    menu.append(copyUIAction(ci))
+                }
+                if let fileSource = fileSource, fileExists {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
                            menu.append(saveFileAction(fileSource))
@@ -630,9 +742,9 @@ struct ChatView: View {
                    }
                }
                if ci.meta.editable && !mc.isVoice && !live {
-                    menu.append(editAction())
+                    menu.append(editAction(ci))
                }
-                menu.append(viewInfoUIAction())
+                menu.append(viewInfoUIAction(ci))
                if revealed {
                    menu.append(hideUIAction())
                }
@@ -642,25 +754,31 @@ struct ChatView: View {
                    menu.append(cancelFileUIAction(file.fileId, cancelAction))
                }
                if !live || !ci.meta.isLive {
-                    menu.append(deleteUIAction())
+                    menu.append(deleteUIAction(ci))
                }
                if let (groupInfo, _) = ci.memberToModerate(chat.chatInfo) {
-                    menu.append(moderateUIAction(groupInfo))
+                    menu.append(moderateUIAction(ci, groupInfo))
                }
            } else if ci.meta.itemDeleted != nil {
-                if !ci.isDeletedContent {
+                if revealed {
+                    menu.append(hideUIAction())
+                } else if !ci.isDeletedContent {
                    menu.append(revealUIAction())
+                } else if range != nil {
+                    menu.append(expandUIAction())
                }
-                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction())
+                menu.append(viewInfoUIAction(ci))
+                menu.append(deleteUIAction(ci))
            } else if ci.isDeletedContent {
-                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction())
+                menu.append(viewInfoUIAction(ci))
+                menu.append(deleteUIAction(ci))
+            } else if ci.mergeCategory != nil && ((range?.count ?? 0) > 1 || revealed) {
+                menu.append(revealed ? shrinkUIAction() : expandUIAction())
            }
            return menu
        }
        
-        private func replyUIAction() -> UIAction {
+        private func replyUIAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Reply", comment: "chat item action"),
                image: UIImage(systemName: "arrowshape.turn.up.left")
@@ -695,11 +813,11 @@ struct ChatView: View {
            )
        }

-        private func allReactions() -> [UIAction] {
+        private func allReactions(_ ci: ChatItem) -> [UIAction] {
            MsgReaction.values.compactMap { r in
                ci.reactions.contains(where: { $0.userReacted && $0.reaction == r })
                ? nil
-                : UIAction(title: r.text) { _ in setReaction(add: true, reaction: r) }
+                : UIAction(title: r.text) { _ in setReaction(ci, add: true, reaction: r) }
            }
        }

@@ -707,7 +825,7 @@ struct ChatView: View {
            rs.count > 4 ? 3 : 4
        }

-        private func setReaction(add: Bool, reaction: MsgReaction) {
+        private func setReaction(_ ci: ChatItem, add: Bool, reaction: MsgReaction) {
            Task {
                do {
                    let cInfo = chat.chatInfo
@@ -719,7 +837,7 @@ struct ChatView: View {
                        reaction: reaction
                    )
                    await MainActor.run {
-                        ChatModel.shared.updateChatItem(chat.chatInfo, chatItem)
+                        m.updateChatItem(chat.chatInfo, chatItem)
                    }
                } catch let error {
                    logger.error("apiChatItemReaction error: \(responseError(error))")
@@ -727,7 +845,7 @@ struct ChatView: View {
            }
        }

-        private func shareUIAction() -> UIAction {
+        private func shareUIAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Share", comment: "chat item action"),
                image: UIImage(systemName: "square.and.arrow.up")
@@ -740,7 +858,7 @@ struct ChatView: View {
            }
        }
        
-        private func copyUIAction() -> UIAction {
+        private func copyUIAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Copy", comment: "chat item action"),
                image: UIImage(systemName: "doc.on.doc")
@@ -773,7 +891,7 @@ struct ChatView: View {
            }
        }
        
-        private func editAction() -> UIAction {
+        private func editAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Edit", comment: "chat item action"),
                image: UIImage(systemName: "square.and.pencil")
@@ -784,7 +902,7 @@ struct ChatView: View {
            }
        }

-        private func viewInfoUIAction() -> UIAction {
+        private func viewInfoUIAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Info", comment: "chat item action"),
                image: UIImage(systemName: "info.circle")
@@ -797,10 +915,7 @@ struct ChatView: View {
                            chatItemInfo = ciInfo
                        }
                        if case let .group(gInfo) = chat.chatInfo {
-                            let groupMembers = await apiListMembers(gInfo.groupId)
-                            await MainActor.run {
-                                ChatModel.shared.groupMembers = groupMembers
-                            }
+                            await chatView.loadGroupMembers(gInfo)
                        }
                    } catch let error {
                        logger.error("apiGetChatItemInfo error: \(responseError(error))")
@@ -821,7 +936,7 @@ struct ChatView: View {
                    message: Text(cancelAction.alert.message),
                    primaryButton: .destructive(Text(cancelAction.alert.confirm)) {
                        Task {
-                            if let user = ChatModel.shared.currentUser {
+                            if let user = m.currentUser {
                                await cancelFile(user: user, fileId: fileId)
                            }
                        }
@@ -842,18 +957,45 @@ struct ChatView: View {
            }
        }
        
-        private func deleteUIAction() -> UIAction {
+        private func deleteUIAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Delete", comment: "chat item action"),
                image: UIImage(systemName: "trash"),
                attributes: [.destructive]
            ) { _ in
-                showDeleteMessage = true
-                deletingItem = ci
+                if !revealed && ci.meta.itemDeleted != nil,
+                   let currIndex = m.getChatItemIndex(ci),
+                   let ciCategory = ci.mergeCategory {
+                    let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
+                    if let range = itemsRange(currIndex, prevHidden) {
+                        var itemIds: [Int64] = []
+                        for i in range {
+                            itemIds.append(m.reversedChatItems[i].id)
+                        }
+                        showDeleteMessages = true
+                        deletingItems = itemIds
+                    } else {
+                        showDeleteMessage = true
+                        deletingItem = ci
+                    }
+                } else {
+                    showDeleteMessage = true
+                    deletingItem = ci
+                }
            }
        }

-        private func moderateUIAction(_ groupInfo: GroupInfo) -> UIAction {
+        private func itemsRange(_ currIndex: Int?, _ prevHidden: Int?) -> ClosedRange<Int>? {
+            if let currIndex = currIndex,
+               let prevHidden = prevHidden,
+               prevHidden > currIndex {
+                currIndex...prevHidden
+            } else {
+                nil
+            }
+        }
+
+        private func moderateUIAction(_ ci: ChatItem, _ groupInfo: GroupInfo) -> UIAction {
            UIAction(
                title: NSLocalizedString("Moderate", comment: "chat item action"),
                image: UIImage(systemName: "flag"),
@@ -885,20 +1027,105 @@ struct ChatView: View {
                }
            }
        }
-        
+
+        private func expandUIAction() -> UIAction {
+            UIAction(
+                title: NSLocalizedString("Expand", comment: "chat item action"),
+                image: UIImage(systemName: "arrow.up.and.line.horizontal.and.arrow.down")
+            ) { _ in
+                withAnimation {
+                    revealed = true
+                }
+            }
+        }
+
+        private func shrinkUIAction() -> UIAction {
+            UIAction(
+                title: NSLocalizedString("Hide", comment: "chat item action"),
+                image: UIImage(systemName: "arrow.down.and.line.horizontal.and.arrow.up")
+            ) { _ in
+                withAnimation {
+                    revealed = false
+                }
+            }
+        }
+
        private var broadcastDeleteButtonText: LocalizedStringKey {
            chat.chatInfo.featureEnabled(.fullDelete) ? "Delete for everyone" : "Mark deleted for everyone"
        }
-    }

-    private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
-        switch (prevItem?.chatDir) {
-        case .groupSnd: return true
-        case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
-        default: return false
+        var deleteMessagesTitle: LocalizedStringKey {
+            let n = deletingItems.count
+            return n == 1 ? "Delete message?" : "Delete \(n) messages?"
+        }
+
+        private func deleteMessages() {
+            let itemIds = deletingItems
+            if itemIds.count > 0 {
+                let chatInfo = chat.chatInfo
+                Task {
+                    var deletedItems: [ChatItem] = []
+                    for itemId in itemIds {
+                        do {
+                            let (di, _) = try await apiDeleteChatItem(
+                                type: chatInfo.chatType,
+                                id: chatInfo.apiId,
+                                itemId: itemId,
+                                mode: .cidmInternal
+                            )
+                            deletedItems.append(di)
+                        } catch {
+                            logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
+                        }
+                    }
+                    await MainActor.run {
+                        for di in deletedItems {
+                            m.removeChatItem(chatInfo, di)
+                        }
+                    }
+                }
+            }
+        }
+
+        private func deleteMessage(_ mode: CIDeleteMode) {
+            logger.debug("ChatView deleteMessage")
+            Task {
+                logger.debug("ChatView deleteMessage: in Task")
+                do {
+                    if let di = deletingItem {
+                        var deletedItem: ChatItem
+                        var toItem: ChatItem?
+                        if case .cidmBroadcast = mode,
+                           let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
+                            (deletedItem, toItem) = try await apiDeleteMemberChatItem(
+                                groupId: groupInfo.apiId,
+                                groupMemberId: groupMember.groupMemberId,
+                                itemId: di.id
+                            )
+                        } else {
+                            (deletedItem, toItem) = try await apiDeleteChatItem(
+                                type: chat.chatInfo.chatType,
+                                id: chat.chatInfo.apiId,
+                                itemId: di.id,
+                                mode: mode
+                            )
+                        }
+                        DispatchQueue.main.async {
+                            deletingItem = nil
+                            if let toItem = toItem {
+                                _ = m.upsertChatItem(chat.chatInfo, toItem)
+                            } else {
+                                m.removeChatItem(chat.chatInfo, deletedItem)
+                            }
+                        }
+                    }
+                } catch {
+                    logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
+                }
+            }
        }
    }
-    
+
    private func scrollToBottom(_ proxy: ScrollViewProxy) {
        if let ci = chatModel.reversedChatItems.first {
            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
@@ -910,44 +1137,6 @@ struct ChatView: View {
            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
        }
    }
-    
-    private func deleteMessage(_ mode: CIDeleteMode) {
-        logger.debug("ChatView deleteMessage")
-        Task {
-            logger.debug("ChatView deleteMessage: in Task")
-            do {
-                if let di = deletingItem {
-                    var deletedItem: ChatItem
-                    var toItem: ChatItem?
-                    if case .cidmBroadcast = mode,
-                       let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
-                        (deletedItem, toItem) = try await apiDeleteMemberChatItem(
-                            groupId: groupInfo.apiId,
-                            groupMemberId: groupMember.groupMemberId,
-                            itemId: di.id
-                        )
-                    } else {
-                        (deletedItem, toItem) = try await apiDeleteChatItem(
-                            type: chat.chatInfo.chatType,
-                            id: chat.chatInfo.apiId,
-                            itemId: di.id,
-                            mode: mode
-                        )
-                    }
-                    DispatchQueue.main.async {
-                        deletingItem = nil
-                        if let toItem = toItem {
-                            _ = chatModel.upsertChatItem(chat.chatInfo, toItem)
-                        } else {
-                            chatModel.removeChatItem(chat.chatInfo, deletedItem)
-                        }
-                    }
-                }
-            } catch {
-                logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
-            }
-        }
-    }
 }

@ViewBuilder func toggleNtfsButton(_ chat: Chat) -> some View {
@@ -964,7 +1153,7 @@ struct ChatView: View {

 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
    var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs
+    chatSettings.enableNtfs = enableNtfs ? .all : .none
    updateChatSettings(chat, chatSettings: chatSettings)
 }

@@ -104,7 +104,7 @@ struct ComposeState {

    var sendEnabled: Bool {
        switch preview {
-        case .mediaPreviews: return true
+        case let .mediaPreviews(media): return !media.isEmpty
        case .voicePreview: return voiceMessageRecordingState == .finished
        case .filePreview: return true
        default: return !message.isEmpty || liveMessage != nil
@@ -384,10 +384,10 @@ struct ComposeView: View {
            }
        }
        .sheet(isPresented: $showMediaPicker) {
-            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
-                showMediaPicker = false
-                if itemsSelected {
-                    DispatchQueue.main.async {
+            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
+                await MainActor.run {
+                    showMediaPicker = false
+                    if itemsSelected {
                        composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                    }
                }
@@ -488,6 +488,30 @@ struct ComposeView: View {
        }
    }

+    private func addMediaContent(_ content: UploadContent) async {
+        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+            var newMedia: [(String, UploadContent?)] = []
+            if case var .mediaPreviews(media) = composeState.preview {
+                media.append((img, content))
+                newMedia = media
+            } else {
+                newMedia = [(img, content)]
+            }
+            await MainActor.run {
+                composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: newMedia))
+            }
+        }
+    }
+
+    // When error occurs while converting video, remove media preview
+    private func finishedPreprocessingMediaContent() {
+        if case let .mediaPreviews(media) = composeState.preview, media.isEmpty {
+            DispatchQueue.main.async {
+                composeState = composeState.copy(preview: .noPreview)
+            }
+        }
+    }
+
    private var maxFileSize: Int64 {
        getMaxFileSize(.xftp)
    }
@@ -592,12 +616,14 @@ struct ComposeView: View {
            EmptyView()
        case let .quotedItem(chatItem: quotedItem):
            ContextItemView(
+                chat: chat,
                contextItem: quotedItem,
                contextIcon: "arrowshape.turn.up.left",
                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
            )
        case let .editingItem(chatItem: editingItem):
            ContextItemView(
+                chat: chat,
                contextItem: editingItem,
                contextIcon: "pencil",
                cancelContextItem: { clearState() }
@@ -11,6 +11,7 @@ import SimpleXChat

 struct ContextItemView: View {
    @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
    let contextItem: ChatItem
    let contextIcon: String
    let cancelContextItem: () -> Void
@@ -48,6 +49,7 @@ struct ContextItemView: View {

    private func msgContentView(lines: Int) -> some View {
        MsgContentView(
+            chat: chat,
            text: contextItem.text,
            formattedText: contextItem.formattedText
        )
@@ -59,6 +61,6 @@ struct ContextItemView: View {
 struct ContextItemView_Previews: PreviewProvider {
    static var previews: some View {
        let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
    }
 }
@@ -14,20 +14,28 @@ import PhotosUI
 struct NativeTextEditor: UIViewRepresentable {
    @Binding var text: String
    @Binding var disableEditing: Bool
-    let height: CGFloat
-    let font: UIFont
+    @Binding var height: CGFloat
    @Binding var focused: Bool
    let alignment: TextAlignment
    let onImagesAdded: ([UploadContent]) -> Void
    
+    private let minHeight: CGFloat = 37
+
+    private let defaultHeight: CGFloat = {
+        let field = CustomUITextField(height: Binding.constant(0))
+        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
+        return min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, 37), 360).rounded(.down)
+    }()
+    
    func makeUIView(context: Context) -> UITextView {
-        let field = CustomUITextField()
+        let field = CustomUITextField(height: _height)
        field.text = text
-        field.font = font
        field.textAlignment = alignment == .leading ? .left : .right
        field.autocapitalizationType = .sentences
        field.setOnTextChangedListener { newText, images in
            if !disableEditing {
+                // Speed up the process of updating layout, reduce jumping content on screen
+                if !isShortEmoji(newText) { updateHeight(field) }
                text = newText
            } else {
                field.text = text
@@ -39,24 +47,72 @@ struct NativeTextEditor: UIViewRepresentable {
        field.setOnFocusChangedListener { focused = $0 }
        field.delegate = field
        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
+        updateFont(field)
+        updateHeight(field)
        return field
    }
    
    func updateUIView(_ field: UITextView, context: Context) {
        field.text = text
-        field.font = font
        field.textAlignment = alignment == .leading ? .left : .right
+        updateFont(field)
+        updateHeight(field)
+    }
+
+    private func updateHeight(_ field: UITextView) {
+        let maxHeight = min(360, field.font!.lineHeight * 12)
+        // When having emoji in text view and then removing it, sizeThatFits shows previous size (too big for empty text view), so using work around with default size
+        let newHeight = field.text == ""
+        ? defaultHeight
+        : min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, minHeight), maxHeight).rounded(.down)
+
+        if field.frame.size.height != newHeight {
+            field.frame.size = CGSizeMake(field.frame.size.width, newHeight)
+            (field as! CustomUITextField).invalidateIntrinsicContentHeight(newHeight)
+        }
+    }
+
+    private func updateFont(_ field: UITextView) {
+        field.font = isShortEmoji(field.text)
+        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
+        : UIFont.preferredFont(forTextStyle: .body)
    }
 }

 private class CustomUITextField: UITextView, UITextViewDelegate {
+    var height: Binding<CGFloat>
+    var newHeight: CGFloat = 0
    var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
    var onFocusChanged: (Bool) -> Void = { focused in }
    
+    init(height: Binding<CGFloat>) {
+        self.height = height
+        super.init(frame: .zero, textContainer: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("Not implemented")
+    }
+
+    // This func here needed because using frame.size.height in intrinsicContentSize while loading a screen with text (for example. when you have a draft),
+    // produces incorrect height because at that point intrinsicContentSize has old value of frame.size.height even if it was set to new value right before the call
+    // (who knows why...)
+    func invalidateIntrinsicContentHeight(_ newHeight: CGFloat) {
+        self.newHeight = newHeight
+        invalidateIntrinsicContentSize()
+    }
+
+    override var intrinsicContentSize: CGSize {
+        if height.wrappedValue != newHeight {
+            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
+        }
+        return CGSizeMake(0, newHeight)
+    }
+
    func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
        self.onTextChanged = onTextChanged
    }
-    
+
    func setOnFocusChangedListener(onFocusChanged: @escaping (Bool) -> Void) {
        self.onFocusChanged = onFocusChanged
    }
@@ -144,14 +200,14 @@ private class CustomUITextField: UITextView, UITextViewDelegate {

 struct NativeTextEditor_Previews: PreviewProvider{
    static var previews: some View {
-        return NativeTextEditor(
+        NativeTextEditor(
            text: Binding.constant("Hello, world!"),
            disableEditing: Binding.constant(false),
-            height: 100,
-            font: UIFont.preferredFont(forTextStyle: .body),
+            height: Binding.constant(100),
            focused: Binding.constant(false),
            alignment: TextAlignment.leading,
            onImagesAdded: { _ in }
        )
+        .fixedSize(horizontal: false, vertical: true)
    }
 }
@@ -32,15 +32,12 @@ struct SendMessageView: View {
    var sendButtonColor = Color.accentColor
    @State private var teHeight: CGFloat = 42
    @State private var teFont: Font = .body
-    @State private var teUiFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
    @State private var sendButtonSize: CGFloat = 29
    @State private var sendButtonOpacity: CGFloat = 1
    @State private var showCustomDisappearingMessageDialogue = false
    @State private var showCustomTimePicker = false
    @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
    @State private var progressByTimeout = false
-    var maxHeight: CGFloat = 360
-    var minHeight: CGFloat = 37
    @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false

    var body: some View {
@@ -57,30 +54,16 @@ struct SendMessageView: View {
                            .frame(maxWidth: .infinity)
                    } else {
                        let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
-                        Text(composeState.message)
-                            .lineLimit(10)
-                            .font(teFont)
-                            .multilineTextAlignment(alignment)
-// put text on top (after NativeTextEditor) and set color to precisely align it on changes
-//                            .foregroundColor(.red)
-                            .foregroundColor(.clear)
-                            .padding(.horizontal, 10)
-                            .padding(.top, 8)
-                            .padding(.bottom, 6)
-                            .matchedGeometryEffect(id: "te", in: namespace)
-                            .background(GeometryReader(content: updateHeight))
-
                        NativeTextEditor(
                            text: $composeState.message,
                            disableEditing: $composeState.inProgress,
-                            height: teHeight,
-                            font: teUiFont,
+                            height: $teHeight,
                            focused: $keyboardVisible,
                            alignment: alignment,
                            onImagesAdded: onMediaAdded
                        )
                        .allowsTightening(false)
-                        .frame(height: teHeight)
+                        .fixedSize(horizontal: false, vertical: true)
                    }
                }

@@ -100,11 +83,13 @@ struct SendMessageView: View {
                    .frame(height: teHeight, alignment: .bottom)
                }
            }
-
+            .padding(.vertical, 1)
+            .overlay(
            RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                .frame(height: teHeight)
+            )
        }
+        .onChange(of: composeState.message, perform: { text in updateFont(text) })
        .onChange(of: composeState.inProgress) { inProgress in
            if inProgress {
                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
@@ -415,16 +400,12 @@ struct SendMessageView: View {
        .padding([.bottom, .trailing], 4)
    }

-    private func updateHeight(_ g: GeometryProxy) -> Color {
+    private func updateFont(_ text: String) {
        DispatchQueue.main.async {
-            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
-            (teFont, teUiFont) = isShortEmoji(composeState.message)
-                                    ? composeState.message.count < 4
-                                        ? (largeEmojiFont, largeEmojiUIFont)
-                                        : (mediumEmojiFont, mediumEmojiUIFont)
-                                    : (.body, UIFont.preferredFont(forTextStyle: .body))
+            teFont = isShortEmoji(text)
+            ? (text.count < 4 ? largeEmojiFont : mediumEmojiFont)
+            : .body
        }
-        return Color.clear
    }
 }

@@ -144,7 +144,7 @@ struct AddGroupMembersViewCommon: View {
            do {
                for contactId in selectedContacts {
                    let member = try await apiAddMember(groupInfo.groupId, contactId, selectedRole)
-                    await MainActor.run { _ = ChatModel.shared.upsertGroupMember(groupInfo, member) }
+                    await MainActor.run { _ = chatModel.upsertGroupMember(groupInfo, member) }
                }
                addedMembersCb(selectedContacts)
            } catch {
@@ -157,7 +157,7 @@ struct AddGroupMembersViewCommon: View {
    private func rolePicker() -> some View {
        Picker("New member role", selection: $selectedRole) {
            ForEach(GroupMemberRole.allCases) { role in
-                if role <= groupInfo.membership.memberRole {
+                if role <= groupInfo.membership.memberRole && role != .author {
                    Text(role.text)
                }
            }
@@ -15,8 +15,7 @@ struct GroupChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
-    @State var groupInfo: GroupInfo
-    @ObservedObject private var alertManager = AlertManager.shared
+    @Binding var groupInfo: GroupInfo
    @State private var alert: GroupChatInfoViewAlert? = nil
    @State private var groupLink: String?
    @State private var groupLinkMemberRole: GroupMemberRole = .member
@@ -35,14 +34,30 @@ struct GroupChatInfoView: View {
        case leaveGroupAlert
        case cantInviteIncognitoAlert
        case largeGroupReceiptsDisabled
+        case blockMemberAlert(mem: GroupMember)
+        case unblockMemberAlert(mem: GroupMember)
+        case removeMemberAlert(mem: GroupMember)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)

-        var id: GroupChatInfoViewAlert { get { self } }
+        var id: String {
+            switch self {
+            case .deleteGroupAlert: return "deleteGroupAlert"
+            case .clearChatAlert: return "clearChatAlert"
+            case .leaveGroupAlert: return "leaveGroupAlert"
+            case .cantInviteIncognitoAlert: return "cantInviteIncognitoAlert"
+            case .largeGroupReceiptsDisabled: return "largeGroupReceiptsDisabled"
+            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
+            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
+            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
+            case let .error(title, _): return "error \(title)"
+            }
+        }
    }

    var body: some View {
        NavigationView {
            let members = chatModel.groupMembers
-                .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved }
+                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }

            List {
@@ -57,7 +72,7 @@ struct GroupChatInfoView: View {
                        addOrEditWelcomeMessage()
                    }
                    groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                        sendReceiptsOption()
                    } else {
                        sendReceiptsOptionDisabled()
@@ -84,17 +99,17 @@ struct GroupChatInfoView: View {
                            .padding(.leading, 8)
                    }
                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let filteredMembers = s == "" ? members : members.filter { $0.chatViewName.localizedLowercase.contains(s) }
-                    memberView(groupInfo.membership, user: true)
+                    let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
+                    MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
                    ForEach(filteredMembers) { member in
                        ZStack {
                            NavigationLink {
-                                memberInfoView(member.groupMemberId)
+                                memberInfoView(member)
                            } label: {
                                EmptyView()
                            }
                            .opacity(0)
-                            memberView(member)
+                            MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
                        }
                    }
                }
@@ -126,6 +141,10 @@ struct GroupChatInfoView: View {
            case .leaveGroupAlert: return leaveGroupAlert()
            case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
            case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
+            case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
+            case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
+            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
+            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
            }
        }
        .onAppear {
@@ -174,7 +193,7 @@ struct GroupChatInfoView: View {
                    Task {
                        let groupMembers = await apiListMembers(groupInfo.groupId)
                        await MainActor.run {
-                            ChatModel.shared.groupMembers = groupMembers
+                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
                        }
                    }
                }
@@ -183,51 +202,92 @@ struct GroupChatInfoView: View {
        }
    }

-    private func memberView(_ member: GroupMember, user: Bool = false) -> some View {
-        HStack{
-            ProfileImage(imageStr: member.image)
-                .frame(width: 38, height: 38)
-                .padding(.trailing, 2)
-            // TODO server connection status
-            VStack(alignment: .leading) {
-                let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
-                (member.verified ? memberVerifiedShield + t : t)
-                    .lineLimit(1)
-                let s = Text(member.memberStatus.shortText)
-                (user ? Text ("you: ") + s : s)
-                    .lineLimit(1)
-                    .font(.caption)
-                    .foregroundColor(.secondary)
+    private struct MemberRowView: View {
+        var groupInfo: GroupInfo
+        @ObservedObject var groupMember: GMember
+        var user: Bool = false
+        @Binding var alert: GroupChatInfoViewAlert?
+
+        var body: some View {
+            let member = groupMember.wrapped
+            let v = HStack{
+                ProfileImage(imageStr: member.image)
+                    .frame(width: 38, height: 38)
+                    .padding(.trailing, 2)
+                // TODO server connection status
+                VStack(alignment: .leading) {
+                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
+                    (member.verified ? memberVerifiedShield + t : t)
+                        .lineLimit(1)
+                    let s = Text(member.memberStatus.shortText)
+                    (user ? Text ("you: ") + s : s)
+                        .lineLimit(1)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                }
+                Spacer()
+                let role = member.memberRole
+                if role == .owner || role == .admin {
+                    Text(member.memberRole.text)
+                        .foregroundColor(.secondary)
+                }
            }
-            Spacer()
-            let role = member.memberRole
-            if role == .owner || role == .admin {
-                Text(member.memberRole.text)
-                    .foregroundColor(.secondary)
+
+            if user {
+                v
+            } else if member.canBeRemoved(groupInfo: groupInfo) {
+                removeSwipe(member, blockSwipe(member, v))
+            } else {
+                blockSwipe(member, v)
+            }
+        }
+
+        private func blockSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+            v.swipeActions(edge: .leading) {
+                if member.memberSettings.showMessages {
+                    Button {
+                        alert = .blockMemberAlert(mem: member)
+                    } label: {
+                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
+                    }
+                } else {
+                    Button {
+                        alert = .unblockMemberAlert(mem: member)
+                    } label: {
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                    }
+                }
+            }
+        }
+
+        private func removeSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+            v.swipeActions(edge: .trailing) {
+                Button(role: .destructive) {
+                    alert = .removeMemberAlert(mem: member)
+                } label: {
+                    Label("Remove member", systemImage: "trash")
+                        .foregroundColor(Color.red)
+                }
            }
        }
    }

-    private var memberVerifiedShield: Text {
-        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-            .font(.caption)
-            .baselineOffset(2)
-            .kerning(-2)
-            .foregroundColor(.secondary)
-    }
-
-    @ViewBuilder private func memberInfoView(_ groupMemberId: Int64?) -> some View {
-        if let mId = groupMemberId, let member = chatModel.groupMembers.first(where: { $0.groupMemberId == mId }) {
-            GroupMemberInfoView(groupInfo: groupInfo, member: member)
-                .navigationBarHidden(false)
-        }
+    private func memberInfoView(_ groupMember: GMember) -> some View {
+        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
+            .navigationBarHidden(false)
    }

    private func groupLinkButton() -> some View {
        NavigationLink {
-            GroupLinkView(groupId: groupInfo.groupId, groupLink: $groupLink, groupLinkMemberRole: $groupLinkMemberRole)
-                .navigationBarTitle("Group link")
-                .navigationBarTitleDisplayMode(.large)
+            GroupLinkView(
+                groupId: groupInfo.groupId,
+                groupLink: $groupLink,
+                groupLinkMemberRole: $groupLinkMemberRole,
+                showTitle: false,
+                creatingGroup: false
+            )
+            .navigationBarTitle("Group link")
+            .navigationBarTitleDisplayMode(.large)
        } label: {
            if groupLink == nil {
                Label("Create group link", systemImage: "link.badge.plus")
@@ -375,6 +435,28 @@ struct GroupChatInfoView: View {
            alert = .largeGroupReceiptsDisabled
        }
    }
+
+    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
+        Alert(
+            title: Text("Remove member?"),
+            message: Text("Member will be removed from group - this cannot be undone!"),
+            primaryButton: .destructive(Text("Remove")) {
+                Task {
+                    do {
+                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
+                        await MainActor.run {
+                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                        }
+                    } catch let error {
+                        logger.error("apiRemoveMember error: \(responseError(error))")
+                        let a = getErrorAlert(error, "Error removing member")
+                        alert = .error(title: a.title, error: a.message)
+                    }
+                }
+            },
+            secondaryButton: .cancel()
+        )
+    }
 }

 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -396,6 +478,14 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
    }
 }

+private var memberVerifiedShield: Text {
+    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+        .font(.caption)
+        .baselineOffset(2)
+        .kerning(-2)
+        .foregroundColor(.secondary)
+}
+
 func cantInviteIncognitoAlert() -> Alert {
    Alert(
        title: Text("Can't invite contacts!"),
@@ -412,6 +502,9 @@ func largeGroupReceiptsDisabledAlert() -> Alert {

 struct GroupChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
-        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
+        GroupChatInfoView(
+            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
+            groupInfo: Binding.constant(GroupInfo.sampleData)
+        )
    }
 }
@@ -13,6 +13,9 @@ struct GroupLinkView: View {
    var groupId: Int64
    @Binding var groupLink: String?
    @Binding var groupLinkMemberRole: GroupMemberRole
+    var showTitle: Bool = false
+    var creatingGroup: Bool = false
+    var linkCreatedCb: (() -> Void)? = nil
    @State private var creatingLink = false
    @State private var alert: GroupLinkAlert?

@@ -29,10 +32,35 @@ struct GroupLinkView: View {
    }

    var body: some View {
+        if creatingGroup {
+            NavigationView {
+                groupLinkView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
+                    }
+            }
+        } else {
+            groupLinkView()
+        }
+    }
+
+    private func groupLinkView() -> some View {
        List {
-            Text("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.")
-                .listRowBackground(Color.clear)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            Group {
+                if showTitle {
+                    Text("Group link")
+                        .font(.largeTitle)
+                        .bold()
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+                Text("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.")
+            }
+            .listRowBackground(Color.clear)
+            .listRowSeparator(.hidden)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+
            Section {
                if let groupLink = groupLink {
                    Picker("Initial role", selection: $groupLinkMemberRole) {
@@ -41,15 +69,17 @@ struct GroupLinkView: View {
                        }
                    }
                    .frame(height: 36)
-                    QRCode(uri: groupLink)
+                    SimpleXLinkQRCode(uri: groupLink)
                    Button {
-                        showShareSheet(items: [groupLink])
+                        showShareSheet(items: [simplexChatLink(groupLink)])
                    } label: {
                        Label("Share link", systemImage: "square.and.arrow.up")
                    }

-                    Button(role: .destructive) { alert = .deleteLink } label: {
-                        Label("Delete link", systemImage: "trash")
+                    if !creatingGroup {
+                        Button(role: .destructive) { alert = .deleteLink } label: {
+                            Label("Delete link", systemImage: "trash")
+                        }
                    }
                } else {
                    Button(action: createGroupLink) {
@@ -12,38 +12,40 @@ import SimpleXChat
 struct GroupMemberInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
-    var groupInfo: GroupInfo
-    @State var member: GroupMember
+    @State var groupInfo: GroupInfo
+    @ObservedObject var groupMember: GMember
    var navigation: Bool = false
    @State private var connectionStats: ConnectionStats? = nil
    @State private var connectionCode: String? = nil
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
-    @State private var connectToMemberDialog: Bool = false
+    @State private var sheet: PlanAndConnectActionSheet?
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @State private var justOpened = true
    @State private var progressIndicator = false

    enum GroupMemberInfoViewAlert: Identifiable {
+        case blockMemberAlert(mem: GroupMember)
+        case unblockMemberAlert(mem: GroupMember)
        case removeMemberAlert(mem: GroupMember)
        case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole)
        case switchAddressAlert
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
-        case connRequestSentAlert(type: ConnReqType)
+        case planAndConnectAlert(alert: PlanAndConnectAlert)
        case error(title: LocalizedStringKey, error: LocalizedStringKey)
-        case other(alert: Alert)

        var id: String {
            switch self {
-            case .removeMemberAlert: return "removeMemberAlert"
-            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
+            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
+            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
+            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
+            case let .changeMemberRoleAlert(mem, role): return "changeMemberRoleAlert \(mem.groupMemberId) \(role.rawValue)"
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case .connRequestSentAlert: return "connRequestSentAlert"
+            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
            case let .error(title, _): return "error \(title)"
-            case let .other(alert): return "other \(alert)"
            }
        }
    }
@@ -68,6 +70,7 @@ struct GroupMemberInfoView: View {
    private func groupMemberInfoView() -> some View {
        ZStack {
            VStack {
+                let member = groupMember.wrapped
                List {
                    groupMemberInfoHeader(member)
                        .listRowBackground(Color.clear)
@@ -96,9 +99,9 @@ struct GroupMemberInfoView: View {

                    if let contactLink = member.contactLink {
                        Section {
-                            QRCode(uri: contactLink)
+                            SimpleXLinkQRCode(uri: contactLink)
                            Button {
-                                showShareSheet(items: [contactLink])
+                                showShareSheet(items: [simplexChatLink(contactLink)])
                            } label: {
                                Label("Share address", systemImage: "square.and.arrow.up")
                            }
@@ -161,9 +164,14 @@ struct GroupMemberInfoView: View {
                        }
                    }

-                    if member.canBeRemoved(groupInfo: groupInfo) {
-                        Section {
-                            removeMemberButton(member)
+                    Section {
+                        if member.memberSettings.showMessages {
+                            blockMemberButton(member)
+                        } else {
+                            unblockMemberButton(member)
+                        }
+                        if member.canBeRemoved(groupInfo: groupInfo) {
+                                removeMemberButton(member)
                        }
                    }

@@ -180,37 +188,44 @@ struct GroupMemberInfoView: View {
                        // this condition prevents re-setting picker
                        if !justOpened { return }
                    }
-                    newRole = member.memberRole
-                    do {
-                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                        member = mem
-                        connectionStats = stats
-                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
-                    }
                    justOpened = false
+                    DispatchQueue.main.async {
+                        newRole = member.memberRole
+                        do {
+                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                            _ = chatModel.upsertGroupMember(groupInfo, mem)
+                            connectionStats = stats
+                            connectionCode = code
+                        } catch let error {
+                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        }
+                    }
                }
-                .onChange(of: newRole) { _ in
+                .onChange(of: newRole) { newRole in
                    if newRole != member.memberRole {
                        alert = .changeMemberRoleAlert(mem: member, role: newRole)
                    }
                }
+                .onChange(of: member.memberRole) { role in
+                    newRole = role
+                }
            }
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
            .alert(item: $alert) { alertItem in
                switch(alertItem) {
+                case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
+                case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
                case let .removeMemberAlert(mem): return removeMemberAlert(mem)
                case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem)
                case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
                case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
-                case let .connRequestSentAlert(type): return connReqSentAlert(type)
+                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
-                case let .other(alert): return alert
                }
            }
+            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }

            if progressIndicator {
                ProgressView().scaleEffect(2)
@@ -220,25 +235,16 @@ struct GroupMemberInfoView: View {

    func connectViaAddressButton(_ contactLink: String) -> some View {
        Button {
-            connectToMemberDialog = true
+            planAndConnect(
+                contactLink,
+                showAlert: { alert = .planAndConnectAlert(alert: $0) },
+                showActionSheet: { sheet = $0 },
+                dismiss: true,
+                incognito: nil
+            )
        } label: {
            Label("Connect", systemImage: "link")
        }
-        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
-            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
-            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
-        }
-    }
-
-    func connectViaAddress(incognito: Bool, contactLink: String) {
-        Task {
-            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
-            if let connReqType = connReqType {
-                alert = .connRequestSentAlert(type: connReqType)
-            } else if let connectAlert = connectAlert {
-                alert = .other(alert: connectAlert)
-            }
-        }
    }

    func knownDirectChatButton(_ chat: Chat) -> some View {
@@ -274,7 +280,7 @@ struct GroupMemberInfoView: View {
            progressIndicator = true
            Task {
                do {
-                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, member.groupMemberId)
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
                    await MainActor.run {
                        progressIndicator = false
                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
@@ -332,20 +338,20 @@ struct GroupMemberInfoView: View {
    }

    private func verifyCodeButton(_ code: String) -> some View {
-        NavigationLink {
+        let member = groupMember.wrapped
+        return NavigationLink {
            VerifyCodeView(
                displayName: member.displayName,
                connectionCode: code,
                connectionVerified: member.verified,
                verify: { code in
+                    var member = groupMember.wrapped
                    if let r = apiVerifyGroupMember(member.groupId, member.groupMemberId, connectionCode: code) {
                        let (verified, existingCode) = r
                        let connCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                        connectionCode = existingCode
                        member.activeConn?.connectionCode = connCode
-                        if let i = chatModel.groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
-                            chatModel.groupMembers[i].activeConn?.connectionCode = connCode
-                        }
+                        _ = chatModel.upsertGroupMember(groupInfo, member)
                        return r
                    }
                    return nil
@@ -379,12 +385,29 @@ struct GroupMemberInfoView: View {
        }
    }

+    private func blockMemberButton(_ mem: GroupMember) -> some View {
+        Button(role: .destructive) {
+            alert = .blockMemberAlert(mem: mem)
+        } label: {
+            Label("Block member", systemImage: "hand.raised")
+                .foregroundColor(.red)
+        }
+    }
+
+    private func unblockMemberButton(_ mem: GroupMember) -> some View {
+        Button {
+            alert = .unblockMemberAlert(mem: mem)
+        } label: {
+            Label("Unblock member", systemImage: "hand.raised.slash")
+        }
+    }
+
    private func removeMemberButton(_ mem: GroupMember) -> some View {
        Button(role: .destructive) {
            alert = .removeMemberAlert(mem: mem)
        } label: {
            Label("Remove member", systemImage: "trash")
-                .foregroundColor(Color.red)
+                .foregroundColor(.red)
        }
    }

@@ -420,7 +443,6 @@ struct GroupMemberInfoView: View {
                    do {
                        let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
                        await MainActor.run {
-                            member = updatedMember
                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                        }
                        
@@ -441,10 +463,10 @@ struct GroupMemberInfoView: View {
    private func switchMemberAddress() {
        Task {
            do {
-                let stats = try apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
+                let stats = try apiSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
                connectionStats = stats
                await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
                    dismiss()
                }
            } catch let error {
@@ -460,10 +482,10 @@ struct GroupMemberInfoView: View {
    private func abortSwitchMemberAddress() {
        Task {
            do {
-                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
+                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
                connectionStats = stats
                await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
                }
            } catch let error {
                logger.error("abortSwitchMemberAddress apiAbortSwitchGroupMember error: \(responseError(error))")
@@ -478,7 +500,7 @@ struct GroupMemberInfoView: View {
    private func syncMemberConnection(force: Bool) {
        Task {
            do {
-                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, force)
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, groupMember.groupMemberId, force)
                connectionStats = stats
                await MainActor.run {
                    chatModel.updateGroupMemberConnectionStats(groupInfo, mem, stats)
@@ -495,11 +517,54 @@ struct GroupMemberInfoView: View {
    }
 }

+func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
+    Alert(
+        title: Text("Block member?"),
+        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
+        primaryButton: .destructive(Text("Block")) {
+            toggleShowMemberMessages(gInfo, mem, false)
+        },
+        secondaryButton: .cancel()
+    )
+}
+
+func unblockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
+    Alert(
+        title: Text("Unblock member?"),
+        message: Text("Messages from \(mem.chatViewName) will be shown!"),
+        primaryButton: .default(Text("Unblock")) {
+            toggleShowMemberMessages(gInfo, mem, true)
+        },
+        secondaryButton: .cancel()
+    )
+}
+
+func toggleShowMemberMessages(_ gInfo: GroupInfo, _ member: GroupMember, _ showMessages: Bool) {
+    var memberSettings = member.memberSettings
+    memberSettings.showMessages = showMessages
+    updateMemberSettings(gInfo, member, memberSettings)
+}
+
+func updateMemberSettings(_ gInfo: GroupInfo, _ member: GroupMember, _ memberSettings: GroupMemberSettings) {
+    Task {
+        do {
+            try await apiSetMemberSettings(gInfo.groupId, member.groupMemberId, memberSettings)
+            await MainActor.run {
+                var mem = member
+                mem.memberSettings = memberSettings
+                _ = ChatModel.shared.upsertGroupMember(gInfo, mem)
+            }
+        } catch let error {
+            logger.error("apiSetMemberSettings error \(responseError(error))")
+        }
+    }
+}
+
 struct GroupMemberInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupMemberInfoView(
            groupInfo: GroupInfo.sampleData,
-            member: GroupMember.sampleData
+            groupMember: GMember.sampleData
        )
    }
 }
@@ -27,8 +27,7 @@ struct GroupPreferencesView: View {
                featureSection(.directMessages, $preferences.directMessages.enable)
                featureSection(.reactions, $preferences.reactions.enable)
                featureSection(.voice, $preferences.voice.enable)
-//                TODO uncomment in 5.3
-//                featureSection(.files, $preferences.files.enable)
+                featureSection(.files, $preferences.files.enable)

                if groupInfo.canEdit {
                    Section {
@@ -9,6 +9,18 @@
 import SwiftUI
 import SimpleXChat

+enum GroupProfileAlert: Identifiable {
+    case saveError(err: String)
+    case invalidName(validName: String)
+
+    var id: String {
+        switch self {
+        case let .saveError(err): return "saveError \(err)"
+        case let .invalidName(validName): return "invalidName \(validName)"
+        }
+    }
+}
+
 struct GroupProfileView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
@@ -18,8 +30,7 @@ struct GroupProfileView: View {
    @State private var showImagePicker = false
    @State private var showTakePhoto = false
    @State private var chosenImage: UIImage? = nil
-    @State private var showSaveErrorAlert = false
-    @State private var saveGroupError: String? = nil
+    @State private var alert: GroupProfileAlert?
    @FocusState private var focusDisplayName

    var body: some View {
@@ -47,20 +58,29 @@ struct GroupProfileView: View {
            .frame(maxWidth: .infinity, alignment: .center)

            VStack(alignment: .leading) {
-                ZStack(alignment: .leading) {
-                    if !validDisplayName(groupProfile.displayName) {
-                        Image(systemName: "exclamationmark.circle")
-                            .foregroundColor(.red)
-                            .padding(.bottom, 10)
+                ZStack(alignment: .topLeading) {
+                    if !validNewProfileName() {
+                        Button {
+                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
+                        } label: {
+                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                        }
+                    } else {
+                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                    }
                    profileNameTextEdit("Group display name", $groupProfile.displayName)
                        .focused($focusDisplayName)
                }
-                profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
+                .padding(.bottom)
+                let fullName = groupInfo.groupProfile.fullName
+                if fullName != "" && fullName != groupProfile.displayName {
+                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
+                        .padding(.bottom)
+                }
                HStack(spacing: 20) {
                    Button("Cancel") { dismiss() }
                    Button("Save group profile") { saveProfile() }
-                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
+                        .disabled(!canUpdateProfile())
                }
            }
            .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -83,8 +103,10 @@ struct GroupProfileView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
        .onChange(of: chosenImage) { image in
@@ -99,27 +121,39 @@ struct GroupProfileView: View {
                focusDisplayName = true
            }
        }
-        .alert(isPresented: $showSaveErrorAlert) {
-            Alert(
-                title: Text("Error saving group profile"),
-                message: Text("\(saveGroupError ?? "Unexpected error")")
-            )
+        .alert(item: $alert) { a in
+            switch a {
+            case let .saveError(err):
+                return Alert(
+                    title: Text("Error saving group profile"),
+                    message: Text(err)
+                )
+            case let .invalidName(name):
+                return createInvalidNameAlert(name, $groupProfile.displayName)
+            }
        }
        .contentShape(Rectangle())
        .onTapGesture { hideKeyboard() }
    }

+    private func canUpdateProfile() -> Bool {
+        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
+    }
+
+    private func validNewProfileName() -> Bool {
+        groupProfile.displayName == groupInfo.groupProfile.displayName
+            || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
+    }
+
    func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
        TextField(label, text: name)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.bottom)
-            .padding(.leading, 28)
+            .padding(.leading, 32)
    }

    func saveProfile() {
        Task {
            do {
+                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                await MainActor.run {
                    groupInfo = gInfo
@@ -128,8 +162,7 @@ struct GroupProfileView: View {
                }
            } catch let error {
                let err = responseError(error)
-                saveGroupError = err
-                showSaveErrorAlert = true
+                alert = .saveError(err: err)
                logger.error("GroupProfile apiUpdateGroup error: \(err)")
            }
        }
@@ -17,7 +17,7 @@ struct ScanCodeView: View {

    var body: some View {
        VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
            Text("Scan security code from your contact's app.")
@@ -32,55 +32,110 @@ struct ChatListNavLink: View {
    @State private var showJoinGroupDialog = false
    @State private var showContactConnectionInfo = false
    @State private var showInvalidJSON = false
+    @State private var showDeleteContactActionSheet = false
+    @State private var showConnectContactViaAddressDialog = false
+    @State private var inProgress = false
+    @State private var progressByTimeout = false

    var body: some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            contactNavLink(contact)
-        case let .group(groupInfo):
-            groupNavLink(groupInfo)
-        case let .contactRequest(cReq):
-            contactRequestNavLink(cReq)
-        case let .contactConnection(cConn):
-            contactConnectionNavLink(cConn)
-        case let .invalidJSON(json):
-            invalidJSONPreview(json)
+        Group {
+            switch chat.chatInfo {
+            case let .direct(contact):
+                contactNavLink(contact)
+            case let .group(groupInfo):
+                groupNavLink(groupInfo)
+            case let .contactRequest(cReq):
+                contactRequestNavLink(cReq)
+            case let .contactConnection(cConn):
+                contactConnectionNavLink(cConn)
+            case let .invalidJSON(json):
+                invalidJSONPreview(json)
+            }
+        }
+        .onChange(of: inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    progressByTimeout = inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
        }
    }

    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        NavLinkPlain(
-            tag: chat.chatInfo.id,
-            selection: $chatModel.chatId,
-            label: { ChatPreviewView(chat: chat) }
-        )
-        .swipeActions(edge: .leading, allowsFullSwipe: true) {
-            markReadButton()
-            toggleFavoriteButton()
-            toggleNtfsButton(chat)
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            if !chat.chatItems.isEmpty {
-                clearChatButton()
-            }
-            Button {
-                AlertManager.shared.showAlert(
-                    contact.ready
-                    ? deleteContactAlert(chat.chatInfo)
-                    : deletePendingContactAlert(chat, contact)
+        Group {
+            if contact.activeConn == nil && contact.profile.contactLink != nil {
+                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
+                    .frame(height: rowHeights[dynamicTypeSize])
+                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                        Button {
+                            showDeleteContactActionSheet = true
+                        } label: {
+                            Label("Delete", systemImage: "trash")
+                        }
+                        .tint(.red)
+                    }
+                    .onTapGesture { showConnectContactViaAddressDialog = true }
+                    .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
+                        Button("Use current profile") { connectContactViaAddress_(contact, false) }
+                        Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
+                    }
+            } else {
+                NavLinkPlain(
+                    tag: chat.chatInfo.id,
+                    selection: $chatModel.chatId,
+                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
+                )
+                .swipeActions(edge: .leading, allowsFullSwipe: true) {
+                    markReadButton()
+                    toggleFavoriteButton()
+                    toggleNtfsButton(chat)
+                }
+                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                    if !chat.chatItems.isEmpty {
+                        clearChatButton()
+                    }
+                    Button {
+                        if contact.ready || !contact.active {
+                            showDeleteContactActionSheet = true
+                        } else {
+                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
+                        }
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                    }
+                    .tint(.red)
+                }
+                .frame(height: rowHeights[dynamicTypeSize])
+            }
+        }
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
+                        .cancel()
+                    ]
                )
-            } label: {
-                Label("Delete", systemImage: "trash")
            }
-            .tint(.red)
        }
-        .frame(height: rowHeights[dynamicTypeSize])
    }

    @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
        switch (groupInfo.membership.memberStatus) {
        case .memInvited:
-            ChatPreviewView(chat: chat)
+            ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
                .frame(height: rowHeights[dynamicTypeSize])
                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                    joinGroupButton()
@@ -91,12 +146,16 @@ struct ChatListNavLink: View {
                .onTapGesture { showJoinGroupDialog = true }
                .confirmationDialog("Group invitation", isPresented: $showJoinGroupDialog, titleVisibility: .visible) {
                    Button(chat.chatInfo.incognito ? "Join incognito" : "Join group") {
-                        joinGroup(groupInfo.groupId)
+                        inProgress = true
+                        joinGroup(groupInfo.groupId) {
+                            await MainActor.run { inProgress = false }
+                        }
                    }
                    Button("Delete invitation", role: .destructive) { Task { await deleteChat(chat) } }
                }
+                .disabled(inProgress)
        case .memAccepted:
-            ChatPreviewView(chat: chat)
+            ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
                .frame(height: rowHeights[dynamicTypeSize])
                .onTapGesture {
                    AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
@@ -113,7 +172,7 @@ struct ChatListNavLink: View {
            NavLinkPlain(
                tag: chat.chatInfo.id,
                selection: $chatModel.chatId,
-                label: { ChatPreviewView(chat: chat) },
+                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                disabled: !groupInfo.ready
            )
            .frame(height: rowHeights[dynamicTypeSize])
@@ -138,7 +197,10 @@ struct ChatListNavLink: View {

    private func joinGroupButton() -> some View {
        Button {
-            joinGroup(chat.chatInfo.apiId)
+            inProgress = true
+            joinGroup(chat.chatInfo.apiId) {
+                await MainActor.run { inProgress = false }
+            }
        } label: {
            Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
        }
@@ -269,17 +331,6 @@ struct ChatListNavLink: View {
        }
    }

-    private func deleteContactAlert(_ chatInfo: ChatInfo) -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Delete")) {
-                Task { await deleteChat(chat) }
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
    private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
        Alert(
            title: Text("Delete group?"),
@@ -381,6 +432,17 @@ struct ChatListNavLink: View {
                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
    }
+
+    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
+        Task {
+            let ok = await connectContactViaAddress(contact.contactId, incognito)
+            if ok {
+                await MainActor.run {
+                    chatModel.chatId = contact.id
+                }
+            }
+        }
+    }
 }

 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
@@ -409,7 +471,22 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
    )
 }

-func joinGroup(_ groupId: Int64) {
+func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
+    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
+    if let alert = alert {
+        AlertManager.shared.showAlert(alert)
+        return false
+    } else if let contact = contact {
+        await MainActor.run {
+            ChatModel.shared.updateContact(contact)
+            AlertManager.shared.showAlert(connReqSentAlert(.contact))
+        }
+        return true
+    }
+    return false
+}
+
+func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
    Task {
        logger.debug("joinGroup")
        do {
@@ -424,7 +501,9 @@ func joinGroup(_ groupId: Int64) {
                AlertManager.shared.showAlertMsg(title: "No group!", message: "This group no longer exists.")
                await deleteGroup()
            }
+            await onComplete()
        } catch let error {
+            await onComplete()
            let a = getErrorAlert(error, "Error joining group")
            AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
        }
@@ -15,6 +15,7 @@ struct ChatListView: View {
    @State private var searchText = ""
    @State private var showAddChat = false
    @State private var userPickerVisible = false
+    @State private var showConnectDesktop = false
    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false

    var body: some View {
@@ -29,7 +30,7 @@ struct ChatListView: View {
        ZStack(alignment: .topLeading) {
            NavStackCompat(
                isActive: Binding(
-                    get: { ChatModel.shared.chatId != nil },
+                    get: { chatModel.chatId != nil },
                    set: { _ in }
                ),
                destination: chatView
@@ -48,7 +49,14 @@ struct ChatListView: View {
                    }
                }
            }
-            UserPicker(showSettings: $showSettings, userPickerVisible: $userPickerVisible)
+            UserPicker(
+                showSettings: $showSettings,
+                showConnectDesktop: $showConnectDesktop,
+                userPickerVisible: $userPickerVisible
+            )
+        }
+        .sheet(isPresented: $showConnectDesktop) {
+            ConnectDesktopView()
        }
    }

@@ -177,13 +185,6 @@ struct ChatListView: View {
                showAddChat = true
            }

-            connectButton("or chat with the developers") {
-                DispatchQueue.main.async {
-                    UIApplication.shared.open(simplexTeamURL)
-                }
-            }
-            .padding(.top, 10)
-
            Spacer()
            Text("You have no chats")
                .foregroundColor(.secondary)
@@ -12,6 +12,7 @@ import SimpleXChat
 struct ChatPreviewView: View {
    @EnvironmentObject var chatModel: ChatModel
    @ObservedObject var chat: Chat
+    @Binding var progressByTimeout: Bool
    @Environment(\.colorScheme) var colorScheme
    var darkGreen = Color(red: 0, green: 0.5, blue: 0)

@@ -57,19 +58,26 @@ struct ChatPreviewView: View {
    }

    @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        if case let .group(groupInfo) = chat.chatInfo {
+        switch chat.chatInfo {
+        case let .direct(contact):
+            if !contact.active {
+                inactiveIcon()
+            } else {
+                EmptyView()
+            }
+        case let .group(groupInfo):
            switch (groupInfo.membership.memberStatus) {
-            case .memLeft: groupInactiveIcon()
-            case .memRemoved: groupInactiveIcon()
-            case .memGroupDeleted: groupInactiveIcon()
+            case .memLeft: inactiveIcon()
+            case .memRemoved: inactiveIcon()
+            case .memGroupDeleted: inactiveIcon()
            default: EmptyView()
            }
-        } else {
+        default:
            EmptyView()
        }
    }

-    @ViewBuilder private func groupInactiveIcon() -> some View {
+    @ViewBuilder private func inactiveIcon() -> some View {
        Image(systemName: "multiply.circle.fill")
            .foregroundColor(.secondary.opacity(0.65))
            .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -80,7 +88,6 @@ struct ChatPreviewView: View {
        switch chat.chatInfo {
        case let .direct(contact):
            previewTitle(contact.verified == true ? verifiedIcon + t : t)
-                .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
        case let .group(groupInfo):
            let v = previewTitle(t)
            switch (groupInfo.membership.memberStatus) {
@@ -105,14 +112,17 @@ struct ChatPreviewView: View {

    private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
        ZStack(alignment: .topTrailing) {
-            text
+            let t = text
                .lineLimit(2)
                .multilineTextAlignment(.leading)
                .frame(maxWidth: .infinity, alignment: .topLeading)
                .padding(.leading, 8)
                .padding(.trailing, 36)
-                .privacySensitive(!showChatPreviews && !draft)
-                .redacted(reason: .privacy)
+            if !showChatPreviews && !draft {
+                t.privacySensitive(true).redacted(reason: .privacy)
+            } else {
+                t
+            }
            let s = chat.chatStats
            if s.unreadCount > 0 || s.unreadChat {
                unreadCountText(s.unreadCount)
@@ -180,10 +190,13 @@ struct ChatPreviewView: View {
        } else {
            switch (chat.chatInfo) {
            case let .direct(contact):
-                if !contact.ready {
+                if contact.activeConn == nil && contact.profile.contactLink != nil {
+                    chatPreviewInfoText("Tap to Connect")
+                        .foregroundColor(.accentColor)
+                } else if !contact.ready && contact.activeConn != nil {
                    if contact.nextSendGrpInv {
                        chatPreviewInfoText("send direct message")
-                    } else {
+                    } else if contact.active {
                        chatPreviewInfoText("connecting…")
                    }
                }
@@ -228,16 +241,26 @@ struct ChatPreviewView: View {
    @ViewBuilder private func chatStatusImage() -> some View {
        switch chat.chatInfo {
        case let .direct(contact):
-            switch (chatModel.contactNetworkStatus(contact)) {
-            case .connected: incognitoIcon(chat.chatInfo.incognito)
-            case .error:
-                Image(systemName: "exclamationmark.circle")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 17, height: 17)
-                    .foregroundColor(.secondary)
-            default:
+            if contact.active && contact.activeConn != nil {
+                switch (chatModel.contactNetworkStatus(contact)) {
+                case .connected: incognitoIcon(chat.chatInfo.incognito)
+                case .error:
+                    Image(systemName: "exclamationmark.circle")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 17, height: 17)
+                        .foregroundColor(.secondary)
+                default:
+                    ProgressView()
+                }
+            } else {
+                incognitoIcon(chat.chatInfo.incognito)
+            }
+        case .group:
+            if progressByTimeout {
                ProgressView()
+            } else {
+                incognitoIcon(chat.chatInfo.incognito)
            }
        default:
            incognitoIcon(chat.chatInfo.incognito)
@@ -267,30 +290,30 @@ struct ChatPreviewView_Previews: PreviewProvider {
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: []
-            ))
+            ), progressByTimeout: Binding.constant(false))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
-            ))
+            ), progressByTimeout: Binding.constant(false))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
-            ))
+            ), progressByTimeout: Binding.constant(false))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.group,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, d. consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")],
                chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
        }
        .previewLayout(.fixed(width: 360, height: 78))
    }
@@ -61,7 +61,7 @@ struct ContactConnectionInfo: View {

                    if contactConnection.initiated,
                       let connReqInv = contactConnection.connReqInv {
-                        QRCode(uri: connReqInv)
+                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
                        incognitoEnabled()
                        shareLinkButton(connReqInv)
                        oneTimeLinkLearnMoreButton()
@@ -119,7 +119,7 @@ struct ContactConnectionInfo: View {
                if let conn = try await apiSetConnectionAlias(connId: contactConnection.pccConnId, localAlias: localAlias) {
                    await MainActor.run {
                        contactConnection = conn
-                        ChatModel.shared.updateContactConnection(conn)
+                        m.updateContactConnection(conn)
                        dismiss()
                    }
                }
@@ -13,6 +13,7 @@ struct UserPicker: View {
    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
    @Binding var showSettings: Bool
+    @Binding var showConnectDesktop: Bool
    @Binding var userPickerVisible: Bool
    @State var scrollViewContentSize: CGSize = .zero
    @State var disableScrolling: Bool = true
@@ -62,6 +63,13 @@ struct UserPicker: View {
                .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
                .frame(maxHeight: scrollViewContentSize.height)

+                menuButton("Use from desktop", icon: "desktopcomputer") {
+                    showConnectDesktop = true
+                    withAnimation {
+                        userPickerVisible.toggle()
+                    }
+                }
+                Divider()
                menuButton("Settings", icon: "gearshape") {
                    showSettings = true
                    withAnimation {
@@ -85,7 +93,7 @@ struct UserPicker: View {
            do {
                m.users = try listUsers()
            } catch let error {
-                logger.error("Error updating users \(responseError(error))")
+                logger.error("Error loading users \(responseError(error))")
            }
        }
    }
@@ -144,7 +152,8 @@ struct UserPicker: View {
                    .overlay(DetermineWidth())
                Spacer()
                Image(systemName: icon)
-//                    .frame(width: 24, alignment: .center)
+                    .symbolRenderingMode(.monochrome)
+                    .foregroundColor(.secondary)
            }
            .padding(.horizontal)
            .padding(.vertical, 22)
@@ -170,6 +179,7 @@ struct UserPicker_Previews: PreviewProvider {
        m.users = [UserInfo.sampleData, UserInfo.sampleData]
        return UserPicker(
            showSettings: Binding.constant(false),
+            showConnectDesktop: Binding.constant(false),
            userPickerVisible: Binding.constant(true)
        )
        .environmentObject(m)
@@ -415,7 +415,7 @@ struct DatabaseView: View {
                do {
                    try initializeChat(start: true)
                    m.chatDbChanged = false
-                    appStateGroupDefault.set(.active)
+                    AppChatState.shared.set(.active)
                } catch let error {
                    fatalError("Error starting chat \(responseError(error))")
                }
@@ -427,7 +427,7 @@ struct DatabaseView: View {
                m.chatRunning = true
                ChatReceiver.shared.start()
                chatLastStartGroupDefault.set(Date.now)
-                appStateGroupDefault.set(.active)
+                AppChatState.shared.set(.active)
            } catch let error {
                runChat = false
                alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,7 +477,7 @@ func stopChatAsync() async throws {
    try await apiStopChat()
    ChatReceiver.shared.stop()
    await MainActor.run { ChatModel.shared.chatRunning = false }
-    appStateGroupDefault.set(.stopped)
+    AppChatState.shared.set(.stopped)
 }

 func deleteChatAsync() async throws {
@@ -13,112 +13,130 @@ import SimpleXChat

 struct LibraryImagePicker: View {
    @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectItems: Bool) -> Void
-    @State var images: [UploadContent] = []
+    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
+    @State var mediaAdded = false

    var body: some View {
-        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
-            .onChange(of: images) { _ in
-                if let img = images.first {
-                    image = img.uiImage
-                }
-            }
+        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
+    }
+
+    private func addMedia(_ content: UploadContent) async {
+        if mediaAdded { return }
+        await MainActor.run {
+            mediaAdded = true
+            image = content.uiImage
+        }
    }
 }

 struct LibraryMediaListPicker: UIViewControllerRepresentable {
    typealias UIViewControllerType = PHPickerViewController
-    @Binding var media: [UploadContent]
+    var addMedia: (_ content: UploadContent) async -> Void
    var selectionLimit: Int
-    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    var finishedPreprocessing: () -> Void = {}
+    var didFinishPicking: (_ didSelectItems: Bool) async -> Void

    class Coordinator: PHPickerViewControllerDelegate {
        let parent: LibraryMediaListPicker
        let dispatchQueue = DispatchQueue(label: "chat.simplex.app.LibraryMediaListPicker")
-        var media: [UploadContent] = []
-        var mediaCount: Int = 0

        init(_ parent: LibraryMediaListPicker) {
            self.parent = parent
        }

        func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-            parent.didFinishPicking(!results.isEmpty)
-            guard !results.isEmpty else {
-                return
+            Task {
+                await parent.didFinishPicking(!results.isEmpty)
+                if results.isEmpty { return }
+                for r in results {
+                    await loadItem(r.itemProvider)
+                }
+                parent.finishedPreprocessing()
            }
+        }

-            parent.media = []
-            media = []
-            mediaCount = results.count
-            for result in results {
-                logger.log("LibraryMediaListPicker result")
-                let p = result.itemProvider
-                if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                    p.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
-                        if let url = url {
-                            let tempUrl = URL(fileURLWithPath: getTempFilesDirectory().path + "/" + generateNewFileName("video", url.pathExtension))
-                            if ((try? FileManager.default.copyItem(at: url, to: tempUrl)) != nil) {
-                                ChatModel.shared.filesToDelete.insert(tempUrl)
-                                self.loadVideo(url: tempUrl, error: error)
+        private func loadItem(_ p: NSItemProvider) async {
+            logger.debug("LibraryMediaListPicker result")
+            if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
+                if let video = await loadVideo(p) {
+                    await self.parent.addMedia(video)
+                    logger.debug("LibraryMediaListPicker: added video")
+                }
+            } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
+                if let img = await loadImageData(p) {
+                    await self.parent.addMedia(img)
+                    logger.debug("LibraryMediaListPicker: added image")
+                }
+            } else if p.canLoadObject(ofClass: UIImage.self) {
+                if let img = await loadImage(p) {
+                    await self.parent.addMedia(.simpleImage(image: img))
+                    logger.debug("LibraryMediaListPicker: added image")
+                }
+            }
+        }
+
+        private func loadImageData(_ p: NSItemProvider) async -> UploadContent? {
+            await withCheckedContinuation { cont in
+                loadFileURL(p, type: UTType.data) { url in
+                    if let url = url {
+                        let img = UploadContent.loadFromURL(url: url)
+                        cont.resume(returning: img)
+                    } else {
+                        cont.resume(returning: nil)
+                    }
+                }
+            }
+        }
+
+        private func loadImage(_ p: NSItemProvider) async -> UIImage? {
+            await withCheckedContinuation { cont in
+                p.loadObject(ofClass: UIImage.self)  { obj, err in
+                    if let err = err {
+                        logger.error("LibraryMediaListPicker result image error: \(err.localizedDescription)")
+                        cont.resume(returning: nil)
+                    } else  {
+                        cont.resume(returning: obj as? UIImage)
+                    }
+                }
+            }
+        }
+
+        private func loadVideo(_ p: NSItemProvider) async -> UploadContent? {
+            await withCheckedContinuation { cont in
+                loadFileURL(p, type: UTType.movie) { url in
+                    if let url = url  {
+                        let tempUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "rawvideo", url.pathExtension, fullPath: true))
+                        let convertedVideoUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", "mp4", fullPath: true))
+                        do {
+//                          logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
+                            try FileManager.default.copyItem(at: url, to: tempUrl)
+                        } catch let err {
+                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
+                            return cont.resume(returning: nil)
+                        }
+                        Task {
+                            let success = await makeVideoQualityLower(tempUrl, outputUrl: convertedVideoUrl)
+                            try? FileManager.default.removeItem(at: tempUrl)
+                            if success {
+                                _ = ChatModel.shared.filesToDelete.insert(convertedVideoUrl)
+                                let video = UploadContent.loadVideoFromURL(url: convertedVideoUrl)
+                                return cont.resume(returning: video)
                            }
+                            try? FileManager.default.removeItem(at: convertedVideoUrl)
+                            cont.resume(returning: nil)
                        }
                    }
-                } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                    p.loadFileRepresentation(forTypeIdentifier: UTType.data.identifier) { url, error in
-                        self.loadImage(object: url, error: error)
-                    }
-                } else if p.canLoadObject(ofClass: UIImage.self) {
-                    p.loadObject(ofClass: UIImage.self)  { image, error in
-                        DispatchQueue.main.async {
-                            self.loadImage(object: image, error: error)
-                        }
-                    }
+                }
+            }
+        }
+
+        private func loadFileURL(_ p: NSItemProvider, type: UTType, completion: @escaping (URL?) -> Void) {
+            p.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, err in
+                if let err = err {
+                    logger.error("LibraryMediaListPicker loadFileURL error: \(err.localizedDescription)")
+                    completion(nil)
                } else {
-                    dispatchQueue.sync { self.mediaCount -= 1}
-                }
-            }
-            DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
-                self.dispatchQueue.sync {
-                    if self.parent.media.count == 0 {
-                        logger.log("LibraryMediaListPicker: added \(self.media.count) images out of \(results.count)")
-                        self.parent.media = self.media
-                    }
-                }
-            }
-        }
-
-        func loadImage(object: Any?, error: Error? = nil) {
-            if let error = error {
-                logger.error("LibraryMediaListPicker: couldn't load image with error: \(error.localizedDescription)")
-            } else if let image = object as? UIImage {
-                media.append(.simpleImage(image: image))
-                logger.log("LibraryMediaListPicker: added image")
-            } else if let url = object as? URL, let image = UploadContent.loadFromURL(url: url) {
-                media.append(image)
-            }
-            dispatchQueue.sync {
-                self.mediaCount -= 1
-                if self.mediaCount == 0 && self.parent.media.count == 0 {
-                    logger.log("LibraryMediaListPicker: added all media")
-                    self.parent.media = self.media
-                    self.media = []
-                }
-            }
-        }
-
-        func loadVideo(url: URL?, error: Error? = nil) {
-            if let error = error {
-                logger.error("LibraryMediaListPicker: couldn't load video with error: \(error.localizedDescription)")
-            } else if let url = url as URL?, let video = UploadContent.loadVideoFromURL(url: url) {
-                media.append(video)
-            }
-            dispatchQueue.sync {
-                self.mediaCount -= 1
-                if self.mediaCount == 0 && self.parent.media.count == 0 {
-                    logger.log("LibraryMediaListPicker: added all media")
-                    self.parent.media = self.media
-                    self.media = []
+                    completion(url)
                }
            }
        }
@@ -6,6 +6,7 @@
 import Foundation
 import SwiftUI
 import AVKit
+import Combine

 struct VideoPlayerView: UIViewRepresentable {

@@ -37,6 +38,14 @@ struct VideoPlayerView: UIViewRepresentable {
            player.seek(to: CMTime.zero)
            player.play()
        }
+        var played = false
+        context.coordinator.publisher = player.publisher(for: \.timeControlStatus).sink { status in
+            if played || status == .playing {
+                AppDelegate.keepScreenOn(status == .playing)
+                AudioPlayer.changeAudioSession(status == .playing)
+            }
+            played = status == .playing
+        }
        return controller.view
    }

@@ -50,12 +59,13 @@ struct VideoPlayerView: UIViewRepresentable {
    class Coordinator: NSObject {
        var controller: AVPlayerViewController?
        var timeObserver: Any? = nil
+        var publisher: AnyCancellable? = nil

        deinit {
-            print("deinit coordinator of VideoPlayer")
            if let timeObserver = timeObserver {
                NotificationCenter.default.removeObserver(timeObserver)
            }
+            publisher?.cancel()
        }
    }
 }
@@ -0,0 +1,26 @@
+//
+//  VideoUtils.swift
+//  SimpleX (iOS)
+//
+//  Created by Avently on 25.12.2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import AVFoundation
+import Foundation
+import SimpleXChat
+
+func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
+    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
+    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
+        s.outputURL = outputUrl
+        s.outputFileType = .mp4
+        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
+        await s.export()
+        if let err = s.error {
+            logger.error("Failed to export video with error: \(err)")
+        }
+        return s.status == .completed
+    }
+    return false
+}
@@ -52,7 +52,7 @@ struct LocalAuthView: View {
                resetChatCtrl()
                try initializeChat(start: true)
                m.chatDbChanged = false
-                appStateGroupDefault.set(.active)
+                AppChatState.shared.set(.active)
                if m.currentUser != nil { return }
                var profile: Profile? = nil
                if let displayName = displayName, displayName != "" {
@@ -21,7 +21,7 @@ struct AddContactView: View {
            List {
                Section {
                    if connReqInvitation != "" {
-                        QRCode(uri: connReqInvitation)
+                        SimpleXLinkQRCode(uri: connReqInvitation)
                    } else {
                        ProgressView()
                            .progressViewStyle(.circular)
@@ -48,7 +48,7 @@ struct AddContactView: View {
                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
                        await MainActor.run {
                            contactConnection = conn
-                            ChatModel.shared.updateContactConnection(conn)
+                            chatModel.updateContactConnection(conn)
                        }
                    }
                } catch {
@@ -99,7 +99,7 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {

 func shareLinkButton(_ connReqInvitation: String) -> some View {
    Button {
-        showShareSheet(items: [connReqInvitation])
+        showShareSheet(items: [simplexChatLink(connReqInvitation)])
    } label: {
        settingsRow("square.and.arrow.up") {
            Text("Share 1-time link")
@@ -12,27 +12,45 @@ import SimpleXChat
 struct AddGroupView: View {
    @EnvironmentObject var m: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
    @State private var chat: Chat?
    @State private var groupInfo: GroupInfo?
    @State private var profile = GroupProfile(displayName: "", fullName: "")
    @FocusState private var focusDisplayName
-    @FocusState private var focusFullName
    @State private var showChooseSource = false
    @State private var showImagePicker = false
    @State private var showTakePhoto = false
    @State private var chosenImage: UIImage? = nil
+    @State private var showInvalidNameAlert = false
+    @State private var groupLink: String?
+    @State private var groupLinkMemberRole: GroupMemberRole = .member

    var body: some View {
        if let chat = chat, let groupInfo = groupInfo {
-            AddGroupMembersViewCommon(
-                chat: chat,
-                groupInfo: groupInfo,
-                creatingGroup: true,
-                showFooterCounter: false
-            ) { _ in
-                dismiss()
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    m.chatId = groupInfo.id
+            if !groupInfo.membership.memberIncognito {
+                AddGroupMembersViewCommon(
+                    chat: chat,
+                    groupInfo: groupInfo,
+                    creatingGroup: true,
+                    showFooterCounter: false
+                ) { _ in
+                    dismiss()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        m.chatId = groupInfo.id
+                    }
+                }
+            } else {
+                GroupLinkView(
+                    groupId: groupInfo.groupId,
+                    groupLink: $groupLink,
+                    groupLinkMemberRole: $groupLinkMemberRole,
+                    showTitle: true,
+                    creatingGroup: true
+                ) {
+                    dismiss()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        m.chatId = groupInfo.id
+                    }
                }
            }
        } else {
@@ -41,79 +59,62 @@ struct AddGroupView: View {
    }

    func createGroupView() -> some View {
-        VStack(alignment: .leading) {
-            Text("Create secret group")
-                .font(.largeTitle)
-                .padding(.vertical, 4)
-            Text("The group is fully decentralized – it is visible only to the members.")
-                .padding(.bottom, 4)
+        List {
+            Group {
+                Text("Create secret group")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.bottom, 24)
+                    .onTapGesture(perform: hideKeyboard)

-            HStack {
-                Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                Spacer().frame(width: 8)
-                Text("Your chat profile will be sent to group members").font(.footnote)
-            }
-            .padding(.bottom)
-
-            ZStack(alignment: .center) {
-                ZStack(alignment: .topTrailing) {
-                    profileImageView(profile.image)
-                    if profile.image != nil {
-                        Button {
-                            profile.image = nil
-                        } label: {
-                            Image(systemName: "multiply")
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 12)
+                ZStack(alignment: .center) {
+                    ZStack(alignment: .topTrailing) {
+                        ProfileImage(imageStr: profile.image, color: Color(uiColor: .secondarySystemGroupedBackground))
+                            .aspectRatio(1, contentMode: .fit)
+                            .frame(maxWidth: 128, maxHeight: 128)
+                        if profile.image != nil {
+                            Button {
+                                profile.image = nil
+                            } label: {
+                                Image(systemName: "multiply")
+                                    .resizable()
+                                    .aspectRatio(contentMode: .fit)
+                                    .frame(width: 12)
+                            }
                        }
                    }
+
+                    editImageButton { showChooseSource = true }
+                        .buttonStyle(BorderlessButtonStyle()) // otherwise whole "list row" is clickable
                }
-
-                editImageButton { showChooseSource = true }
+                .frame(maxWidth: .infinity, alignment: .center)
            }
-            .frame(maxWidth: .infinity, alignment: .center)
-            .padding(.bottom, 4)
+            .listRowBackground(Color.clear)
+            .listRowSeparator(.hidden)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

-            ZStack(alignment: .topLeading) {
-                if !validDisplayName(profile.displayName) {
-                    Image(systemName: "exclamationmark.circle")
-                        .foregroundColor(.red)
-                        .padding(.top, 4)
+            Section {
+                groupNameTextField()
+                Button(action: createGroup) {
+                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
                }
-                textField("Group display name", text: $profile.displayName)
-                    .focused($focusDisplayName)
-                    .submitLabel(.next)
-                    .onSubmit {
-                        if canCreateProfile() { focusFullName = true }
-                        else { focusDisplayName = true }
-                    }
-            }
-            textField("Group full name (optional)", text: $profile.fullName)
-                .focused($focusFullName)
-                .submitLabel(.go)
-                .onSubmit {
-                    if canCreateProfile() { createGroup() }
-                    else { focusFullName = true }
+                .disabled(!canCreateProfile())
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                VStack(alignment: .leading, spacing: 4) {
+                    sharedGroupProfileInfo(incognitoDefault)
+                    Text("Fully decentralized – visible only to members.")
                }
-
-            Spacer()
-
-            Button {
-                createGroup()
-            } label: {
-                Text("Create")
-                Image(systemName: "greaterthan")
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .onTapGesture(perform: hideKeyboard)
            }
-            .disabled(!canCreateProfile())
-            .frame(maxWidth: .infinity, alignment: .trailing)
        }
        .onAppear() {
            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                focusDisplayName = true
            }
        }
-        .padding()
        .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
            Button("Take picture") {
                showTakePhoto = true
@@ -129,10 +130,15 @@ struct AddGroupView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
+        .alert(isPresented: $showInvalidNameAlert) {
+            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
+        }
        .onChange(of: chosenImage) { image in
            if let image = image {
                profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
@@ -140,26 +146,52 @@ struct AddGroupView: View {
                profile.image = nil
            }
        }
-        .contentShape(Rectangle())
-        .onTapGesture { hideKeyboard() }
+    }
+
+    func groupNameTextField() -> some View {
+        ZStack(alignment: .leading) {
+            let name = profile.displayName.trimmingCharacters(in: .whitespaces)
+            if name != mkValidName(name) {
+                Button {
+                    showInvalidNameAlert = true
+                } label: {
+                    Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                }
+            } else {
+                Image(systemName: "pencil").foregroundColor(.secondary)
+            }
+            textField("Enter group name…", text: $profile.displayName)
+                .focused($focusDisplayName)
+                .submitLabel(.continue)
+                .onSubmit {
+                    if canCreateProfile() { createGroup() }
+                }
+        }
    }

    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
        TextField(placeholder, text: text)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.leading, 28)
-            .padding(.bottom)
+            .padding(.leading, 36)
+    }
+
+    func sharedGroupProfileInfo(_ incognito: Bool) -> Text {
+        let name = ChatModel.shared.currentUser?.displayName ?? ""
+        return Text(
+            incognito
+            ? "A new random profile will be shared."
+            : "Your profile **\(name)** will be shared."
+        )
    }

    func createGroup() {
        hideKeyboard()
        do {
-            let gInfo = try apiNewGroup(profile)
+            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
+            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
            Task {
                let groupMembers = await apiListMembers(gInfo.groupId)
                await MainActor.run {
-                    ChatModel.shared.groupMembers = groupMembers
+                    m.groupMembers = groupMembers.map { GMember.init($0) }
                }
            }
            let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
@@ -180,7 +212,8 @@ struct AddGroupView: View {
    }

    func canCreateProfile() -> Bool {
-        profile.displayName != "" && validDisplayName(profile.displayName)
+        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
+        return name != "" && validDisplayName(name)
    }
 }

@@ -73,6 +73,7 @@ struct CreateLinkView: View {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
                await MainActor.run {
+                    m.updateContactConnection(pcc)
                    connReqInvitation = connReq
                    contactConnection = pcc
                    m.connReqInv = connReq
@@ -52,71 +52,410 @@ struct NewChatButton: View {
    func addContactAction() {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
+                    ChatModel.shared.updateContactConnection(pcc)
+                }
                actionSheet = .createLink(link: connReq, connection: pcc)
            }
        }
    }
 }

-enum ConnReqType: Equatable {
-    case contact
-    case invitation
+enum PlanAndConnectAlert: Identifiable {
+    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case invitationLinkConnecting(connectionLink: String)
+    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
+
+    var id: String {
+        switch self {
+        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
+        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
+        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
+        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
+        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
+        }
+    }
 }

-func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
-    Task {
-        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            DispatchQueue.main.async {
-                dismiss?()
-                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
-            }
+func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
+    switch alert {
+    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own one-time link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case .invitationLinkConnecting:
+        return Alert(
+            title: Text("Already connecting!"),
+            message: Text("You are already connecting via this one-time link!")
+        )
+    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own SimpleX address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat connection request?"),
+            message: Text("You have already requested connection via this address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Join group?"),
+            message: Text("You will connect to all group members."),
+            primaryButton: .default(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat join request?"),
+            message: Text("You are already joining the group via this link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConnecting(_, groupInfo):
+        if let groupInfo = groupInfo {
+            return Alert(
+                title: Text("Group already exists!"),
+                message: Text("You are already joining the group \(groupInfo.displayName).")
+            )
        } else {
-            DispatchQueue.main.async {
-                dismiss?()
+            return Alert(
+                title: Text("Already joining the group!"),
+                message: Text("You are already joining the group via this link.")
+            )
+        }
+    }
+}
+
+enum PlanAndConnectActionSheet: Identifiable {
+    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
+    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
+
+    var id: String {
+        switch self {
+        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
+        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
+        case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
+        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
+        }
+    }
+}
+
+func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool) -> ActionSheet {
+    switch sheet {
+    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                .cancel()
+            ]
+        )
+    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                .cancel()
+            ]
+        )
+    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
+        return ActionSheet(
+            title: Text("Connect with \(contact.chatViewName)"),
+            buttons: [
+                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true) },
+                .cancel()
+            ]
+        )
+    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
+        if let incognito = incognito {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) },
+                    .cancel()
+                ]
+            )
+        } else {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                    .cancel()
+                ]
+            )
+        }
+    }
+}
+
+func planAndConnect(
+    _ connectionLink: String,
+    showAlert: @escaping (PlanAndConnectAlert) -> Void,
+    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
+    dismiss: Bool,
+    incognito: Bool?
+) {
+    Task {
+        do {
+            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
+            switch connectionPlan {
+            case let .invitationLink(ilp):
+                switch ilp {
+                case .ok:
+                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
+                    }
+                case let .connecting(contact_):
+                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
+                    if let contact = contact_ {
+                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                    } else {
+                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
+                    }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                }
+            case let .contactAddress(cap):
+                switch cap {
+                case .ok:
+                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
+                    }
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
+                    }
+                case let .connectingProhibit(contact):
+                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                case let .contactViaAddress(contact):
+                    logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
+                    }
+                }
+            case let .groupLink(glp):
+                switch glp {
+                case .ok:
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
+                    }
+                case let .ownLink(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
+                    }
+                case let .connectingProhibit(groupInfo_):
+                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                case let .known(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
+                }
+            }
+        } catch {
+            logger.debug("planAndConnect, plan error")
+            if let incognito = incognito {
+                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito)
+            } else {
+                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
            }
        }
    }
 }

-struct CReqClientData: Decodable {
-    var type: String
-    var groupLinkId: String?
-}
-
-func parseLinkQueryData(_ connectionLink: String) -> CReqClientData? {
-    if let hashIndex = connectionLink.firstIndex(of: "#"),
-       let urlQuery = URL(string: String(connectionLink[connectionLink.index(after: hashIndex)...])),
-       let components = URLComponents(url: urlQuery, resolvingAgainstBaseURL: false),
-       let data = components.queryItems?.first(where: { $0.name == "data" })?.value,
-       let d = data.data(using: .utf8),
-       let crData = try? getJSONDecoder().decode(CReqClientData.self, from: d) {
-        return crData
-    } else {
-        return nil
+private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool) {
+    Task {
+        if dismiss {
+            DispatchQueue.main.async {
+                dismissAllSheets(animated: true)
+            }
+        }
+        _ = await connectContactViaAddress(contact.contactId, incognito)
    }
 }

-func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
-    return crData.type == "group" && crData.groupLinkId != nil
+private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
+    Task {
+        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
+            await MainActor.run {
+                ChatModel.shared.updateContactConnection(pcc)
+            }
+            let crt: ConnReqType
+            if let plan = connectionPlan {
+                crt = planToConnReqType(plan)
+            } else {
+                crt = connReqType
+            }
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        AlertManager.shared.showAlert(connReqSentAlert(crt))
+                    }
+                } else {
+                    AlertManager.shared.showAlert(connReqSentAlert(crt))
+                }
+            }
+        } else {
+            if dismiss {
+                DispatchQueue.main.async {
+                    dismissAllSheets(animated: true)
+                }
+            }
+        }
+    }
 }

-func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
-    return Alert(
-        title: Text("Connect via group link?"),
-        message: Text("You will join a group this link refers to and connect to its group members."),
-        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
-            connectViaLink(connectionLink, incognito: incognito)
-        },
-        secondaryButton: .cancel()
+func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let c = m.getContactChat(contact.contactId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = c.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = c.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
+}
+
+func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let g = m.getGroupChat(groupInfo.groupId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = g.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = g.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
+}
+
+func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
+    mkAlert(
+        title: "Contact already exists",
+        message: "You are already connecting to \(contact.displayName)."
    )
 }

+func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
+    mkAlert(
+        title: "Group already exists",
+        message: "You are already in group \(groupInfo.displayName)."
+    )
+}
+
+enum ConnReqType: Equatable {
+    case invitation
+    case contact
+    case groupLink
+
+    var connReqSentText: LocalizedStringKey {
+        switch self {
+        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
+        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
+        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
+        }
+    }
+}
+
+private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
+    switch connectionPlan {
+    case .invitationLink: return .invitation
+    case .contactAddress: return .contact
+    case .groupLink: return .groupLink
+    }
+}
+
 func connReqSentAlert(_ type: ConnReqType) -> Alert {
    return mkAlert(
        title: "Connection request sent!",
-        message: type == .contact
-            ? "You will be connected when your connection request is accepted, please wait or check later!"
-            : "You will be connected when your contact's device is online, please wait or check later!"
+        message: type.connReqSentText
    )
 }

@@ -14,6 +14,8 @@ struct PasteToConnectView: View {
    @State private var connectionLink: String = ""
    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
    @FocusState private var linkEditorFocused: Bool
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?

    var body: some View {
        List {
@@ -52,11 +54,15 @@ struct PasteToConnectView: View {
                
                IncognitoToggle(incognitoEnabled: $incognitoDefault)
            } footer: {
-                sharedProfileInfo(incognitoDefault)
-                + Text(String("\n\n"))
-                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+                VStack(alignment: .leading, spacing: 4) {
+                    sharedProfileInfo(incognitoDefault)
+                    Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
            }
        }
+        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
+        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
    }

    private func linkEditor() -> some View {
@@ -83,13 +89,13 @@ struct PasteToConnectView: View {

    private func connect() {
        let link = connectionLink.trimmingCharacters(in: .whitespaces)
-        if let crData = parseLinkQueryData(link),
-           checkCRDataGroup(crData) {
-            dismiss()
-            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
-        } else {
-            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
-        }
+        planAndConnect(
+            link,
+            showAlert: { alert = $0 },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: incognitoDefault
+        )
    }
 }

@@ -11,29 +11,37 @@ import CoreImage.CIFilterBuiltins

 struct MutableQRCode: View {
    @Binding var uri: String
-    @State private var image: UIImage?
+    var withLogo: Bool = true
+    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)

    var body: some View {
-        ZStack {
-            if let image = image {
-                qrCodeImage(image)
-            }
-        }
-        .onAppear {
-            image = generateImage(uri)
-        }
-        .onChange(of: uri) { _ in
-            image = generateImage(uri)
-        }
+        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
+            .id("simplex-qrcode-view-for-\(uri)")
    }
 }

+struct SimpleXLinkQRCode: View {
+    let uri: String
+    var withLogo: Bool = true
+    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+
+    var body: some View {
+        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor)
+    }
+}
+
+func simplexChatLink(_ uri: String) -> String {
+    uri.starts(with: "simplex:/")
+    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
+    : uri
+}
+
 struct QRCode: View {
    let uri: String
    var withLogo: Bool = true
    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
    @State private var image: UIImage? = nil
-    @State private var makeScreenshotBinding: () -> Void = {}
+    @State private var makeScreenshotFunc: () -> Void = {}

    var body: some View {
        ZStack {
@@ -54,18 +62,19 @@ struct QRCode: View {
                    }
                }
                .onAppear {
-                    makeScreenshotBinding = {
+                    makeScreenshotFunc = {
                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                    }
                }
                .frame(width: geo.size.width, height: geo.size.height)
            }
        }
-        .onTapGesture(perform: makeScreenshotBinding)
+        .onTapGesture(perform: makeScreenshotFunc)
        .onAppear {
-            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
+            image = image ?? generateImage(uri, tintColor: tintColor)
        }
-
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
    }
 }

@@ -77,13 +86,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
        .textSelection(.enabled)
 }

-private func generateImage(_ uri: String) -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
    let context = CIContext()
    let filter = CIFilter.qrCodeGenerator()
    filter.message = Data(uri.utf8)
    if let outputImage = filter.outputImage,
       let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage)
+        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
    }
    return nil
 }
@@ -13,6 +13,8 @@ import CodeScanner
 struct ScanToConnectView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?

    var body: some View {
        ScrollView {
@@ -23,7 +25,7 @@ struct ScanToConnectView: View {
                    .fixedSize(horizontal: false, vertical: true)
                    .padding(.vertical)

-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
                    .aspectRatio(1, contentMode: .fit)
                    .cornerRadius(12)

@@ -36,11 +38,11 @@ struct ScanToConnectView: View {
                    )
                    .padding(.top)

-                Group {
+                VStack(alignment: .leading, spacing: 4) {
                    sharedProfileInfo(incognitoDefault)
-                    + Text(String("\n\n"))
-                    + Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
+                    Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
                }
+                .frame(maxWidth: .infinity, alignment: .leading)
                .font(.footnote)
                .foregroundColor(.secondary)
                .padding(.horizontal)
@@ -49,18 +51,20 @@ struct ScanToConnectView: View {
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
        }
        .background(Color(.systemGroupedBackground))
+        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
+        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
    }

    func processQRCode(_ resp: Result<ScanResult, ScanError>) {
        switch resp {
        case let .success(r):
-            if let crData = parseLinkQueryData(r.string),
-               checkCRDataGroup(crData) {
-                dismiss()
-                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
-            } else {
-                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
-            }
+            planAndConnect(
+                r.string,
+                showAlert: { alert = $0 },
+                showActionSheet: { sheet = $0 },
+                dismiss: true,
+                incognito: incognitoDefault
+            )
        case let .failure(e):
            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
            dismiss()
@@ -9,175 +9,244 @@
 import SwiftUI
 import SimpleXChat

+enum UserProfileAlert: Identifiable {
+    case duplicateUserError
+    case createUserError(error: LocalizedStringKey)
+    case invalidNameError(validName: String)
+
+    var id: String {
+        switch self {
+        case .duplicateUserError: return "duplicateUserError"
+        case .createUserError: return "createUserError"
+        case let .invalidNameError(validName): return "invalidNameError \(validName)"
+        }
+    }
+}
+
 struct CreateProfile: View {
+    @Environment(\.dismiss) var dismiss
+    @State private var displayName: String = ""
+    @FocusState private var focusDisplayName
+    @State private var alert: UserProfileAlert?
+
+    var body: some View {
+        List {
+            Section {
+                TextField("Enter your name…", text: $displayName)
+                    .focused($focusDisplayName)
+                Button {
+                    createProfile(displayName, showAlert: { alert = $0 }, dismiss: dismiss)
+                } label: {
+                    Label("Create profile", systemImage: "checkmark")
+                }
+                .disabled(!canCreateProfile(displayName))
+            } header: {
+                HStack {
+                    Text("Your profile")
+                    let name = displayName.trimmingCharacters(in: .whitespaces)
+                    let validName = mkValidName(name)
+                    if name != validName {
+                        Spacer()
+                        Image(systemName: "exclamationmark.circle")
+                            .foregroundColor(.red)
+                            .onTapGesture {
+                                alert = .invalidNameError(validName: validName)
+                            }
+                    }
+                }
+                .frame(height: 20)
+            } footer: {
+                VStack(alignment: .leading, spacing: 8) {
+                    Text("Your profile, contacts and delivered messages are stored on your device.")
+                    Text("The profile is only shared with your contacts.")
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+            }
+        }
+        .navigationTitle("Create your profile")
+        .alert(item: $alert) { a in userProfileAlert(a, $displayName) }
+        .onAppear() {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                focusDisplayName = true
+            }
+        }
+        .keyboardPadding()
+    }
+}
+
+struct CreateFirstProfile: View {
    @EnvironmentObject var m: ChatModel
    @Environment(\.dismiss) var dismiss
    @State private var displayName: String = ""
-    @State private var fullName: String = ""
    @FocusState private var focusDisplayName
-    @FocusState private var focusFullName
-    @State private var alert: CreateProfileAlert?
-
-    private enum CreateProfileAlert: Identifiable {
-        case duplicateUserError
-        case createUserError(error: LocalizedStringKey)
-
-        var id: String {
-            switch self {
-            case .duplicateUserError: return "duplicateUserError"
-            case .createUserError: return "createUserError"
-            }
-        }
-    }

    var body: some View {
        VStack(alignment: .leading) {
-            Text("Create your profile")
-                .font(.largeTitle)
-                .bold()
-                .padding(.bottom, 4)
-                .frame(maxWidth: .infinity)
-            Text("Your profile, contacts and delivered messages are stored on your device.")
-                .padding(.bottom, 4)
-            Text("The profile is only shared with your contacts.")
-                .padding(.bottom)
+            Group {
+                Text("Create your profile")
+                    .font(.largeTitle)
+                    .bold()
+                Text("Your profile, contacts and delivered messages are stored on your device.")
+                    .foregroundColor(.secondary)
+                Text("The profile is only shared with your contacts.")
+                    .foregroundColor(.secondary)
+                    .padding(.bottom)
+            }
+            .padding(.bottom)
+
            ZStack(alignment: .topLeading) {
-                if !validDisplayName(displayName) {
-                    Image(systemName: "exclamationmark.circle")
-                        .foregroundColor(.red)
-                        .padding(.top, 4)
+                let name = displayName.trimmingCharacters(in: .whitespaces)
+                let validName = mkValidName(name)
+                if name != validName {
+                    Button {
+                        showAlert(.invalidNameError(validName: validName))
+                    } label: {
+                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                    }
+                } else {
+                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                }
-                textField("Display name", text: $displayName)
+                TextField("Enter your name…", text: $displayName)
                    .focused($focusDisplayName)
-                    .submitLabel(.next)
-                    .onSubmit {
-                        if canCreateProfile() { focusFullName = true }
-                        else { focusDisplayName = true }
-                    }
+                    .padding(.leading, 32)
            }
-            textField("Full name (optional)", text: $fullName)
-                .focused($focusFullName)
-                .submitLabel(.go)
-                .onSubmit {
-                    if canCreateProfile() { createProfile() }
-                    else { focusFullName = true }
-                }
-
+            .padding(.bottom)
            Spacer()
-
-            HStack {
-                if m.users.isEmpty {
-                    Button {
-                        hideKeyboard()
-                        withAnimation {
-                            m.onboardingStage = .step1_SimpleXInfo
-                        }
-                    } label: {
-                        HStack {
-                            Image(systemName: "lessthan")
-                            Text("About SimpleX")
-                        }
-                    }
-                }
-
-                Spacer()
-
-                HStack {
-                    Button {
-                        createProfile()
-                    } label: {
-                        Text("Create")
-                        Image(systemName: "greaterthan")
-                    }
-                    .disabled(!canCreateProfile())
-                }
-            }
+            onboardingButtons()
        }
        .onAppear() {
            focusDisplayName = true
            setLastVersionDefault()
        }
-        .alert(item: $alert) { a in
-            switch a {
-            case .duplicateUserError: return duplicateUserAlert
-            case let .createUserError(err): return creatUserErrorAlert(err)
-            }
-        }
        .padding()
+        .frame(maxWidth: .infinity, alignment: .leading)
        .keyboardPadding()
    }

-    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
-        TextField(placeholder, text: text)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.leading, 28)
-            .padding(.bottom)
-    }
-
-    func createProfile() {
-        hideKeyboard()
-        let profile = Profile(
-            displayName: displayName,
-            fullName: fullName
-        )
-        do {
-            m.currentUser = try apiCreateActiveUser(profile)
-            if m.users.isEmpty {
-                try startChat()
+    func onboardingButtons() -> some View {
+        HStack {
+            Button {
+                hideKeyboard()
                withAnimation {
-                    onboardingStageDefault.set(.step3_CreateSimpleXAddress)
-                    m.onboardingStage = .step3_CreateSimpleXAddress
+                    m.onboardingStage = .step1_SimpleXInfo
                }
-            } else {
-                onboardingStageDefault.set(.onboardingComplete)
-                m.onboardingStage = .onboardingComplete
-                dismiss()
-                m.users = try listUsers()
-                try getUserChatData()
-            }
-        } catch let error {
-            switch error as? ChatResponse {
-            case .chatCmdError(_, .errorStore(.duplicateName)),
-                 .chatCmdError(_, .error(.userExists)):
-                if m.currentUser == nil {
-                    AlertManager.shared.showAlert(duplicateUserAlert)
-                } else {
-                    alert = .duplicateUserError
-                }
-            default:
-                let err: LocalizedStringKey = "Error: \(responseError(error))"
-                if m.currentUser == nil {
-                    AlertManager.shared.showAlert(creatUserErrorAlert(err))
-                } else {
-                    alert = .createUserError(error: err)
+            } label: {
+                HStack {
+                    Image(systemName: "lessthan")
+                    Text("About SimpleX")
                }
            }
-            logger.error("Failed to create user or start chat: \(responseError(error))")
+
+            Spacer()
+
+            Button {
+                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
+            } label: {
+                HStack {
+                    Text("Create")
+                    Image(systemName: "greaterthan")
+                }
+            }
+            .disabled(!canCreateProfile(displayName))
        }
    }

-    func canCreateProfile() -> Bool {
-        displayName != "" && validDisplayName(displayName)
-    }
-
-    private var duplicateUserAlert: Alert {
-        Alert(
-            title: Text("Duplicate display name!"),
-            message: Text("You already have a chat profile with the same display name. Please choose another name.")
-        )
-    }
-
-    private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
-        Alert(
-            title: Text("Error creating profile!"),
-            message: Text(err)
-        )
+    private func showAlert(_ alert: UserProfileAlert) {
+        AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
    }
 }

+private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
+    hideKeyboard()
+    let profile = Profile(
+        displayName: displayName.trimmingCharacters(in: .whitespaces),
+        fullName: ""
+    )
+    let m = ChatModel.shared
+    do {
+        m.currentUser = try apiCreateActiveUser(profile)
+        if m.users.isEmpty {
+            try startChat()
+            withAnimation {
+                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
+                m.onboardingStage = .step3_CreateSimpleXAddress
+            }
+        } else {
+            onboardingStageDefault.set(.onboardingComplete)
+            m.onboardingStage = .onboardingComplete
+            dismiss()
+            m.users = try listUsers()
+            try getUserChatData()
+        }
+    } catch let error {
+        switch error as? ChatResponse {
+        case .chatCmdError(_, .errorStore(.duplicateName)),
+             .chatCmdError(_, .error(.userExists)):
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(duplicateUserAlert)
+            } else {
+                showAlert(.duplicateUserError)
+            }
+        default:
+            let err: LocalizedStringKey = "Error: \(responseError(error))"
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(creatUserErrorAlert(err))
+            } else {
+                showAlert(.createUserError(error: err))
+            }
+        }
+        logger.error("Failed to create user or start chat: \(responseError(error))")
+    }
+}
+
+private func canCreateProfile(_ displayName: String) -> Bool {
+    let name = displayName.trimmingCharacters(in: .whitespaces)
+    return name != "" && mkValidName(name) == name
+}
+
+func userProfileAlert(_ alert: UserProfileAlert, _ displayName: Binding<String>) -> Alert {
+    switch alert {
+    case .duplicateUserError: return duplicateUserAlert
+    case let .createUserError(err): return creatUserErrorAlert(err)
+    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
+    }
+}
+
+private var duplicateUserAlert: Alert {
+    Alert(
+        title: Text("Duplicate display name!"),
+        message: Text("You already have a chat profile with the same display name. Please choose another name.")
+    )
+}
+
+private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
+    Alert(
+        title: Text("Error creating profile!"),
+        message: Text(err)
+    )
+}
+
+func createInvalidNameAlert(_ name: String, _ displayName: Binding<String>) -> Alert {
+    name == ""
+    ? Alert(title: Text("Invalid name!"))
+    : Alert(
+        title: Text("Invalid name!"),
+        message: Text("Correct name to \(name)?"),
+        primaryButton: .default(
+            Text("Ok"),
+            action: { displayName.wrappedValue = name }
+        ),
+        secondaryButton: .cancel()
+    )
+}
+
 func validDisplayName(_ name: String) -> Bool {
-    name.firstIndex(of: " ") == nil && name.first != "@" && name.first != "#"
+    mkValidName(name.trimmingCharacters(in: .whitespaces)) == name
+}
+
+func mkValidName(_ s: String) -> String {
+    var c = s.cString(using: .utf8)!
+    return fromCString(chat_valid_name(&c)!)
 }

 struct CreateProfile_Previews: PreviewProvider {
@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                        Spacer()

                        if let userAddress = m.userAddress {
-                            QRCode(uri: userAddress.connReqContact)
+                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
                                .frame(maxHeight: g.size.width)
                            shareQRCodeButton(userAddress)
                                .frame(maxWidth: .infinity)
@@ -81,11 +81,6 @@ struct CreateSimpleXAddress: View {
                        DispatchQueue.main.async {
                            m.userAddress = UserContactLink(connReqContact: connReqContact)
                        }
-                        if let u = try await apiSetProfileAddress(on: true) {
-                            DispatchQueue.main.async {
-                                m.updateUser(u)
-                            }
-                        }
                        await MainActor.run { progressIndicator = false }
                    } catch let error {
                        logger.error("CreateSimpleXAddress create address: \(responseError(error))")
@@ -100,7 +95,7 @@ struct CreateSimpleXAddress: View {
            } label: {
                Text("Create SimpleX address").font(.title)
            }
-            Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.")
+            Text("You can make it visible to your SimpleX contacts via Settings.")
                .multilineTextAlignment(.center)
                .font(.footnote)
                .padding(.horizontal, 32)
@@ -126,7 +121,7 @@ struct CreateSimpleXAddress: View {

    private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
        Button {
-            showShareSheet(items: [userAddress.connReqContact])
+            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
        } label: {
            Label("Share", systemImage: "square.and.arrow.up")
        }
@@ -194,7 +189,7 @@ struct SendAddressMailView: View {
        let messageBody = String(format: NSLocalizedString("""
            <p>Hi!</p>
            <p><a href="%@">Connect to me via SimpleX Chat</a></p>
-            """, comment: "email text"), userAddress.connReqContact)
+            """, comment: "email text"), simplexChatLink(userAddress.connReqContact))
        MailView(
            isShowing: self.$showMailView,
            result: $mailViewResult,
@@ -14,7 +14,7 @@ struct OnboardingView: View {
    var body: some View {
        switch onboarding {
        case .step1_SimpleXInfo: SimpleXInfo(onboarding: true)
-        case .step2_CreateProfile: CreateProfile()
+        case .step2_CreateProfile: CreateFirstProfile()
        case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
        case .step4_SetNotificationsMode: SetNotificationsMode()
        case .onboardingComplete: EmptyView()
@@ -283,6 +283,37 @@ private let versionDescriptions: [VersionDescription] = [
            ),
        ]
    ),
+    VersionDescription(
+        version: "v5.4",
+        post: URL(string: "https://simplex.chat/blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.html"),
+        features: [
+            FeatureDescription(
+                icon: "desktopcomputer",
+                title: "Link mobile and desktop apps! 🔗",
+                description: "Via secure quantum resistant protocol."
+            ),
+            FeatureDescription(
+                icon: "person.2",
+                title: "Better groups",
+                description: "Faster joining and more reliable messages."
+            ),
+            FeatureDescription(
+                icon: "theatermasks",
+                title: "Incognito groups",
+                description: "Create a group using a random profile."
+            ),
+            FeatureDescription(
+                icon: "hand.raised",
+                title: "Block group members",
+                description: "To hide unwanted messages."
+            ),
+            FeatureDescription(
+                icon: "gift",
+                title: "A few more things",
+                description: "- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!"
+            ),
+        ]
+    ),
 ]

 private let lastVersion = versionDescriptions.last!.version
@@ -0,0 +1,556 @@
+//
+//  ConnectDesktopView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 13/10/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+import CodeScanner
+
+struct ConnectDesktopView: View {
+    @EnvironmentObject var m: ChatModel
+    @Environment(\.dismiss) var dismiss: DismissAction
+    var viaSettings = false
+    @AppStorage(DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS) private var deviceName = UIDevice.current.name
+    @AppStorage(DEFAULT_CONFIRM_REMOTE_SESSIONS) private var confirmRemoteSessions = false
+    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) private var connectRemoteViaMulticast = true
+    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO) private var connectRemoteViaMulticastAuto = true
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @State private var sessionAddress: String = ""
+    @State private var remoteCtrls: [RemoteCtrlInfo] = []
+    @State private var alert: ConnectDesktopAlert?
+    @State private var showConnectScreen = true
+    @State private var showQRCodeScanner = true
+    @State private var firstAppearance = true
+
+    private var useMulticast: Bool {
+        connectRemoteViaMulticast && !remoteCtrls.isEmpty
+    }
+
+    private enum ConnectDesktopAlert: Identifiable {
+        case unlinkDesktop(rc: RemoteCtrlInfo)
+        case disconnectDesktop(action: UserDisconnectAction)
+        case badInvitationError
+        case badVersionError(version: String?)
+        case desktopDisconnectedError
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
+
+        var id: String {
+            switch self {
+            case let .unlinkDesktop(rc): "unlinkDesktop \(rc.remoteCtrlId)"
+            case let .disconnectDesktop(action): "disconnectDecktop \(action)"
+            case .badInvitationError: "badInvitationError"
+            case let .badVersionError(v): "badVersionError \(v ?? "")"
+            case .desktopDisconnectedError: "desktopDisconnectedError"
+            case let .error(title, _): "error \(title)"
+            }
+        }
+    }
+
+    private enum UserDisconnectAction: String {
+        case back
+        case dismiss // TODO dismiss settings after confirmation
+    }
+
+    var body: some View {
+        if viaSettings {
+            viewBody
+                .modifier(BackButton(label: "Back") {
+                    if m.activeRemoteCtrl {
+                        alert = .disconnectDesktop(action: .back)
+                    } else {
+                        dismiss()
+                    }
+                })
+        } else {
+            NavigationView {
+                viewBody
+            }
+        }
+    }
+
+    var viewBody: some View {
+        Group {
+            let discovery = m.remoteCtrlSession?.discovery
+            if discovery == true || (discovery == nil && !showConnectScreen) {
+                searchingDesktopView()
+            } else if let session = m.remoteCtrlSession {
+                switch session.sessionState {
+                case .starting: connectingDesktopView(session, nil)
+                case .searching: searchingDesktopView()
+                case let .found(rc, compatible): foundDesktopView(session, rc, compatible)
+                case let .connecting(rc_): connectingDesktopView(session, rc_)
+                case let .pendingConfirmation(rc_, sessCode):
+                    if confirmRemoteSessions || rc_ == nil {
+                        verifySessionView(session, rc_, sessCode)
+                    } else {
+                        connectingDesktopView(session, rc_).onAppear {
+                            verifyDesktopSessionCode(sessCode)
+                        }
+                    }
+                case let .connected(rc, _): activeSessionView(session, rc)
+                }
+            // The hack below prevents camera freezing when exiting linked devices view.
+            // Using showQRCodeScanner inside connectDesktopView or passing it as parameter still results in freezing.
+            } else if showQRCodeScanner || firstAppearance {
+                connectDesktopView()
+            } else {
+                connectDesktopView(showScanner: false)
+            }
+        }
+        .onAppear {
+            setDeviceName(deviceName)
+            updateRemoteCtrls()
+            showConnectScreen = !useMulticast
+            if m.remoteCtrlSession != nil {
+                disconnectDesktop()
+            } else if useMulticast {
+                findKnownDesktop()
+            }
+            // The hack below prevents camera freezing when exiting linked devices view.
+            // `firstAppearance` prevents camera flicker when the view first opens.
+            // moving `showQRCodeScanner = false` to `onDisappear` (to avoid `firstAppearance`) does not prevent freeze.
+            showQRCodeScanner = false
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+                firstAppearance = false
+                showQRCodeScanner = true
+            }
+        }
+        .onDisappear {
+            if m.remoteCtrlSession != nil {
+                showConnectScreen = false
+                disconnectDesktop()
+            }
+        }
+        .onChange(of: deviceName) {
+            setDeviceName($0)
+        }
+        .onChange(of: m.activeRemoteCtrl) {
+            UIApplication.shared.isIdleTimerDisabled = $0
+        }
+        .alert(item: $alert) { a in
+            switch a {
+            case let .unlinkDesktop(rc):
+                Alert(
+                    title: Text("Unlink desktop?"),
+                    primaryButton: .destructive(Text("Unlink")) {
+                        unlinkDesktop(rc)
+                    },
+                    secondaryButton: .cancel()
+                )
+            case let .disconnectDesktop(action):
+                Alert(
+                    title: Text("Disconnect desktop?"),
+                    primaryButton: .destructive(Text("Disconnect")) {
+                        disconnectDesktop(action)
+                    },
+                    secondaryButton: .cancel()
+                )
+            case .badInvitationError:
+                Alert(title: Text("Bad desktop address"))
+            case let .badVersionError(v):
+                Alert(
+                    title: Text("Incompatible version"),
+                    message: Text("Desktop app version \(v ?? "") is not compatible with this app.")
+                )
+            case .desktopDisconnectedError:
+                Alert(title: Text("Connection terminated"))
+            case let .error(title, error):
+                Alert(title: Text(title), message: Text(error))
+            }
+        }
+        .interactiveDismissDisabled(m.activeRemoteCtrl)
+    }
+
+    private func connectDesktopView(showScanner: Bool = true) -> some View {
+        List {
+            Section("This device name") {
+                devicesView()
+            }
+            if showScanner {
+                scanDesctopAddressView()
+            }
+            if developerTools {
+                desktopAddressView()
+            }
+        }
+        .navigationTitle("Connect to desktop")
+    }
+
+    private func connectingDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> some View {
+        List {
+            Section("Connecting to desktop") {
+                ctrlDeviceNameText(session, rc)
+                ctrlDeviceVersionText(session)
+            }
+
+            if let sessCode = session.sessionCode {
+                Section("Session code") {
+                    sessionCodeText(sessCode)
+                }
+            }
+
+            Section {
+                disconnectButton()
+            }
+        }
+        .navigationTitle("Connecting to desktop")
+    }
+
+    private func searchingDesktopView() -> some View {
+        List {
+            Section("This device name") {
+                devicesView()
+            }
+            Section("Found desktop") {
+                Text("Waiting for desktop...").italic()
+                Button {
+                    disconnectDesktop()
+                } label: {
+                    Label("Scan QR code", systemImage: "qrcode")
+                }
+            }
+        }
+        .navigationTitle("Connecting to desktop")
+    }
+
+    @ViewBuilder private func foundDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo, _ compatible: Bool) -> some View {
+        let v = List {
+            Section("This device name") {
+                devicesView()
+            }
+            Section("Found desktop") {
+                ctrlDeviceNameText(session, rc)
+                ctrlDeviceVersionText(session)
+                if !compatible {
+                    Text("Not compatible!").foregroundColor(.red)
+                } else if !connectRemoteViaMulticastAuto {
+                    Button {
+                        confirmKnownDesktop(rc)
+                    } label: {
+                        Label("Connect", systemImage: "checkmark")
+                    }
+                }
+            }
+            if !compatible && !connectRemoteViaMulticastAuto {
+                Section {
+                    disconnectButton("Cancel")
+                }
+            }
+        }
+        .navigationTitle("Found desktop")
+
+        if compatible && connectRemoteViaMulticastAuto {
+            v.onAppear { confirmKnownDesktop(rc) }
+        } else {
+            v
+        }
+    }
+
+    private func verifySessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?, _ sessCode: String) -> some View {
+        List {
+            Section("Connected to desktop") {
+                ctrlDeviceNameText(session, rc)
+                ctrlDeviceVersionText(session)
+            }
+
+            Section("Verify code with desktop") {
+                sessionCodeText(sessCode)
+                Button {
+                    verifyDesktopSessionCode(sessCode)
+                } label: {
+                    Label("Confirm", systemImage: "checkmark")
+                }
+            }
+
+            Section {
+                disconnectButton()
+            }
+        }
+        .navigationTitle("Verify connection")
+    }
+
+    private func ctrlDeviceNameText(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> Text {
+        var t = Text(rc?.deviceViewName ?? session.ctrlAppInfo?.deviceName ?? "")
+        if (rc == nil) {
+            t = t + Text(" ") + Text("(new)").italic()
+        }
+        return t
+    }
+
+    private func ctrlDeviceVersionText(_ session: RemoteCtrlSession) -> Text {
+        let v = session.ctrlAppInfo?.appVersionRange.maxVersion
+        var t = Text("v\(v ?? "")")
+        if v != session.appVersion {
+            t = t + Text(" ") + Text("(this device v\(session.appVersion))").italic()
+        }
+        return t
+    }
+
+    private func activeSessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo) -> some View {
+        List {
+            Section("Connected desktop") {
+                Text(rc.deviceViewName)
+                ctrlDeviceVersionText(session)
+            }
+
+            if let sessCode = session.sessionCode {
+                Section("Session code") {
+                    sessionCodeText(sessCode)
+                }
+            }
+
+            Section {
+                disconnectButton()
+            } footer: {
+                // This is specific to iOS
+                Text("Keep the app open to use it from desktop")
+            }
+        }
+        .navigationTitle("Connected to desktop")
+    }
+
+    private func sessionCodeText(_ code: String) -> some View {
+        Text(code.prefix(23))
+    }
+
+    private func devicesView() -> some View {
+        Group {
+            TextField("Enter this device name…", text: $deviceName)
+            if !remoteCtrls.isEmpty {
+                NavigationLink {
+                    linkedDesktopsView()
+                } label: {
+                    Text("Linked desktops")
+                }
+            }
+        }
+    }
+
+    private func scanDesctopAddressView() -> some View {
+        Section("Scan QR code from desktop") {
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processDesktopQRCode)
+                .aspectRatio(1, contentMode: .fit)
+                .cornerRadius(12)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .padding(.horizontal)
+        }
+    }
+
+    private func desktopAddressView() -> some View {
+        Section("Desktop address") {
+            if sessionAddress.isEmpty {
+                Button {
+                    sessionAddress = UIPasteboard.general.string ?? ""
+                } label: {
+                    Label("Paste desktop address", systemImage: "doc.plaintext")
+                }
+                .disabled(!UIPasteboard.general.hasStrings)
+            } else {
+                HStack {
+                    Text(sessionAddress).lineLimit(1)
+                    Spacer()
+                    Image(systemName: "multiply.circle.fill")
+                        .foregroundColor(.secondary)
+                        .onTapGesture { sessionAddress = "" }
+                }
+            }
+            Button {
+                connectDesktopAddress(sessionAddress)
+            } label: {
+                Label("Connect to desktop", systemImage: "rectangle.connected.to.line.below")
+            }
+            .disabled(sessionAddress.isEmpty)
+        }
+    }
+
+    private func linkedDesktopsView() -> some View {
+        List {
+            Section("Desktop devices") {
+                ForEach(remoteCtrls, id: \.remoteCtrlId) { rc in
+                    remoteCtrlView(rc)
+                }
+                .onDelete { indexSet in
+                    if let i = indexSet.first, i < remoteCtrls.count {
+                        alert = .unlinkDesktop(rc: remoteCtrls[i])
+                    }
+                }
+            }
+
+            Section("Linked desktop options") {
+                Toggle("Verify connections", isOn: $confirmRemoteSessions)
+                Toggle("Discover via local network", isOn: $connectRemoteViaMulticast)
+                if connectRemoteViaMulticast {
+                    Toggle("Connect automatically", isOn: $connectRemoteViaMulticastAuto)
+                }
+            }
+        }
+        .navigationTitle("Linked desktops")
+    }
+
+    private func remoteCtrlView(_ rc: RemoteCtrlInfo) -> some View {
+        Text(rc.deviceViewName)
+    }
+
+
+    private func setDeviceName(_ name: String) {
+        do {
+            try setLocalDeviceName(deviceName)
+        } catch let e {
+            errorAlert(e)
+        }
+    }
+
+    private func updateRemoteCtrls() {
+        do {
+            remoteCtrls = try listRemoteCtrls()
+        } catch let e {
+            errorAlert(e)
+        }
+    }
+
+    private func processDesktopQRCode(_ resp: Result<ScanResult, ScanError>) {
+        switch resp {
+        case let .success(r): connectDesktopAddress(r.string)
+        case let .failure(e): errorAlert(e)
+        }
+    }
+
+    private func findKnownDesktop() {
+        Task {
+            do {
+                try await findKnownRemoteCtrl()
+                await MainActor.run {
+                    m.remoteCtrlSession = RemoteCtrlSession(
+                        ctrlAppInfo: nil,
+                        appVersion: "",
+                        sessionState: .searching
+                    )
+                    showConnectScreen = true
+                }
+            } catch let e {
+                await MainActor.run {
+                    errorAlert(e)
+                }
+            }
+        }
+    }
+
+    private func confirmKnownDesktop(_ rc: RemoteCtrlInfo) {
+        connectDesktop_ {
+            try await confirmRemoteCtrl(rc.remoteCtrlId)
+        }
+    }
+
+    private func connectDesktopAddress(_ addr: String) {
+        connectDesktop_ {
+            try await connectRemoteCtrl(desktopAddress: addr)
+        }
+    }
+
+    private func connectDesktop_(_ connect: @escaping () async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String)) {
+        Task {
+            do {
+                let (rc_, ctrlAppInfo, v) = try await connect()
+                await MainActor.run {
+                    sessionAddress = ""
+                    m.remoteCtrlSession = RemoteCtrlSession(
+                        ctrlAppInfo: ctrlAppInfo,
+                        appVersion: v,
+                        sessionState: .connecting(remoteCtrl_: rc_)
+                    )
+                }
+            } catch let e {
+                await MainActor.run {
+                    switch e as? ChatResponse {
+                    case .chatCmdError(_, .errorRemoteCtrl(.badInvitation)): alert = .badInvitationError
+                    case .chatCmdError(_, .error(.commandError)): alert = .badInvitationError
+                    case let .chatCmdError(_, .errorRemoteCtrl(.badVersion(v))): alert = .badVersionError(version: v)
+                    case .chatCmdError(_, .errorAgent(.RCP(.version))): alert = .badVersionError(version: nil)
+                    case .chatCmdError(_, .errorAgent(.RCP(.ctrlAuth))): alert = .desktopDisconnectedError
+                    default: errorAlert(e)
+                    }
+                }
+            }
+        }
+    }
+
+    private func verifyDesktopSessionCode(_ sessCode: String) {
+        Task {
+            do {
+                let rc = try await verifyRemoteCtrlSession(sessCode)
+                await MainActor.run {
+                    m.remoteCtrlSession = m.remoteCtrlSession?.updateState(.connected(remoteCtrl: rc, sessionCode: sessCode))
+                }
+                await MainActor.run {
+                    updateRemoteCtrls()
+                }
+            } catch let error {
+                await MainActor.run {
+                    errorAlert(error)
+                }
+            }
+        }
+    }
+
+    private func disconnectButton(_ label: LocalizedStringKey = "Disconnect") -> some View {
+        Button {
+            disconnectDesktop(.dismiss)
+        } label: {
+            Label(label, systemImage: "multiply")
+        }
+    }
+
+    private func disconnectDesktop(_ action: UserDisconnectAction? = nil) {
+        Task {
+            do {
+                try await stopRemoteCtrl()
+                await MainActor.run {
+                    if case .connected = m.remoteCtrlSession?.sessionState {
+                        switchToLocalSession()
+                    } else {
+                        m.remoteCtrlSession = nil
+                    }
+                    switch action {
+                    case .back: dismiss()
+                    case .dismiss: dismiss()
+                    case .none: ()
+                    }
+                }
+            } catch let e {
+                await MainActor.run {
+                    errorAlert(e)
+                }
+            }
+        }
+    }
+
+    private func unlinkDesktop(_ rc: RemoteCtrlInfo) {
+        Task {
+            do {
+                try await deleteRemoteCtrl(rc.remoteCtrlId)
+                await MainActor.run {
+                    remoteCtrls.removeAll(where: { $0.remoteCtrlId == rc.remoteCtrlId })
+                }
+            } catch let e {
+                await MainActor.run {
+                    errorAlert(e)
+                }
+            }
+        }
+    }
+
+    private func errorAlert(_ error: Error) {
+        let a = getErrorAlert(error, "Error")
+        alert = .error(title: a.title, error: a.message)
+    }
+}
+
+#Preview {
+    ConnectDesktopView()
+}
@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 60_000, 90_000, 120_000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_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: [15_000, 30_000, 45_000, 60_000, 90_000, 120_000], label: secondsLabel)
                    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)
@@ -14,9 +14,6 @@ struct NotificationsView: View {
    @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
    @State private var showAlert: NotificationAlert?
    @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
-//    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_LOCAL, store: groupDefaults) private var ntfEnableLocal = false
-//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_PERIODIC, store: groupDefaults) private var ntfEnablePeriodic = false

    var body: some View {
        List {
@@ -88,13 +85,6 @@ struct NotificationsView: View {
                        .padding(.top, 1)
                }
            }
-
-//            if developerTools {
-//                Section(String("Experimental")) {
-//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
-//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
-//                }
-//            }
        }
        .disabled(legacyDatabase)
    }
@@ -119,7 +109,7 @@ struct NotificationsView: View {

    private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
        switch mode {
-        case .off: return "Turn off notifications?"
+        case .off: return "Use only local notifications?"
        case .periodic: return "Enable periodic notifications?"
        case .instant: return "Enable instant notifications?"
        }
@@ -66,6 +66,9 @@ 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)
@@ -90,7 +93,9 @@ struct PrivacySettings: View {
                    }
                    settingsRow("link") {
                        Picker("SimpleX links", selection: $simplexLinkMode) {
-                            ForEach(SimpleXLinkMode.values) { mode in
+                            ForEach(
+                                SimpleXLinkMode.values + (SimpleXLinkMode.values.contains(simplexLinkMode) ? [] : [simplexLinkMode])
+                            ) { mode in
                                Text(mode.text)
                            }
                        }
@@ -101,10 +106,6 @@ struct PrivacySettings: View {
                    }
                } header: {
                    Text("Chats")
-                } footer: {
-                    if case .browser = simplexLinkMode {
-                        Text("Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.")
-                    }
                }

                Section {
@@ -118,7 +119,7 @@ struct PrivacySettings: View {
                    Text("Send delivery receipts to")
                } footer: {
                    VStack(alignment: .leading) {
-                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
+                        Text("These settings are for your current profile **\(m.currentUser?.displayName ?? "")**.")
                        Text("They can be overridden in contact and group settings.")
                    }
                    .frame(maxWidth: .infinity, alignment: .leading)
@@ -183,6 +184,16 @@ struct PrivacySettings: View {
        }
    }

+    private func setEncryptLocalFiles(_ enable: Bool) {
+        do {
+            try apiSetEncryptLocalFiles(enable)
+        } catch let error {
+            let err = responseError(error)
+            logger.error("apiSetEncryptLocalFiles \(err)")
+            alert = .error(title: "Error", error: "\(err)")
+        }
+    }
+
    private func setOrAskSendReceiptsContacts(_ enable: Bool) {
        contactReceiptsOverrides = m.chats.reduce(0) { count, chat in
            let sendRcpts = chat.chatInfo.contact?.chatSettings.sendRcpts
@@ -345,7 +356,7 @@ struct SimplexLockView: View {
        var id: Self { self }
    }

-    let laDelays: [Int] = [10, 30, 60, 180, 0]
+    let laDelays: [Int] = [10, 30, 60, 180, 600, 0]

    func laDelayText(_ t: Int) -> LocalizedStringKey {
        let m = t / 60
@@ -367,6 +378,7 @@ struct SimplexLockView: View {
                            Text(mode.text)
                        }
                    }
+                    .frame(height: 36)
                    if performLA {
                        Picker("Lock after", selection: $laLockDelay) {
                            let delays = laDelays.contains(laLockDelay) ? laDelays : [laLockDelay] + laDelays
@@ -374,6 +386,7 @@ struct SimplexLockView: View {
                                Text(laDelayText(t))
                            }
                        }
+                        .frame(height: 36)
                        if showChangePassword && laMode == .passcode {
                            Button("Change passcode") {
                                changeLAPassword()
@@ -454,6 +467,7 @@ struct SimplexLockView: View {
            switch a {
            case .enableAuth:
                SetAppPasscodeView {
+                    m.contentViewAccessAuthenticated = true
                    laLockDelay = 30
                    prefPerformLA = true
                    showChangePassword = true
@@ -606,6 +620,7 @@ struct SimplexLockView: View {
        authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
            switch laResult {
            case .success:
+                m.contentViewAccessAuthenticated = true
                prefPerformLA = true
                laAlert = .laTurnedOnAlert
            case .failed:
@@ -21,7 +21,7 @@ struct ScanProtocolServer: View {
                .font(.largeTitle)
                .bold()
                .padding(.vertical)
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
                .padding(.top)
@@ -53,6 +53,10 @@ let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
 let DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME = "customDisappearingMessageTime"
 let DEFAULT_SHOW_UNREAD_AND_FAVORITES = "showUnreadAndFavorites"
+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 appDefaults: [String: Any] = [
    DEFAULT_SHOW_LA_NOTICE: false,
@@ -85,7 +89,10 @@ let appDefaults: [String: Any] = [
    DEFAULT_SHOW_MUTE_PROFILE_ALERT: true,
    DEFAULT_ONBOARDING_STAGE: OnboardingStage.onboardingComplete.rawValue,
    DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
-    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false
+    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
+    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
+    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
+    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
 ]

 enum SimpleXLinkMode: String, Identifiable {
@@ -93,7 +100,7 @@ enum SimpleXLinkMode: String, Identifiable {
    case full
    case browser

-    static var values: [SimpleXLinkMode] = [.description, .full, .browser]
+    static var values: [SimpleXLinkMode] = [.description, .full]

    public var id: Self { self }

@@ -178,6 +185,12 @@ struct SettingsView: View {
                    } label: {
                        settingsRow("switch.2") { Text("Chat preferences") }
                    }
+
+                    NavigationLink {
+                        ConnectDesktopView(viaSettings: true)
+                    } label: {
+                        settingsRow("desktopcomputer") { Text("Use from desktop") }
+                    }
                }
                .disabled(chatModel.chatRunning != true)
                
@@ -362,7 +375,9 @@ struct SettingsView: View {

 func settingsRow<Content : View>(_ icon: String, color: Color = .secondary, content: @escaping () -> Content) -> some View {
    ZStack(alignment: .leading) {
-        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(color)
+        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+            .symbolRenderingMode(.monochrome)
+            .foregroundColor(color)
        content().padding(.leading, indent)
    }
 }
@@ -381,7 +396,9 @@ struct ProfilePreview: View {
                Text(profileOf.displayName)
                    .fontWeight(.bold)
                    .font(.title2)
-                Text(profileOf.fullName)
+                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
+                    Text(profileOf.fullName)
+                }
            }
        }
    }
@@ -190,7 +190,8 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
+            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
@@ -248,7 +249,7 @@ struct UserAddressView: View {

    private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
        Button {
-            showShareSheet(items: [userAddress.connReqContact])
+            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
        } label: {
            settingsRow("square.and.arrow.up") {
                Text("Share address")
@@ -17,6 +17,8 @@ struct UserProfile: View {
    @State private var showImagePicker = false
    @State private var showTakePhoto = false
    @State private var chosenImage: UIImage? = nil
+    @State private var alert: UserProfileAlert?
+    @FocusState private var focusDisplayName

    var body: some View {
        let user: User = chatModel.currentUser!
@@ -47,18 +49,27 @@ struct UserProfile: View {

                VStack(alignment: .leading) {
                    ZStack(alignment: .leading) {
-                        if !validDisplayName(profile.displayName) {
-                            Image(systemName: "exclamationmark.circle")
-                                .foregroundColor(.red)
-                                .padding(.bottom, 10)
+                        if !validNewProfileName(user) {
+                            Button {
+                                alert = .invalidNameError(validName: mkValidName(profile.displayName))
+                            } label: {
+                                Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                            }
+                        } else {
+                            Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                        }
-                        profileNameTextEdit("Display name", $profile.displayName)
+                        profileNameTextEdit("Profile name", $profile.displayName)
+                            .focused($focusDisplayName)
+                    }
+                    .padding(.bottom)
+                    if showFullName(user) {
+                        profileNameTextEdit("Full name (optional)", $profile.fullName)
+                            .padding(.bottom)
                    }
-                    profileNameTextEdit("Full name (optional)", $profile.fullName)
                    HStack(spacing: 20) {
                        Button("Cancel") { editProfile = false }
                        Button("Save (and notify contacts)") { saveProfile() }
-                            .disabled(profile.displayName == "" || !validDisplayName(profile.displayName))
+                            .disabled(!canSaveProfile(user))
                    }
                }
                .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -74,11 +85,14 @@ struct UserProfile: View {
                .frame(maxWidth: .infinity, alignment: .center)

                VStack(alignment: .leading) {
-                    profileNameView("Display name:", user.profile.displayName)
-                    profileNameView("Full name:", user.profile.fullName)
+                    profileNameView("Profile name:", user.profile.displayName)
+                    if showFullName(user) {
+                        profileNameView("Full name:", user.profile.fullName)
+                    }
                    Button("Edit") {
                        profile = fromLocalProfile(user.profile)
                        editProfile = true
+                        focusDisplayName = true
                    }
                }
                .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -106,8 +120,10 @@ struct UserProfile: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
        .onChange(of: chosenImage) { image in
@@ -117,14 +133,12 @@ struct UserProfile: View {
                profile.image = nil
            }
        }
+        .alert(item: $alert) { a in userProfileAlert(a, $profile.displayName) }
    }

    func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
        TextField(label, text: name)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.bottom)
-            .padding(.leading, 28)
+            .padding(.leading, 32)
    }

    func profileNameView(_ label: LocalizedStringKey, _ name: String) -> some View {
@@ -141,19 +155,34 @@ struct UserProfile: View {
        showChooseSource = true
    }

+    private func validNewProfileName(_ user: User) -> Bool {
+        profile.displayName == user.profile.displayName || validDisplayName(profile.displayName.trimmingCharacters(in: .whitespaces))
+    }
+
+    private func showFullName(_ user: User) -> Bool {
+        user.profile.fullName != "" && user.profile.fullName != user.profile.displayName
+    }
+
+    private func canSaveProfile(_ user: User) -> Bool {
+        profile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName(user)
+    }
+
    func saveProfile() {
        Task {
            do {
+                profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                    DispatchQueue.main.async {
                        chatModel.updateCurrentUser(newProfile)
                        profile = newProfile
                    }
+                    editProfile = false
+                } else {
+                    alert = .duplicateUserError
                }
            } catch {
                logger.error("UserProfile apiUpdateProfile error: \(responseError(error))")
            }
-            editProfile = false
        }
    }
 }
@@ -18,5 +18,9 @@
 	<array>
 		<string>$(AppIdentifierPrefix)chat.simplex.app</string>
 	</array>
+	<key>com.apple.developer.networking.multicast</key>
+	<true/>
+	<key>com.apple.developer.device-information.user-assigned-device-name</key>
+	<true/>
 </dict>
 </plist>
@@ -87,6 +87,10 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve">
+        <source>%@ and %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <target>%@ и %@ са свързани</target>
@@ -97,6 +101,10 @@
        <target>%1$@ в %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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ е свързан!</target>
@@ -122,6 +130,10 @@
        <target>%@ иска да се свърже!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
+        <source>%@, %@ and %lld members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <target>%@, %@ и %lld други членове са свързани</target>
@@ -187,11 +199,27 @@
        <target>%lld файл(а) с общ размер от %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve">
+        <source>%lld group events</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld членове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve">
+        <source>%lld messages blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
+        <source>%lld messages marked deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
+        <source>%lld messages moderated by %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld минути</target>
@@ -262,6 +290,14 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve">
+        <source>(new)</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve">
+        <source>(this device v%@)</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -350,6 +386,12 @@
 - и още!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -364,6 +406,10 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve">
+        <source>0 sec</source>
+        <note>time to disappear</note>
+      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0s</target>
@@ -589,6 +635,10 @@
        <target>Всички съобщения ще бъдат изтрити - това не може да бъде отменено! Съобщенията ще бъдат изтрити САМО за вас.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
+        <source>All new messages from %@ will be hidden!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>Всички ваши контакти ще останат свързани.</target>
@@ -694,6 +744,14 @@
        <target>Вече сте свързани?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve">
+        <source>Already connecting!</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>Винаги използвай реле</target>
@@ -814,6 +872,10 @@
        <target>Назад</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve">
+        <source>Bad desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>Лошо ID на съобщението</target>
@@ -824,11 +886,31 @@
        <target>Лош хеш на съобщението</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve">
+        <source>Better groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>По-добри съобщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve">
+        <source>Block</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve">
+        <source>Block group members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve">
+        <source>Block member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve">
+        <source>Block member?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>И вие, и вашият контакт можете да добавяте реакции към съобщението.</target>
@@ -1090,9 +1172,8 @@
        <target>Свързване</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Свързване директно</target>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
@@ -1100,14 +1181,26 @@
        <target>Свързване инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Свързване чрез линк на контакта</target>
+      <trans-unit id="Connect to desktop" xml:space="preserve">
+        <source>Connect to desktop</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via group link?" xml:space="preserve">
-        <source>Connect via group link?</source>
-        <target>Свързване чрез групов линк?</target>
+      <trans-unit id="Connect to yourself?" xml:space="preserve">
+        <source>Connect to yourself?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
+        <source>Connect to yourself?
+This is your own SimpleX address!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
+        <source>Connect to yourself?
+This is your own one-time link!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact address" xml:space="preserve">
+        <source>Connect via contact address</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1125,6 +1218,18 @@
        <target>Свързване чрез еднократен линк за връзка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connect with %@" xml:space="preserve">
+        <source>Connect with %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connected desktop" xml:space="preserve">
+        <source>Connected desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connected to desktop" xml:space="preserve">
+        <source>Connected to desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>Свързване със сървъра…</target>
@@ -1135,6 +1240,10 @@
        <target>Свързване със сървър…(грешка: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connecting to desktop" xml:space="preserve">
+        <source>Connecting to desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>Връзка</target>
@@ -1155,6 +1264,10 @@
        <target>Заявката за връзка е изпратена!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connection terminated" xml:space="preserve">
+        <source>Connection terminated</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>Времето на изчакване за установяване на връзката изтече</target>
@@ -1170,11 +1283,6 @@
        <target>Контактът вече съществува</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
-        <source>Contact and all messages will be deleted - this cannot be undone!</source>
-        <target>Контактът и всички съобщения ще бъдат изтрити - това не може да бъде отменено!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>Контактът е скрит:</target>
@@ -1225,6 +1333,10 @@
        <target>Версия на ядрото: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Correct name to %@?" xml:space="preserve">
+        <source>Correct name to %@?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>Създай</target>
@@ -1235,6 +1347,10 @@
        <target>Създай SimpleX адрес</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Create a group using a random profile." xml:space="preserve">
+        <source>Create a group using a random profile.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>Създайте адрес, за да позволите на хората да се свързват с вас.</target>
@@ -1245,6 +1361,10 @@
        <target>Създай файл</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Create group" xml:space="preserve">
+        <source>Create group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>Създай групов линк</target>
@@ -1265,6 +1385,10 @@
        <target>Създай линк за еднократна покана</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Create profile" xml:space="preserve">
+        <source>Create profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>Създай опашка</target>
@@ -1423,6 +1547,10 @@
        <target>Изтрий</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Delete %lld messages?" xml:space="preserve">
+        <source>Delete %lld messages?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>Изтрий контакт</target>
@@ -1448,6 +1576,10 @@
        <target>Изтрий всички файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete and notify contact" xml:space="preserve">
+        <source>Delete and notify contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>Изтрий архив</target>
@@ -1478,9 +1610,9 @@
        <target>Изтрий контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?" xml:space="preserve">
-        <source>Delete contact?</source>
-        <target>Изтрий контакт?</target>
+      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
+        <source>Delete contact?
+This cannot be undone!</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1623,6 +1755,18 @@
        <target>Описание</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Desktop address" xml:space="preserve">
+        <source>Desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
+        <source>Desktop app version %@ is not compatible with this app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Desktop devices" xml:space="preserve">
+        <source>Desktop devices</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Разработване</target>
@@ -1713,19 +1857,17 @@
        <target>Прекъсни връзката</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Disconnect desktop?" xml:space="preserve">
+        <source>Disconnect desktop?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
        <target>Открийте и се присъединете към групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Display name" xml:space="preserve">
-        <source>Display name</source>
-        <target>Показвано Име</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Display name:" xml:space="preserve">
-        <source>Display name:</source>
-        <target>Показвано име:</target>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1898,6 +2040,14 @@
        <target>Криптирано съобщение: неочаквана грешка</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
+        <source>Encryption re-negotiation error</source>
+        <note>message decrypt error item</note>
+      </trans-unit>
+      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
+        <source>Encryption re-negotiation failed.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>Въведете kодa за достъп</target>
@@ -1908,6 +2058,10 @@
        <target>Въведи правилна парола.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enter group name…" xml:space="preserve">
+        <source>Enter group name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Въведи парола…</target>
@@ -1923,6 +2077,10 @@
        <target>Въведи сървъра ръчно</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enter this device name…" xml:space="preserve">
+        <source>Enter this device name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>Въведи съобщение при посрещане…</target>
@@ -1933,6 +2091,10 @@
        <target>Въведи съобщение при посрещане…(незадължително)</target>
        <note>placeholder</note>
      </trans-unit>
+      <trans-unit id="Enter your name…" xml:space="preserve">
+        <source>Enter your name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>Грешка при свързване със сървъра</target>
@@ -1990,6 +2152,7 @@
      </trans-unit>
      <trans-unit id="Error creating member contact" xml:space="preserve">
        <source>Error creating member contact</source>
+        <target>Грешка при създаване на контакт с член</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2124,6 +2287,7 @@
      </trans-unit>
      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
        <source>Error sending member contact invitation</source>
+        <target>Грешка при изпращане на съобщение за покана за контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error sending message" xml:space="preserve">
@@ -2206,6 +2370,10 @@
        <target>Изход без запазване</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Expand" xml:space="preserve">
+        <source>Expand</source>
+        <note>chat item action</note>
+      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>Експортирай база данни</target>
@@ -2236,6 +2404,10 @@
        <target>Бързо и без чакане, докато подателят е онлайн!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
+        <source>Faster joining and more reliable messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Любим</target>
@@ -2331,6 +2503,10 @@
        <target>За конзолата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Found desktop" xml:space="preserve">
+        <source>Found desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>Френски интерфейс</target>
@@ -2351,6 +2527,10 @@
        <target>Пълно име:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
+        <source>Fully decentralized – visible only to members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>Напълно преработено - работи във фонов режим!</target>
@@ -2371,6 +2551,14 @@
        <target>Група</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group already exists" xml:space="preserve">
+        <source>Group already exists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group already exists!" xml:space="preserve">
+        <source>Group already exists!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>Показвано име на групата</target>
@@ -2641,6 +2829,10 @@
        <target>Инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Incognito groups" xml:space="preserve">
+        <source>Incognito groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Режим инкогнито</target>
@@ -2671,6 +2863,10 @@
        <target>Несъвместима версия на базата данни</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Incompatible version" xml:space="preserve">
+        <source>Incompatible version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>Неправилен kод за достъп</target>
@@ -2718,6 +2914,10 @@
        <target>Невалиден линк за връзка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid name!" xml:space="preserve">
+        <source>Invalid name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Невалиден адрес на сървъра!</target>
@@ -2809,16 +3009,33 @@
        <target>Влез в групата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Join group?" xml:space="preserve">
+        <source>Join group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>Влез инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Join with current profile" xml:space="preserve">
+        <source>Join with current profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
+        <source>Join your group?
+This is your link for group %@!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>Присъединяване към групата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
+        <source>Keep the app open to use it from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Запазете връзките си</target>
@@ -2879,6 +3096,18 @@
        <target>Ограничения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
+        <source>Link mobile and desktop apps! 🔗</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Linked desktop options" xml:space="preserve">
+        <source>Linked desktop options</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Linked desktops" xml:space="preserve">
+        <source>Linked desktops</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>Съобщение на живо!</target>
@@ -3029,6 +3258,10 @@
        <target>Съобщения и файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
+        <source>Messages from %@ will be shown!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Архивът на базата данни се мигрира…</target>
@@ -3224,6 +3457,10 @@
        <target>Няма получени или изпратени файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Not compatible!" xml:space="preserve">
+        <source>Not compatible!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Известия</target>
@@ -3360,6 +3597,7 @@
      </trans-unit>
      <trans-unit id="Open" xml:space="preserve">
        <source>Open</source>
+        <target>Отвори</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Open Settings" xml:space="preserve">
@@ -3377,6 +3615,10 @@
        <target>Отвори конзолата</target>
        <note>authentication reason</note>
      </trans-unit>
+      <trans-unit id="Open group" xml:space="preserve">
+        <source>Open group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Отвори потребителските профили</target>
@@ -3392,11 +3634,6 @@
        <target>Отваряне на база данни…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
-        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
-        <target>Отварянето на линка в браузъра може да намали поверителността и сигурността на връзката. Несигурните SimpleX линкове ще бъдат червени.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING бройка</target>
@@ -3442,6 +3679,10 @@
        <target>Постави</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Paste desktop address" xml:space="preserve">
+        <source>Paste desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>Постави изображение</target>
@@ -3587,6 +3828,14 @@
        <target>Профилно изображение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Profile name" xml:space="preserve">
+        <source>Profile name</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Profile name:" xml:space="preserve">
+        <source>Profile name:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Профилна парола</target>
@@ -3832,6 +4081,14 @@
        <target>Предоговори криптирането?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Repeat connection request?" xml:space="preserve">
+        <source>Repeat connection request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Repeat join request?" xml:space="preserve">
+        <source>Repeat join request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Отговори</target>
@@ -4017,6 +4274,10 @@
        <target>Сканирай QR код</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
+        <source>Scan QR code from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>Сканирай код</target>
@@ -4099,6 +4360,7 @@
      </trans-unit>
      <trans-unit id="Send direct message to connect" xml:space="preserve">
        <source>Send direct message to connect</source>
+        <target>Изпрати лично съобщение за свързване</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4236,6 +4498,10 @@
        <target>Сървъри</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Session code" xml:space="preserve">
+        <source>Session code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>Задай 1 ден</target>
@@ -4546,6 +4812,10 @@
        <target>Докосни бутона </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to Connect" xml:space="preserve">
+        <source>Tap to Connect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>Докосни за активиране на профил.</target>
@@ -4643,11 +4913,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Криптирането работи и новото споразумение за криптиране не е необходимо. Това може да доведе до грешки при свързване!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
-        <source>The group is fully decentralized – it is visible only to the members.</source>
-        <target>Групата е напълно децентрализирана – видима е само за членовете.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The hash of the previous message is different." xml:space="preserve">
        <source>The hash of the previous message is different.</source>
        <target>Хешът на предишното съобщение е различен.</target>
@@ -4733,6 +4998,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Това действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This device name" xml:space="preserve">
+        <source>This device name</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <target>Тази група има над %lld членове, потвърждения за доставка не се изпращат.</target>
@@ -4743,6 +5012,14 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Тази група вече не съществува.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
+        <source>This is your own SimpleX address!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="This is your own one-time link!" xml:space="preserve">
+        <source>This is your own one-time link!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>Тази настройка се прилага за съобщения в текущия ви профил **%@**.</target>
@@ -4758,6 +5035,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>За да се свърже, вашият контакт може да сканира QR код или да използва линка в приложението.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To hide unwanted messages." xml:space="preserve">
+        <source>To hide unwanted messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>За да направите нова връзка</target>
@@ -4840,6 +5121,18 @@ You will be prompted to complete authentication before this feature is enabled.<
        <target>Не може да се запише гласово съобщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Unblock" xml:space="preserve">
+        <source>Unblock</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unblock member" xml:space="preserve">
+        <source>Unblock member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unblock member?" xml:space="preserve">
+        <source>Unblock member?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Неочаквана грешка: %@</target>
@@ -4902,6 +5195,14 @@ To connect, please ask your contact to create another connection link and check
 За да се свържете, моля, помолете вашия контакт да създаде друг линк за връзка и проверете дали имате стабилна мрежова връзка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Unlink" xml:space="preserve">
+        <source>Unlink</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unlink desktop?" xml:space="preserve">
+        <source>Unlink desktop?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>Отключи</target>
@@ -4992,6 +5293,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Използвай за нови връзки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use from desktop" xml:space="preserve">
+        <source>Use from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>Използвай интерфейса за повикване на iOS</target>
@@ -5022,11 +5327,23 @@ To connect, please ask your contact to create another connection link and check
        <target>Използват се сървърите на SimpleX Chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Verify code with desktop" xml:space="preserve">
+        <source>Verify code with desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Verify connection" xml:space="preserve">
+        <source>Verify connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>Потвръди сигурността на връзката</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Verify connections" xml:space="preserve">
+        <source>Verify connections</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Потвръди кода за сигурност</target>
@@ -5037,6 +5354,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Чрез браузър</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
+        <source>Via secure quantum resistant protocol.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Видео разговор</target>
@@ -5087,6 +5408,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Гласово съобщение…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Waiting for desktop..." xml:space="preserve">
+        <source>Waiting for desktop...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Изчаква се получаването на файла</target>
@@ -5187,6 +5512,35 @@ To connect, please ask your contact to create another connection link and check
        <target>Вече сте вече свързани с %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You are already connecting to %@." xml:space="preserve">
+        <source>You are already connecting to %@.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already in group %@." xml:space="preserve">
+        <source>You are already in group %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already joining the group %@." xml:space="preserve">
+        <source>You are already joining the group %@.</source>
+        <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>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
+        <source>You are already joining the group!
+Repeat join request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>Вие сте свързани към сървъра, използван за получаване на съобщения от този контакт.</target>
@@ -5282,6 +5636,15 @@ To connect, please ask your contact to create another connection link and check
        <target>Не можахте да бъдете потвърдени; Моля, опитайте отново.</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>Нямате чатове</target>
@@ -5332,6 +5695,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Ще бъдете свързани с групата, когато устройството на домакина на групата е онлайн, моля, изчакайте или проверете по-късно!</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>
+        <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>Ще бъдете свързани, когато заявката ви за връзка бъде приета, моля, изчакайте или проверете по-късно!</target>
@@ -5347,9 +5714,8 @@ To connect, please ask your contact to create another connection link and check
        <target>Ще трябва да се идентифицирате, когато стартирате или възобновите приложението след 30 секунди във фонов режим.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
-        <source>You will join a group this link refers to and connect to its group members.</source>
-        <target>Ще се присъедините към групата, към която този линк препраща, и ще се свържете с нейните членове.</target>
+      <trans-unit id="You will connect to all group members." xml:space="preserve">
+        <source>You will connect to all group members.</source>
        <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">
@@ -5417,11 +5783,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
-        <source>Your chat profile will be sent to group members</source>
-        <target>Вашият чат профил ще бъде изпратен на членовете на групата</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Вашите чат профили</target>
@@ -5476,6 +5837,10 @@ You can change it in Settings.</source>
        <target>Вашата поверителност</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile" xml:space="preserve">
+        <source>Your profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <target>Вашият профил **%@** ще бъде споделен.</target>
@@ -5568,11 +5933,19 @@ SimpleX сървърите не могат да видят вашия профи
        <target>винаги</target>
        <note>pref value</note>
      </trans-unit>
+      <trans-unit id="and %lld other events" xml:space="preserve">
+        <source>and %lld other events</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>аудио разговор (не е e2e криптиран)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="author" xml:space="preserve">
+        <source>author</source>
+        <note>member role</note>
+      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>лошо ID на съобщението</target>
@@ -5583,6 +5956,10 @@ SimpleX сървърите не могат да видят вашия профи
        <target>лош хеш на съобщението</target>
        <note>integrity error chat item</note>
      </trans-unit>
+      <trans-unit id="blocked" xml:space="preserve">
+        <source>blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>удебелен</target>
@@ -5655,6 +6032,7 @@ SimpleX сървърите не могат да видят вашия профи
      </trans-unit>
      <trans-unit id="connected directly" xml:space="preserve">
        <source>connected directly</source>
+        <target>свързан директно</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="connecting" xml:space="preserve">
@@ -5752,6 +6130,10 @@ SimpleX сървърите не могат да видят вашия профи
        <target>изтрит</target>
        <note>deleted chat item</note>
      </trans-unit>
+      <trans-unit id="deleted contact" xml:space="preserve">
+        <source>deleted contact</source>
+        <note>rcv direct event chat item</note>
+      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>групата изтрита</target>
@@ -6036,7 +6418,8 @@ SimpleX сървърите не могат да видят вашия профи
        <source>off</source>
        <target>изключено</target>
        <note>enabled status
-   group pref value</note>
+   group pref value
+   time to disappear</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6053,11 +6436,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>включено</target>
        <note>group pref value</note>
      </trans-unit>
-      <trans-unit id="or chat with the developers" xml:space="preserve">
-        <source>or chat with the developers</source>
-        <target>или пишете на разработчиците</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>собственик</target>
@@ -6120,6 +6498,7 @@ SimpleX сървърите не могат да видят вашия профи
      </trans-unit>
      <trans-unit id="send direct message" xml:space="preserve">
        <source>send direct message</source>
+        <target>изпрати лично съобщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6147,6 +6526,10 @@ SimpleX сървърите не могат да видят вашия профи
        <target>актуализиран профил на групата</target>
        <note>rcv group event chat item</note>
      </trans-unit>
+      <trans-unit id="v%@" xml:space="preserve">
+        <source>v%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6284,6 +6667,10 @@ SimpleX сървърите не могат да видят вашия профи
        <target>SimpleX използва Face ID за локалнa идентификация</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
+      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
+        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
+        <note>Privacy - Local Network Usage Description</note>
+      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX се нуждае от достъп до микрофона за аудио и видео разговори и за запис на гласови съобщения.</target>
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -87,6 +87,10 @@
        <target>%@ / % @</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve">
+        <source>%@ and %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <target>%@ ja %@ yhdistetty</target>
@@ -97,6 +101,10 @@
        <target>%1$@ klo %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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ on yhdistetty!</target>
@@ -122,6 +130,10 @@
        <target>%@ haluaa muodostaa yhteyden!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
+        <source>%@, %@ and %lld members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <target>%@, %@ ja %lld muut jäsenet yhdistetty</target>
@@ -187,11 +199,27 @@
        <target>%lld tiedosto(a), joiden kokonaiskoko on %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve">
+        <source>%lld group events</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld jäsenet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve">
+        <source>%lld messages blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
+        <source>%lld messages marked deleted</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
+        <source>%lld messages moderated by %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld minuuttia</target>
@@ -199,6 +227,7 @@
      </trans-unit>
      <trans-unit id="%lld new interface languages" xml:space="preserve">
        <source>%lld new interface languages</source>
+        <target>%lld uutta käyttöliittymän kieltä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -261,6 +290,14 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve">
+        <source>(new)</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve">
+        <source>(this device v%@)</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -346,6 +383,12 @@
 - ja paljon muuta!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -360,6 +403,10 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve">
+        <source>0 sec</source>
+        <note>time to disappear</note>
+      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0s</target>
@@ -585,6 +632,10 @@
        <target>Kaikki viestit poistetaan - tätä ei voi kumota! Viestit poistuvat VAIN sinulta.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
+        <source>All new messages from %@ will be hidden!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>Kaikki kontaktisi pysyvät yhteydessä.</target>
@@ -690,6 +741,14 @@
        <target>Oletko jo muodostanut yhteyden?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve">
+        <source>Already connecting!</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>Käytä aina relettä</target>
@@ -809,6 +868,10 @@
        <target>Takaisin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve">
+        <source>Bad desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>Virheellinen viestin tunniste</target>
@@ -819,11 +882,31 @@
        <target>Virheellinen viestin tarkiste</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve">
+        <source>Better groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Parempia viestejä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve">
+        <source>Block</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve">
+        <source>Block group members</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve">
+        <source>Block member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve">
+        <source>Block member?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>Sekä sinä että kontaktisi voivat käyttää viestireaktioita.</target>
@@ -1084,9 +1167,8 @@
        <target>Yhdistä</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Yhdistä suoraan</target>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
@@ -1094,14 +1176,26 @@
        <target>Yhdistä Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Yhdistä kontaktilinkillä</target>
+      <trans-unit id="Connect to desktop" xml:space="preserve">
+        <source>Connect to desktop</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via group link?" xml:space="preserve">
-        <source>Connect via group link?</source>
-        <target>Yhdistetäänkö ryhmälinkin kautta?</target>
+      <trans-unit id="Connect to yourself?" xml:space="preserve">
+        <source>Connect to yourself?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
+        <source>Connect to yourself?
+This is your own SimpleX address!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
+        <source>Connect to yourself?
+This is your own one-time link!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect via contact address" xml:space="preserve">
+        <source>Connect via contact address</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1119,6 +1213,18 @@
        <target>Yhdistä kertalinkillä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connect with %@" xml:space="preserve">
+        <source>Connect with %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connected desktop" xml:space="preserve">
+        <source>Connected desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connected to desktop" xml:space="preserve">
+        <source>Connected to desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>Yhteyden muodostaminen palvelimeen…</target>
@@ -1129,6 +1235,10 @@
        <target>Yhteyden muodostaminen palvelimeen... (virhe: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connecting to desktop" xml:space="preserve">
+        <source>Connecting to desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>Yhteys</target>
@@ -1149,6 +1259,10 @@
        <target>Yhteyspyyntö lähetetty!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connection terminated" xml:space="preserve">
+        <source>Connection terminated</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>Yhteyden aikakatkaisu</target>
@@ -1164,11 +1278,6 @@
        <target>Kontakti on jo olemassa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
-        <source>Contact and all messages will be deleted - this cannot be undone!</source>
-        <target>Kontakti ja kaikki viestit poistetaan - tätä ei voi perua!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>Kontakti piilotettu:</target>
@@ -1219,6 +1328,10 @@
        <target>Ydinversio: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Correct name to %@?" xml:space="preserve">
+        <source>Correct name to %@?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>Luo</target>
@@ -1229,6 +1342,10 @@
        <target>Luo SimpleX-osoite</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Create a group using a random profile." xml:space="preserve">
+        <source>Create a group using a random profile.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>Luo osoite, jolla ihmiset voivat ottaa sinuun yhteyttä.</target>
@@ -1239,6 +1356,10 @@
        <target>Luo tiedosto</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Create group" xml:space="preserve">
+        <source>Create group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>Luo ryhmälinkki</target>
@@ -1251,6 +1372,7 @@
      </trans-unit>
      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
+        <target>Luo uusi profiili [työpöytäsovelluksessa](https://simplex.chat/downloads/). 💻</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1258,6 +1380,10 @@
        <target>Luo kertakutsulinkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Create profile" xml:space="preserve">
+        <source>Create profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>Luo jono</target>
@@ -1416,6 +1542,10 @@
        <target>Poista</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Delete %lld messages?" xml:space="preserve">
+        <source>Delete %lld messages?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>Poista kontakti</target>
@@ -1441,6 +1571,10 @@
        <target>Poista kaikki tiedostot</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete and notify contact" xml:space="preserve">
+        <source>Delete and notify contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>Poista arkisto</target>
@@ -1471,9 +1605,9 @@
        <target>Poista kontakti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?" xml:space="preserve">
-        <source>Delete contact?</source>
-        <target>Poista kontakti?</target>
+      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
+        <source>Delete contact?
+This cannot be undone!</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1616,6 +1750,18 @@
        <target>Kuvaus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Desktop address" xml:space="preserve">
+        <source>Desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
+        <source>Desktop app version %@ is not compatible with this app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Desktop devices" xml:space="preserve">
+        <source>Desktop devices</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Kehitä</target>
@@ -1706,18 +1852,17 @@
        <target>Katkaise</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Disconnect desktop?" xml:space="preserve">
+        <source>Disconnect desktop?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
+        <target>Löydä ryhmiä ja liity niihin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Display name" xml:space="preserve">
-        <source>Display name</source>
-        <target>Näyttönimi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Display name:" xml:space="preserve">
-        <source>Display name:</source>
-        <target>Näyttönimi:</target>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1889,6 +2034,14 @@
        <target>Salattu viesti: odottamaton virhe</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
+        <source>Encryption re-negotiation error</source>
+        <note>message decrypt error item</note>
+      </trans-unit>
+      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
+        <source>Encryption re-negotiation failed.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>Syötä pääsykoodi</target>
@@ -1899,6 +2052,10 @@
        <target>Anna oikea tunnuslause.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enter group name…" xml:space="preserve">
+        <source>Enter group name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Syötä tunnuslause…</target>
@@ -1914,6 +2071,10 @@
        <target>Syötä palvelin manuaalisesti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enter this device name…" xml:space="preserve">
+        <source>Enter this device name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>Kirjoita tervetuloviesti…</target>
@@ -1924,6 +2085,10 @@
        <target>Kirjoita tervetuloviesti... (valinnainen)</target>
        <note>placeholder</note>
      </trans-unit>
+      <trans-unit id="Enter your name…" xml:space="preserve">
+        <source>Enter your name…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>Virhe</target>
@@ -2197,6 +2362,10 @@
        <target>Poistu tallentamatta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Expand" xml:space="preserve">
+        <source>Expand</source>
+        <note>chat item action</note>
+      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>Vie tietokanta</target>
@@ -2227,6 +2396,10 @@
        <target>Nopea ja ei odotusta, kunnes lähettäjä on online-tilassa!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
+        <source>Faster joining and more reliable messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Suosikki</target>
@@ -2322,6 +2495,10 @@
        <target>Konsoliin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Found desktop" xml:space="preserve">
+        <source>Found desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>Ranskalainen käyttöliittymä</target>
@@ -2342,6 +2519,10 @@
        <target>Koko nimi:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
+        <source>Fully decentralized – visible only to members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>Täysin uudistettu - toimii taustalla!</target>
@@ -2362,6 +2543,14 @@
        <target>Ryhmä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Group already exists" xml:space="preserve">
+        <source>Group already exists</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Group already exists!" xml:space="preserve">
+        <source>Group already exists!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>Ryhmän näyttönimi</target>
@@ -2632,6 +2821,10 @@
        <target>Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Incognito groups" xml:space="preserve">
+        <source>Incognito groups</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Incognito-tila</target>
@@ -2662,6 +2855,10 @@
        <target>Yhteensopimaton tietokantaversio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Incompatible version" xml:space="preserve">
+        <source>Incompatible version</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>Väärä pääsykoodi</target>
@@ -2709,6 +2906,10 @@
        <target>Virheellinen yhteyslinkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid name!" xml:space="preserve">
+        <source>Invalid name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Virheellinen palvelinosoite!</target>
@@ -2800,16 +3001,33 @@
        <target>Liity ryhmään</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Join group?" xml:space="preserve">
+        <source>Join group?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>Liity incognito-tilassa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Join with current profile" xml:space="preserve">
+        <source>Join with current profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
+        <source>Join your group?
+This is your link for group %@!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>Liittyy ryhmään</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
+        <source>Keep the app open to use it from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Pidä kontaktisi</target>
@@ -2870,6 +3088,18 @@
        <target>Rajoitukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
+        <source>Link mobile and desktop apps! 🔗</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Linked desktop options" xml:space="preserve">
+        <source>Linked desktop options</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Linked desktops" xml:space="preserve">
+        <source>Linked desktops</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>Live-viesti!</target>
@@ -3020,6 +3250,10 @@
        <target>Viestit ja tiedostot</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
+        <source>Messages from %@ will be shown!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Siirretään tietokannan arkistoa…</target>
@@ -3214,6 +3448,10 @@
        <target>Ei vastaanotettuja tai lähetettyjä tiedostoja</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Not compatible!" xml:space="preserve">
+        <source>Not compatible!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Ilmoitukset</target>
@@ -3367,6 +3605,10 @@
        <target>Avaa keskustelukonsoli</target>
        <note>authentication reason</note>
      </trans-unit>
+      <trans-unit id="Open group" xml:space="preserve">
+        <source>Open group</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Avaa käyttäjäprofiilit</target>
@@ -3382,11 +3624,6 @@
        <target>Avataan tietokantaa…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
-        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
-        <target>Linkin avaaminen selaimessa voi heikentää yhteyden yksityisyyttä ja turvallisuutta. Epäluotetut SimpleX-linkit näkyvät punaisina.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING-määrä</target>
@@ -3432,6 +3669,10 @@
        <target>Liitä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Paste desktop address" xml:space="preserve">
+        <source>Paste desktop address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>Liitä kuva</target>
@@ -3577,6 +3818,14 @@
        <target>Profiilikuva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Profile name" xml:space="preserve">
+        <source>Profile name</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Profile name:" xml:space="preserve">
+        <source>Profile name:</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profiilin salasana</target>
@@ -3822,6 +4071,14 @@
        <target>Uudelleenneuvottele salaus?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Repeat connection request?" xml:space="preserve">
+        <source>Repeat connection request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Repeat join request?" xml:space="preserve">
+        <source>Repeat join request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Vastaa</target>
@@ -4007,6 +4264,10 @@
        <target>Skannaa QR-koodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
+        <source>Scan QR code from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>Skannaa koodi</target>
@@ -4226,6 +4487,10 @@
        <target>Palvelimet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Session code" xml:space="preserve">
+        <source>Session code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>Aseta 1 päivä</target>
@@ -4535,6 +4800,10 @@
        <target>Napauta painiketta </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to Connect" xml:space="preserve">
+        <source>Tap to Connect</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>Aktivoi profiili napauttamalla.</target>
@@ -4632,11 +4901,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Salaus toimii ja uutta salaussopimusta ei tarvita. Tämä voi johtaa yhteysvirheisiin!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
-        <source>The group is fully decentralized – it is visible only to the members.</source>
-        <target>Ryhmä on täysin hajautettu - se näkyy vain jäsenille.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="The hash of the previous message is different." xml:space="preserve">
        <source>The hash of the previous message is different.</source>
        <target>Edellisen viestin tarkiste on erilainen.</target>
@@ -4722,6 +4986,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tätä toimintoa ei voi kumota - profiilisi, kontaktisi, viestisi ja tiedostosi poistuvat peruuttamattomasti.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This device name" xml:space="preserve">
+        <source>This device name</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <target>Tässä ryhmässä on yli %lld jäsentä, lähetyskuittauksia ei lähetetä.</target>
@@ -4732,6 +5000,14 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tätä ryhmää ei enää ole olemassa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
+        <source>This is your own SimpleX address!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="This is your own one-time link!" xml:space="preserve">
+        <source>This is your own one-time link!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>Tämä asetus koskee nykyisen keskusteluprofiilisi viestejä *%@**.</target>
@@ -4747,6 +5023,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Kontaktisi voi muodostaa yhteyden skannaamalla QR-koodin tai käyttämällä sovelluksessa olevaa linkkiä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To hide unwanted messages." xml:space="preserve">
+        <source>To hide unwanted messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Uuden yhteyden luominen</target>
@@ -4828,6 +5108,18 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
        <target>Ääniviestiä ei voi tallentaa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Unblock" xml:space="preserve">
+        <source>Unblock</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unblock member" xml:space="preserve">
+        <source>Unblock member</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unblock member?" xml:space="preserve">
+        <source>Unblock member?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Odottamaton virhe: %@</target>
@@ -4890,6 +5182,14 @@ To connect, please ask your contact to create another connection link and check
 Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja tarkista, että verkkoyhteytesi on vakaa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Unlink" xml:space="preserve">
+        <source>Unlink</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Unlink desktop?" xml:space="preserve">
+        <source>Unlink desktop?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>Avaa</target>
@@ -4980,6 +5280,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käytä uusiin yhteyksiin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use from desktop" xml:space="preserve">
+        <source>Use from desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>Käytä iOS:n puhelujen käyttöliittymää</target>
@@ -5010,11 +5314,23 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käyttää SimpleX Chat -palvelimia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Verify code with desktop" xml:space="preserve">
+        <source>Verify code with desktop</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Verify connection" xml:space="preserve">
+        <source>Verify connection</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>Tarkista yhteyden suojaus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Verify connections" xml:space="preserve">
+        <source>Verify connections</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Tarkista turvakoodi</target>
@@ -5025,6 +5341,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Selaimella</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
+        <source>Via secure quantum resistant protocol.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Videopuhelu</target>
@@ -5075,6 +5395,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Ääniviesti…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Waiting for desktop..." xml:space="preserve">
+        <source>Waiting for desktop...</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Odottaa tiedostoa</target>
@@ -5175,6 +5499,35 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Olet jo muodostanut yhteyden %@:n kanssa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You are already connecting to %@." xml:space="preserve">
+        <source>You are already connecting to %@.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already in group %@." xml:space="preserve">
+        <source>You are already in group %@.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already joining the group %@." xml:space="preserve">
+        <source>You are already joining the group %@.</source>
+        <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>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
+        <source>You are already joining the group!
+Repeat join request?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>Olet yhteydessä palvelimeen, jota käytetään vastaanottamaan viestejä tältä kontaktilta.</target>
@@ -5270,6 +5623,15 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Sinua ei voitu todentaa; yritä uudelleen.</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>Sinulla ei ole keskusteluja</target>
@@ -5320,6 +5682,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Sinut yhdistetään ryhmään, kun ryhmän isännän laite on online-tilassa, odota tai tarkista myöhemmin!</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>
+        <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>Sinut yhdistetään, kun yhteyspyyntösi on hyväksytty, odota tai tarkista myöhemmin!</target>
@@ -5335,9 +5701,8 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Sinun on tunnistauduttava, kun käynnistät sovelluksen tai jatkat sen käyttöä 30 sekunnin tauon jälkeen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
-        <source>You will join a group this link refers to and connect to its group members.</source>
-        <target>Liityt ryhmään, johon tämä linkki viittaa, ja muodostat yhteyden sen ryhmän jäseniin.</target>
+      <trans-unit id="You will connect to all group members." xml:space="preserve">
+        <source>You will connect to all group members.</source>
        <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">
@@ -5405,11 +5770,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Keskustelut-tietokantasi ei ole salattu - aseta tunnuslause sen salaamiseksi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
-        <source>Your chat profile will be sent to group members</source>
-        <target>Keskusteluprofiilisi lähetetään ryhmän jäsenille</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Keskusteluprofiilisi</target>
@@ -5464,6 +5824,10 @@ Voit muuttaa sitä Asetuksista.</target>
        <target>Yksityisyytesi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile" xml:space="preserve">
+        <source>Your profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <target>Profiilisi **%@** jaetaan.</target>
@@ -5556,11 +5920,19 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>aina</target>
        <note>pref value</note>
      </trans-unit>
+      <trans-unit id="and %lld other events" xml:space="preserve">
+        <source>and %lld other events</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>äänipuhelu (ei e2e-salattu)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="author" xml:space="preserve">
+        <source>author</source>
+        <note>member role</note>
+      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>virheellinen viestin tunniste</target>
@@ -5571,6 +5943,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>virheellinen viestin tarkiste</target>
        <note>integrity error chat item</note>
      </trans-unit>
+      <trans-unit id="blocked" xml:space="preserve">
+        <source>blocked</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>lihavoitu</target>
@@ -5740,6 +6116,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>poistettu</target>
        <note>deleted chat item</note>
      </trans-unit>
+      <trans-unit id="deleted contact" xml:space="preserve">
+        <source>deleted contact</source>
+        <note>rcv direct event chat item</note>
+      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>poistettu ryhmä</target>
@@ -6024,7 +6404,8 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <source>off</source>
        <target>pois</target>
        <note>enabled status
-   group pref value</note>
+   group pref value
+   time to disappear</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6041,11 +6422,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>päällä</target>
        <note>group pref value</note>
      </trans-unit>
-      <trans-unit id="or chat with the developers" xml:space="preserve">
-        <source>or chat with the developers</source>
-        <target>tai keskustele kehittäjien kanssa</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>omistaja</target>
@@ -6135,6 +6511,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>päivitetty ryhmäprofiili</target>
        <note>rcv group event chat item</note>
      </trans-unit>
+      <trans-unit id="v%@" xml:space="preserve">
+        <source>v%@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6272,6 +6652,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>SimpleX käyttää Face ID:tä paikalliseen todennukseen</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
+      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
+        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
+        <note>Privacy - Local Network Usage Description</note>
+      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX tarvitsee mikrofonia ääni- ja videopuheluita ja ääniviestien tallentamista varten.</target>
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,6 +4,8 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
+/* Privacy - Local Network Usage Description */
+"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
--- a/Show More
+++ b/Show More