Merge branch 'master' into av/rtl-animation

desktop: catch Toast exception (#3028 )
ios: update chat_read_file (#3037 )
2023-09-07 22:48:01 +01:00 · 2023-09-07 22:45:00 +01:00 · 2023-09-07 22:43:51 +01:00 · 2023-09-07 20:32:47 +01:00 · 2023-09-07 20:18:43 +01:00 · 2023-09-07 13:44:37 +01:00
589 changed files with 59840 additions and 14150 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,15 +52,19 @@ jobs:
          - os: ubuntu-20.04
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-20_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
          - os: ubuntu-22.04
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-22_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
+            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
          - os: windows-latest
            cache_path: C:/cabal
            asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
    steps:
      - name: Configure pagefile (Windows)
        if: matrix.os == 'windows-latest'
@@ -99,6 +103,10 @@ jobs:
          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
          echo "    flags: +openssl"                                        >> cabal.project.local

+      - name: Install AppImage dependencies
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        run: sudo apt install -y desktop-file-utils
+
      - name: Install pkg-config for Mac
        if: matrix.os == 'macos-latest'
        run: brew install pkg-config
@@ -111,23 +119,88 @@ jobs:
          echo "package direct-sqlcipher" >> cabal.project.local
          echo "    flags: +openssl"      >> cabal.project.local

-      - name: Unix build
-        id: unix_build
+      - name: Unix build CLI
+        id: unix_cli_build
        if: matrix.os != 'windows-latest'
        shell: bash
        run: |
          cabal build --enable-tests
          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"

-      - name: Unix upload binary to release
+      - name: Unix upload CLI binary 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.unix_build.outputs.bin_path }}
+          file: ${{ steps.unix_cli_build.outputs.bin_path }}
          asset_name: ${{ matrix.asset_name }}
          tag: ${{ github.ref }}

+      - name: Setup Java
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Linux build desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-linux.sh
+          cd apps/multiplatform
+          ./gradlew packageDeb
+          echo "::set-output name=package_path::$(echo $PWD/release/main/deb/simplex_*_amd64.deb)"
+      
+      - name: Linux make AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        shell: bash
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+          echo "::set-output name=appimage_path::$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)"
+
+      - name: Mac build desktop
+        id: mac_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        shell: bash
+        env:
+          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
+          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
+          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
+        run: |
+          scripts/desktop/build-desktop-mac-ci.sh
+          echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)"
+
+      - name: Linux upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Linux upload AppImage to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          asset_name: simplex-desktop-x86_64.AppImage
+          tag: ${{ github.ref }}
+
+      - name: Mac upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.mac_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
      - name: Unix test
        if: matrix.os != 'windows-latest'
        timeout-minutes: 30
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ website/src/docs/
 website/translations.json
 website/src/img/images/
 website/src/images/
+website/src/js/lottie.min.js
 # Generated files
 website/package/generated*

--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -6,27 +6,63 @@ If you believe that some of the clauses in this document are not aligned with ou

 ## Privacy Policy

-SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and encryption to provide secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the servers via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack).

-SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol allowing to establish private connections without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 ### Information you provide

-We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+#### User profiles

-Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
+We do not store user profiles. The profile you create in the app is local to your device.

-Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+
+#### Messages and Files
+
+SimpleX Chat cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 256kb, 1mb or 8mb via all or some of the configured file servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.
+
+Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.
+
+The messages are permanently removed from the preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
+
+The files are stored on file (XFTP) servers for the time configured in the file servers you use (48 hours for preset file servers).
+
+If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).
+
+#### Connections with other users
+
+When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or the servers that you configured in the app, in case it allows such configuration. SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default.
+
+At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
+
+#### iOS Push Notifications
+
+When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
+
+Notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers.
+
+It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot observe it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+
+#### Another information stored on the servers

 Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.

-User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
+#### SimpleX Directory Service
+
+[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
+
+#### User Support.
+
+If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.

 ### Information we may share

 We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.

-We use Third party to provide email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according their privacy policies and terms of service.
+We use a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to their privacy policies and terms of service.

 The cases when SimpleX Chat may need to share the data we temporarily store on the servers:

@@ -39,19 +75,19 @@ At the time of updating this document, we have never provided or have been reque

 ### Updates

-We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
+We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.

-Please also read our Terms of Service.
+Please also read our Terms of Service below.

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

 ## Terms of Service

-You accept to our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
+You accept our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").

 **Minimal age**. You must be at least 13 years old to use our Services. The minimum age to use our Services without parental approval may be higher in your country.

-**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
+**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.

 **Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.

@@ -67,15 +103,17 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a

 **Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.

-**Storing the messages on the device**. Currently the messages are stored in the database on your device without encryption. It means that if you make a backup of the app and store it unecrypted, the backup provider may be able to access the messages.
+**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.
+
+**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.

 **No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.

 **Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.

-**Your Rights**. You own the mesasges and information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices.
+**Your Rights**. You own the messages and the information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the app.

-**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 licence](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
+**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)

 **SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.

@@ -93,4 +131,4 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a

 **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.

-Updated November 8, 2022
+Updated August 17, 2023
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ You also can:
 - criticize the app, and make comparisons with other messengers.
 - share new messengers you think could be interesting for privacy, as long as you don't spam.
 - share some privacy related publications, infrequently.
- having preliminary approved with the admin in direct message, share the link to a group you created.
+- having preliminary approved with the admin in direct message, share the link to a group you created, but only once. Once the group has more than 10 members it can be submitted to [SimpleX Directory Service](./docs/DIRECTORY.md) where the new users will be able to discover it.

 You must:
 - be polite to other users
@@ -79,6 +79,8 @@ There are groups in other languages, that we have the apps interface translated

 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.

+You can also join the group created by other users by searching for them via the [directory service](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion). We are not responsible for the content shared in these groups.
+
 ## Make a private connection

 You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
@@ -103,16 +105,18 @@ Join our translators to help SimpleX grow!
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 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>-|||
 |🇨🇿 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/)||
 |🇫🇷 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)|
 |🇮🇹 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/it/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|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/)|||
 |🇳🇱 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/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
+|🇵🇱 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/)|||
 |🇨🇳 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!
@@ -140,11 +144,14 @@ It is possible to donate via:

 - [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
 - [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- USDT:
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L

 Thank you,

@@ -164,7 +171,7 @@ SimpleX Chat founder
 - [News and updates](#news-and-updates)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
+- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -207,6 +214,8 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent updates:

+[July 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).
@@ -253,7 +262,7 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p

 See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).

-## Privacy: technical details and limitations
+## Privacy and security: technical details and limitations

 SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.

@@ -272,12 +281,15 @@ What is already implemented:
 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.

-We plan to add soon:
+We plan to add:

-1. Automatic message queue rotation. 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).
-2. 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`.
-3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+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.
+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.

 ## For developers

@@ -337,8 +349,8 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message reactions
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
+- ✅ Message delivery confirmation (with sender opt-out per contact).
 - 🏗 Desktop client.
- 🏗 Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Local app files encryption.
--- a/apps/ios/Shared/AppDelegate.swift
+++ b/apps/ios/Shared/AppDelegate.swift
@@ -61,7 +61,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
           m.notificationMode != .off {
            if let verification = ntfData["verification"] as? String,
               let nonce = ntfData["nonce"] as? String {
-                if let token = ChatModel.shared.deviceToken {
+                if let token = m.deviceToken {
                    logger.debug("AppDelegate: didReceiveRemoteNotification: verification, confirming \(verification)")
                    Task {
                        do {
@@ -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 {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                    receiveMessages(completionHandler)
                } else {
                    completionHandler(.noData)
@@ -95,7 +95,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
    }

    func applicationWillTerminate(_ application: UIApplication) {
-        logger.debug("AppDelegate: applicationWillTerminate")
+        logger.debug("DEBUGGING: AppDelegate: applicationWillTerminate")
        ChatModel.shared.filesToDelete.forEach {
            removeFile($0)
        }
--- a/apps/ios/Shared/ContentView.swift
+++ b/apps/ios/Shared/ContentView.swift
@@ -28,6 +28,17 @@ struct ContentView: View {
    @State private var showWhatsNew = false
    @State private var showChooseLAMode = false
    @State private var showSetPasscode = false
+    @State private var chatListActionSheet: ChatListActionSheet? = nil
+
+    private enum ChatListActionSheet: Identifiable {
+        case connectViaUrl(action: ConnReqType, link: String)
+
+        var id: String {
+            switch self {
+            case .connectViaUrl: return "connectViaUrl \(link)"
+            }
+        }
+    }

    var body: some View {
        ZStack {
@@ -80,6 +91,11 @@ struct ContentView: View {
            if case .onboardingComplete = step,
               chatModel.currentUser != nil {
                mainView()
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
+                    }
+                }
            } else {
                OnboardingView(onboarding: step)
            }
@@ -132,10 +148,15 @@ struct ContentView: View {
                    }
                }
                prefShowLANotice = true
+                connectViaUrl()
            }
+            .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
            .sheet(isPresented: $showWhatsNew) {
                WhatsNewView()
            }
+            if chatModel.setDeliveryReceipts {
+                SetDeliveryReceiptsView()
+            }
            IncomingCallView()
        }
        .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
@@ -176,10 +197,13 @@ struct ContentView: View {
    }

    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
        if !prefPerformLA {
            userAuthorized = true
        } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
            dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
                chatModel.chatId = nil
                justAuthenticate()
            }
@@ -190,7 +214,7 @@ struct ContentView: View {
        userAuthorized = false
        let laMode = privacyLocalAuthModeDefault.get()
        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-            logger.debug("authenticate callback: \(String(describing: laResult))")
+            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
            switch (laResult) {
            case .success:
                userAuthorized = true
@@ -259,36 +283,38 @@ struct ContentView: View {
            secondaryButton: .cancel()
        )
    }
-}

-func connectViaUrl() {
-    let m = ChatModel.shared
-    if let url = m.appOpenUrl {
-        m.appOpenUrl = nil
-        AlertManager.shared.showAlert(connectViaUrlAlert(url))
+    func connectViaUrl() {
+        let m = ChatModel.shared
+        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)
+            } else {
+                AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
+            }
+        }
    }
-}

-func connectViaUrlAlert(_ url: URL) -> Alert {
-    var path = url.path
-    logger.debug("ChatListView.connectViaUrlAlert 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)")
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
        let title: LocalizedStringKey
-        if case .contact = action { title = "Connect via contact link?" }
-        else { title = "Connect via one-time link?" }
-        return Alert(
+        switch action {
+        case .contact: title = "Connect via contact link"
+        case .invitation: title = "Connect via one-time link"
+        }
+        return ActionSheet(
            title: Text(title),
-            message: Text("Your profile will be sent to the contact that you received this link from"),
-            primaryButton: .default(Text("Connect")) {
-                connectViaLink(link)
-            },
-            secondaryButton: .cancel()
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
+                .cancel()
+            ]
        )
-    } else {
-        return Alert(title: Text("Error: URL is invalid"))
    }
 }

--- a/apps/ios/Shared/Model/AudioRecPlay.swift
+++ b/apps/ios/Shared/Model/AudioRecPlay.swift
@@ -103,9 +103,15 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        self.onFinishPlayback = onFinishPlayback
    }

-    func start(fileName: String, at: TimeInterval?) {
-        let url = getAppFilePath(fileName)
-        audioPlayer = try? AVAudioPlayer(contentsOf: url)
+    func start(fileSource: CryptoFile, at: TimeInterval?) {
+        let url = getAppFilePath(fileSource.filePath)
+        if let cfArgs = fileSource.cryptoArgs {
+            if let data = try? readCryptoFile(path: url.path, cryptoArgs: cfArgs) {
+                audioPlayer = try? AVAudioPlayer(data: data)
+            }
+        } else {
+            audioPlayer = try? AVAudioPlayer(contentsOf: url)
+        }
        audioPlayer?.delegate = self
        audioPlayer?.prepareToPlay()
        if let at = at {
--- a/apps/ios/Shared/Model/BGManager.swift
+++ b/apps/ios/Shared/Model/BGManager.swift
@@ -34,6 +34,10 @@ class BGManager {
    }

    func schedule() {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.schedule: disabled")
+            return
+        }
        logger.debug("BGManager.schedule")
        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
@@ -45,6 +49,10 @@ class BGManager {
    }

    private func handleRefresh(_ task: BGAppRefreshTask) {
+        if !ChatModel.shared.ntfEnableLocal {
+            logger.debug("BGManager.handleRefresh: disabled")
+            return
+        }
        logger.debug("BGManager.handleRefresh")
        schedule()
        if appStateGroupDefault.get().inactive {
--- a/apps/ios/Shared/Model/ChatModel.swift
+++ b/apps/ios/Shared/Model/ChatModel.swift
@@ -11,8 +11,41 @@ import Combine
 import SwiftUI
 import SimpleXChat

+actor TerminalItems {
+    private var terminalItems: [TerminalItem] = []
+
+    static let shared = TerminalItems()
+
+    func items() -> [TerminalItem] {
+        terminalItems
+    }
+
+    func add(_ item: TerminalItem) async {
+        addTermItem(&terminalItems, item)
+        let m = ChatModel.shared
+        if m.showingTerminal {
+            await MainActor.run {
+                addTermItem(&m.terminalItems, item)
+            }
+        }
+    }
+
+    func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
+        await add(.cmd(start, cmd))
+        await add(.resp(.now, resp))
+    }
+}
+
+private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
+    if items.count >= 200 {
+        items.removeFirst()
+    }
+    items.append(item)
+}
+
 final class ChatModel: ObservableObject {
    @Published var onboardingStage: OnboardingStage?
+    @Published var setDeliveryReceipts = false
    @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
    @Published var currentUser: User?
    @Published var users: [UserInfo] = []
@@ -32,6 +65,7 @@ final class ChatModel: ObservableObject {
    @Published var chatToTop: String?
    @Published var groupMembers: [GroupMember] = []
    // items in the terminal view
+    @Published var showingTerminal = false
    @Published var terminalItems: [TerminalItem] = []
    @Published var userAddress: UserContactLink?
    @Published var chatItemTTL: ChatItemTTL = .none
@@ -41,10 +75,9 @@ final class ChatModel: ObservableObject {
    @Published var tokenRegistered = false
    @Published var tokenStatus: NtfTknStatus?
    @Published var notificationMode = NotificationsMode.off
-    @Published var notificationPreview: NotificationPreviewMode? = ntfPreviewModeGroupDefault.get()
-    @Published var incognito: Bool = incognitoGroupDefault.get()
+    @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
    // pending notification actions
-    @Published var ntfContactRequest: ChatId?
+    @Published var ntfContactRequest: NTFContactRequest?
    @Published var ntfCallInvitationAction: (ChatId, NtfCallAction)?
    // current WebRTC call
    @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
@@ -68,6 +101,14 @@ final class ChatModel: ObservableObject {

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

+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
+    }
+
+    var ntfEnablePeriodic: Bool {
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+    }
+
    func getUser(_ userId: Int64) -> User? {
        currentUser?.userId == userId
        ? currentUser
@@ -454,18 +495,18 @@ final class ChatModel: ObservableObject {
        }
    }

-    func increaseUnreadCounter(user: User) {
+    func increaseUnreadCounter(user: any UserLike) {
        changeUnreadCounter(user: user, by: 1)
        NtfManager.shared.incNtfBadgeCount()
    }

-    func decreaseUnreadCounter(user: User, by: Int = 1) {
+    func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
        changeUnreadCounter(user: user, by: -by)
        NtfManager.shared.decNtfBadgeCount(by: by)
    }

-    private func changeUnreadCounter(user: User, by: Int) {
-        if let i = users.firstIndex(where: { $0.user.id == user.id }) {
+    private func changeUnreadCounter(user: any UserLike, by: Int) {
+        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
            users[i].unreadCount += by
        }
    }
@@ -475,14 +516,27 @@ final class ChatModel: ObservableObject {
            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
    }

-    func getPrevChatItem(_ ci: ChatItem) -> ChatItem? {
-        if let i = getChatItemIndex(ci), i < reversedChatItems.count - 1  {
-            return reversedChatItems[i + 1]
+    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
+        guard var i = getChatItemIndex(ci) else { return [] }
+        var ns: [String] = []
+        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
+            ns.append(m.displayName)
+            i += 1
+        }
+        return 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
+            )
        } else {
-            return nil
+            return (nil, nil)
        }
    }
-    
+
    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
            popChat_(i)
@@ -571,13 +625,11 @@ final class ChatModel: ObservableObject {
    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
    }
+}

-    func addTerminalItem(_ item: TerminalItem) {
-        if terminalItems.count >= 500 {
-            terminalItems.remove(at: 0)
-        }
-        terminalItems.append(item)
-    }
+struct NTFContactRequest {
+    var incognito: Bool
+    var chatId: String
 }

 struct UnreadChatItemCounts {
--- a/apps/ios/Shared/Model/ImageUtils.swift
+++ b/apps/ios/Shared/Model/ImageUtils.swift
@@ -11,42 +11,43 @@ import SimpleXChat
 import SwiftUI
 import AVKit

-func getLoadedFilePath(_ file: CIFile?) -> String? {
-    if let fileName = getLoadedFileName(file) {
-        return getAppFilePath(fileName).path
-    }
-    return nil
-}
-
-func getLoadedFileName(_ file: CIFile?) -> String? {
-    if let file = file,
-       file.loaded,
-       let fileName = file.filePath {
-        return fileName
+func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
+    if let file = file, file.loaded {
+        return file.fileSource
    }
    return nil
 }

 func getLoadedImage(_ file: CIFile?) -> UIImage? {
-    let loadedFilePath = getLoadedFilePath(file)
-    if let loadedFilePath = loadedFilePath, let fileName = file?.filePath {
-        let filePath = getAppFilePath(fileName)
+    if let fileSource = getLoadedFileSource(file) {
+        let filePath = getAppFilePath(fileSource.filePath)
        do {
-            let data = try Data(contentsOf: filePath)
+            let data = try getFileData(filePath, fileSource.cryptoArgs)
            let img = UIImage(data: data)
-            try img?.setGifFromData(data, levelOfIntegrity: 1.0)
-            return img
+            do {
+                try img?.setGifFromData(data, levelOfIntegrity: 1.0)
+                return img
+            } catch {
+                return UIImage(data: data)
+            }
        } catch {
-            return UIImage(contentsOfFile: loadedFilePath)
+            return nil
        }
    }
    return nil
 }

+func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
+    if let cfArgs = cfArgs {
+        return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
+    } else {
+        return try Data(contentsOf: path)
+    }
+}
+
 func getLoadedVideo(_ file: CIFile?) -> URL? {
-    let loadedFilePath = getLoadedFilePath(file)
-    if loadedFilePath != nil, let fileName = file?.filePath {
-        let filePath = getAppFilePath(fileName)
+    if let fileSource = getLoadedFileSource(file) {
+        let filePath = getAppFilePath(fileSource.filePath)
        if FileManager.default.fileExists(atPath: filePath.path) {
            return filePath
        }
@@ -54,18 +55,18 @@ func getLoadedVideo(_ file: CIFile?) -> URL? {
    return nil
 }

-func saveAnimImage(_ image: UIImage) -> String? {
+func saveAnimImage(_ image: UIImage) -> CryptoFile? {
    let fileName = generateNewFileName("IMG", "gif")
    guard let imageData = image.imageData else { return nil }
-    return saveFile(imageData, fileName)
+    return saveFile(imageData, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
 }

-func saveImage(_ uiImage: UIImage) -> String? {
+func saveImage(_ uiImage: UIImage) -> CryptoFile? {
    let hasAlpha = imageHasAlpha(uiImage)
    let ext = hasAlpha ? "png" : "jpg"
    if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
        let fileName = generateNewFileName("IMG", ext)
-        return saveFile(imageDataResized, fileName)
+        return saveFile(imageDataResized, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
    }
    return nil
 }
@@ -157,13 +158,19 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
    return false
 }

-func saveFileFromURL(_ url: URL) -> String? {
-    let savedFile: String?
+func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
+    let savedFile: CryptoFile?
    if url.startAccessingSecurityScopedResource() {
        do {
-            let fileData = try Data(contentsOf: url)
            let fileName = uniqueCombine(url.lastPathComponent)
-            savedFile = saveFile(fileData, fileName)
+            let toPath = getAppFilePath(fileName).path
+            if encrypted {
+                let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: toPath)
+                savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
+            } else {
+                try FileManager.default.copyItem(atPath: url.path, toPath: toPath)
+                savedFile = CryptoFile.plain(fileName)
+            }
        } catch {
            logger.error("FileUtils.saveFileFromURL error: \(error.localizedDescription)")
            savedFile = nil
@@ -176,18 +183,16 @@ func saveFileFromURL(_ url: URL) -> String? {
    return savedFile
 }

-func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
-    let savedFile: String?
+func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    do {
        let fileName = uniqueCombine(url.lastPathComponent)
        try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
        ChatModel.shared.filesToDelete.remove(url)
-        savedFile = fileName
+        return CryptoFile.plain(fileName)
    } catch {
-        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
-        savedFile = nil
+        logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
+        return nil
    }
-    return savedFile
 }

 func generateNewFileName(_ prefix: String, _ ext: String) -> String {
@@ -288,4 +293,4 @@ extension UIImage {
        }
        return self
    }
-}
+}
--- a/apps/ios/Shared/Model/NtfManager.swift
+++ b/apps/ios/Shared/Model/NtfManager.swift
@@ -12,6 +12,7 @@ import UIKit
 import SimpleXChat

 let ntfActionAcceptContact = "NTF_ACT_ACCEPT_CONTACT"
+let ntfActionAcceptContactIncognito = "NTF_ACT_ACCEPT_CONTACT_INCOGNITO"
 let ntfActionAcceptCall = "NTF_ACT_ACCEPT_CALL"
 let ntfActionRejectCall = "NTF_ACT_REJECT_CALL"

@@ -41,12 +42,13 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
           userId != chatModel.currentUser?.userId {
            changeActiveUser(userId, viewPwd: nil)
        }
-        if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
+        if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
           let chatId = content.userInfo["chatId"] as? String {
+            let incognito = action == ntfActionAcceptContactIncognito
            if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                Task { await acceptContactRequest(contactRequest) }
+                Task { await acceptContactRequest(incognito: incognito, contactRequest: contactRequest) }
            } else {
-                chatModel.ntfContactRequest = chatId
+                chatModel.ntfContactRequest = NTFContactRequest(incognito: incognito, chatId: chatId)
            }
        } else if let (chatId, ntfAction) = ntfCallAction(content, action) {
            if let invitation = chatModel.callInvitations.removeValue(forKey: chatId) {
@@ -134,11 +136,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        UNUserNotificationCenter.current().setNotificationCategories([
            UNNotificationCategory(
                identifier: ntfCategoryContactRequest,
-                actions: [UNNotificationAction(
-                    identifier: ntfActionAcceptContact,
-                    title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
-                    options: .foreground
-                )],
+                actions: [
+                    UNNotificationAction(
+                        identifier: ntfActionAcceptContact,
+                        title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
+                        options: .foreground
+                    ), UNNotificationAction(
+                        identifier: ntfActionAcceptContactIncognito,
+                        title: NSLocalizedString("Accept incognito", comment: "accept contact request via notification"),
+                        options: .foreground
+                    )
+                ],
                intentIdentifiers: [],
                hiddenPreviewsBodyPlaceholder: NSLocalizedString("New contact request", comment: "notification")
            ),
@@ -203,17 +211,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        center.delegate = self
    }

-    func notifyContactRequest(_ user: User, _ contactRequest: UserContactRequest) {
+    func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
        logger.debug("NtfManager.notifyContactRequest")
        addNotification(createContactRequestNtf(user, contactRequest))
    }

-    func notifyContactConnected(_ user: User, _ contact: Contact) {
+    func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
        logger.debug("NtfManager.notifyContactConnected")
        addNotification(createContactConnectedNtf(user, contact))
    }

-    func notifyMessageReceived(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
        logger.debug("NtfManager.notifyMessageReceived")
        if cInfo.ntfsEnabled {
            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -94,9 +94,8 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
    if case let .response(_, json) = resp {
        logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
    }
-    DispatchQueue.main.async {
-        ChatModel.shared.addTerminalItem(.cmd(start, cmd.obfuscated))
-        ChatModel.shared.addTerminalItem(.resp(.now, resp))
+    Task {
+        await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
    }
    return resp
 }
@@ -159,6 +158,24 @@ func apiSetActiveUserAsync(_ userId: Int64, viewPwd: String?) async throws -> Us
    throw r
 }

+func apiSetAllContactReceipts(enable: Bool) async throws {
+    let r = await chatSendCmd(.setAllContactReceipts(enable: enable))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiSetUserContactReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
+    let r = await chatSendCmd(.apiSetUserContactReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiSetUserGroupReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
+    let r = await chatSendCmd(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
    try await setUserPrivacy_(.apiHideUser(userId: userId, viewPwd: viewPwd))
 }
@@ -234,12 +251,6 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
    throw r
 }

-func apiSetIncognito(incognito: Bool) throws {
-    let r = chatSendCmdSync(.setIncognito(incognito: incognito))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
    try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -304,17 +315,23 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
    let chatModel = ChatModel.shared
    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
    let r: ChatResponse
    if type == .direct {
-        var cItem: ChatItem!
-        let endTask = beginBGTask({ if cItem != nil { chatModel.messageDelivery.removeValue(forKey: cItem.id) } })
+        var cItem: ChatItem? = nil
+        let endTask = beginBGTask({
+            if let cItem = cItem {
+                DispatchQueue.main.async {
+                    chatModel.messageDelivery.removeValue(forKey: cItem.id)
+                }
+            }
+        })
        r = await chatSendCmd(cmd, bgTask: false)
        if case let .newChatItem(_, aChatItem) = r {
            cItem = aChatItem.chatItem
-            chatModel.messageDelivery[cItem.id] = endTask
+            chatModel.messageDelivery[aChatItem.chatItem.id] = endTask
            return cItem
        }
        if let networkErrorAlert = networkErrorAlert(r) {
@@ -546,19 +563,25 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
    return nil
 }

-func apiAddContact() async -> String? {
+func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiAddContact: no current user")
        return nil
    }
-    let r = await chatSendCmd(.apiAddContact(userId: userId), bgTask: false)
-    if case let .invitation(_, connReqInvitation) = r { return connReqInvitation }
+    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
+    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
    AlertManager.shared.showAlert(connectionErrorAlert(r))
    return nil
 }

-func apiConnect(connReq: String) async -> ConnReqType? {
-    let (connReqType, alert) = await apiConnect_(connReq: connReq)
+func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
+    let r = await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
+    if case let .connectionIncognitoUpdated(_, toConnection) = r { return toConnection }
+    throw r
+}
+
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
    if let alert = alert {
        AlertManager.shared.showAlert(alert)
        return nil
@@ -567,12 +590,12 @@ func apiConnect(connReq: String) async -> ConnReqType? {
    }
 }

-func apiConnect_(connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, 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, connReq: connReq))
+    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
    switch r {
    case .sentConfirmation: return (.invitation, nil)
    case .sentInvitation: return (.contact, nil)
@@ -668,12 +691,12 @@ func apiListContacts() throws -> [Contact] {
    throw r
 }

-func apiUpdateProfile(profile: Profile) async throws -> Profile? {
+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 let .userProfileUpdated(_, _, toProfile): return toProfile
+    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
    default: throw r
    }
 }
@@ -683,7 +706,7 @@ func apiSetProfileAddress(on: Bool) async throws -> User? {
    let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
    switch r {
    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(user, _, _): return user
+    case let .userProfileUpdated(user, _, _, _): return user
    default: throw r
    }
 }
@@ -748,8 +771,8 @@ func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContac
    }
 }

-func apiAcceptContactRequest(contactReqId: Int64) async -> Contact? {
-    let r = await chatSendCmd(.apiAcceptContact(contactReqId: contactReqId))
+func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Contact? {
+    let r = await chatSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
    let am = AlertManager.shared

    if case let .acceptingContactRequest(_, contact) = r { return contact }
@@ -784,29 +807,35 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
    try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }

-func receiveFile(user: User, fileId: Int64) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId) {
-        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
+func receiveFile(user: any UserLike, fileId: Int64, encrypted: Bool, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: encrypted, auto: auto) {
+        await chatItemSimpleUpdate(user, chatItem)
    }
 }

-func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
+func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
    let am = AlertManager.shared
    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
    if case .rcvFileAcceptedSndCancelled = r {
-        am.showAlertMsg(
-            title: "Cannot receive file",
-            message: "Sender cancelled file transfer."
-        )
+        logger.debug("apiReceiveFile error: sender cancelled file transfer")
+        if !auto {
+            am.showAlertMsg(
+                title: "Cannot receive file",
+                message: "Sender cancelled file transfer."
+            )
+        }
    } else if let networkErrorAlert = networkErrorAlert(r) {
+        logger.error("apiReceiveFile network error: \(String(describing: r))")
        am.showAlert(networkErrorAlert)
    } else {
-        logger.error("apiReceiveFile error: \(String(describing: r))")
-        switch r {
-        case .chatCmdError(_, .error(.fileAlreadyReceiving)):
+        switch chatError(r) {
+        case .fileCancelled:
+            logger.debug("apiReceiveFile ignoring fileCancelled error")
+        case .fileAlreadyReceiving:
            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
        default:
+            logger.error("apiReceiveFile error: \(String(describing: r))")
            am.showAlertMsg(
                title: "Error receiving file",
                message: "Error: \(String(describing: r))"
@@ -818,7 +847,7 @@ func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {

 func cancelFile(user: User, fileId: Int64) async {
    if let chatItem = await apiCancelFile(fileId: fileId) {
-        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
+        await chatItemSimpleUpdate(user, chatItem)
        cleanupFile(chatItem)
    }
 }
@@ -851,8 +880,8 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
    }
 }

-func acceptContactRequest(_ contactRequest: UserContactRequest) async {
-    if let contact = await apiAcceptContactRequest(contactReqId: contactRequest.apiId) {
+func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
+    if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
        let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
        DispatchQueue.main.async { ChatModel.shared.replaceChat(contactRequest.id, chat) }
    }
@@ -1086,11 +1115,11 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
    try setXFTPConfig(getXFTPCfg())
-    try apiSetIncognito(incognito: incognitoGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
    if m.currentUser == nil {
        onboardingStageDefault.set(.step1_SimpleXInfo)
+        privacyDeliveryReceiptsSet.set(true)
        m.onboardingStage = .step1_SimpleXInfo
    } else if start {
        try startChat(refreshInvitations: refreshInvitations)
@@ -1120,6 +1149,9 @@ func startChat(refreshInvitations: Bool = true) throws {
            m.onboardingStage = [.step1_SimpleXInfo, .step2_CreateProfile].contains(savedOnboardingStage) && m.users.count == 1
                                ? .step3_CreateSimpleXAddress
                                : savedOnboardingStage
+            if m.onboardingStage == .onboardingComplete && !privacyDeliveryReceiptsSet.get() {
+                m.setDeliveryReceipts = true
+            }
        }
    }
    ChatReceiver.shared.start()
@@ -1217,38 +1249,50 @@ class ChatReceiver {
 }

 func processReceivedMsg(_ res: ChatResponse) async {
+    Task {
+        await TerminalItems.shared.add(.resp(.now, res))
+    }
    let m = ChatModel.shared
-    await MainActor.run {
-        m.addTerminalItem(.resp(.now, res))
-        logger.debug("processReceivedMsg: \(res.responseType)")
-        switch res {
-        case let .newContactConnection(user, connection):
-            if active(user) {
+    logger.debug("processReceivedMsg: \(res.responseType)")
+    switch res {
+    case let .newContactConnection(user, connection):
+        if active(user) {
+            await MainActor.run {
                m.updateContactConnection(connection)
            }
-        case let .contactConnectionDeleted(user, connection):
-            if active(user) {
+        }
+    case let .contactConnectionDeleted(user, connection):
+        if active(user) {
+            await MainActor.run {
                m.removeChat(connection.id)
            }
-        case let .contactConnected(user, contact, _):
-            if active(user) && contact.directOrUsed {
+        }
+    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 contact.directOrUsed {
-                NtfManager.shared.notifyContactConnected(user, contact)
-            }
+        }
+        if contact.directOrUsed {
+            NtfManager.shared.notifyContactConnected(user, contact)
+        }
+        await MainActor.run {
            m.setContactNetworkStatus(contact, .connected)
-        case let .contactConnecting(user, contact):
-            if active(user) && contact.directOrUsed {
+        }
+    case let .contactConnecting(user, contact):
+        if active(user) && contact.directOrUsed {
+            await MainActor.run {
                m.updateContact(contact)
                m.dismissConnReqView(contact.activeConn.id)
                m.removeChat(contact.activeConn.id)
            }
-        case let .receivedContactRequest(user, contactRequest):
-            if active(user) {
-                let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
+        }
+    case let .receivedContactRequest(user, contactRequest):
+        if active(user) {
+            let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
+            await MainActor.run {
                if m.hasChat(contactRequest.id) {
                    m.updateChatInfo(cInfo)
                } else {
@@ -1258,252 +1302,312 @@ func processReceivedMsg(_ res: ChatResponse) async {
                    ))
                }
            }
-            NtfManager.shared.notifyContactRequest(user, contactRequest)
-        case let .contactUpdated(user, toContact):
-            if active(user) && m.hasChat(toContact.id) {
+        }
+        NtfManager.shared.notifyContactRequest(user, contactRequest)
+    case let .contactUpdated(user, toContact):
+        if active(user) && m.hasChat(toContact.id) {
+            await MainActor.run {
                let cInfo = ChatInfo.direct(contact: toContact)
                m.updateChatInfo(cInfo)
            }
-        case let .contactsMerged(user, intoContact, mergedContact):
-            if active(user) && m.hasChat(mergedContact.id) {
+        }
+    case let .contactsMerged(user, intoContact, mergedContact):
+        if active(user) && m.hasChat(mergedContact.id) {
+            await MainActor.run {
                if m.chatId == mergedContact.id {
                    m.chatId = intoContact.id
                }
                m.removeChat(mergedContact.id)
            }
-        case let .contactsSubscribed(_, contactRefs):
-            updateContactsStatus(contactRefs, status: .connected)
-        case let .contactsDisconnected(_, contactRefs):
-            updateContactsStatus(contactRefs, status: .disconnected)
-        case let .contactSubError(user, contact, chatError):
+        }
+    case let .contactsSubscribed(_, contactRefs):
+        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(user, contactSubscriptions):
+        }
+    case let .contactSubSummary(_, contactSubscriptions):
+        await MainActor.run {
            for sub in contactSubscriptions {
-                if active(user) {
-                    m.updateContact(sub.contact)
-                }
+// no need to update contact here, and it is slow
+//                if active(user) {
+//                    m.updateContact(sub.contact)
+//                }
                if let err = sub.contactError {
                    processContactSubError(sub.contact, err)
                } else {
                    m.setContactNetworkStatus(sub.contact, .connected)
                }
            }
-        case let .newChatItem(user, aChatItem):
-            let cInfo = aChatItem.chatInfo
-            let cItem = aChatItem.chatItem
+        }
+    case let .newChatItem(user, aChatItem):
+        let cInfo = aChatItem.chatInfo
+        let cItem = aChatItem.chatItem
+        await MainActor.run {
            if active(user) {
                m.addChatItem(cInfo, cItem)
            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                m.increaseUnreadCounter(user: user)
            }
-            if let file = cItem.autoReceiveFile() {
-                Task {
-                    await receiveFile(user: user, fileId: file.fileId)
-                }
+        }
+        if let file = cItem.autoReceiveFile() {
+            Task {
+                await receiveFile(user: user, fileId: file.fileId, encrypted: cItem.encryptLocalFile, auto: true)
            }
-            if cItem.showNotification {
+        }
+        if cItem.showNotification {
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
+    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)
            }
-        case let .chatItemStatusUpdated(user, aChatItem):
-            let cInfo = aChatItem.chatInfo
-            let cItem = aChatItem.chatItem
-            if !cItem.isDeletedContent && (!active(user) || m.upsertChatItem(cInfo, cItem)) {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
+        if let endTask = m.messageDelivery[cItem.id] {
+            switch cItem.meta.itemStatus {
+            case .sndSent: endTask()
+            case .sndErrorAuth: endTask()
+            case .sndError: endTask()
+            default: ()
            }
-            if let endTask = m.messageDelivery[cItem.id] {
-                switch cItem.meta.itemStatus {
-                case .sndSent: endTask()
-                case .sndErrorAuth: endTask()
-                case .sndError: endTask()
-                default: ()
-                }
-            }
-        case let .chatItemUpdated(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .chatItemReaction(user, _, r):
-            if active(user) {
+        }
+    case let .chatItemUpdated(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .chatItemReaction(user, _, r):
+        if active(user) {
+            await MainActor.run {
                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
            }
-        case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
-            if !active(user) {
-                if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+        }
+    case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
+        if !active(user) {
+            if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+                await MainActor.run {
                    m.decreaseUnreadCounter(user: user)
                }
-                return
            }
+            return
+        }

+        await MainActor.run {
            if let toChatItem = toChatItem {
                _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
            } else {
                m.removeChatItem(deletedChatItem.chatInfo, deletedChatItem.chatItem)
            }
-        case let .receivedGroupInvitation(user, groupInfo, _, _):
-            if active(user) {
+        }
+    case let .receivedGroupInvitation(user, groupInfo, _, _):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo) // update so that repeat group invitations are not duplicated
                // NtfManager.shared.notifyContactRequest(contactRequest) // TODO notifyGroupInvitation?
            }
-        case let .userAcceptedGroupSent(user, groupInfo, hostContact):
-            if !active(user) { return }
+        }
+    case let .userAcceptedGroupSent(user, groupInfo, hostContact):
+        if !active(user) { return }

+        await MainActor.run {
            m.updateGroup(groupInfo)
            if let hostContact = hostContact {
                m.dismissConnReqView(hostContact.activeConn.id)
                m.removeChat(hostContact.activeConn.id)
            }
-        case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
-            if active(user) {
+        }
+    case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
-            if active(user) {
+        }
+    case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .deletedMember(user, groupInfo, _, deletedMember):
-            if active(user) {
+        }
+    case let .deletedMember(user, groupInfo, _, deletedMember):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, deletedMember)
            }
-        case let .leftMember(user, groupInfo, member):
-            if active(user) {
+        }
+    case let .leftMember(user, groupInfo, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .groupDeleted(user, groupInfo, _): // TODO update user member
-            if active(user) {
+        }
+    case let .groupDeleted(user, groupInfo, _): // TODO update user member
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .userJoinedGroup(user, groupInfo):
-            if active(user) {
+        }
+    case let .userJoinedGroup(user, groupInfo):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .joinedGroupMember(user, groupInfo, member):
-            if active(user) {
+        }
+    case let .joinedGroupMember(user, groupInfo, member):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-        case let .connectedToGroupMember(user, groupInfo, member, memberContact):
-            if active(user) {
+        }
+    case let .connectedToGroupMember(user, groupInfo, member, memberContact):
+        if active(user) {
+            await MainActor.run {
                _ = m.upsertGroupMember(groupInfo, member)
            }
-            if let contact = memberContact {
+        }
+        if let contact = memberContact {
+            await MainActor.run {
                m.setContactNetworkStatus(contact, .connected)
            }
-        case let .groupUpdated(user, toGroup):
-            if active(user) {
+        }
+    case let .groupUpdated(user, toGroup):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(toGroup)
            }
-        case let .memberRole(user, groupInfo, _, _, _, _):
-            if active(user) {
+        }
+    case let .memberRole(user, groupInfo, _, _, _, _):
+        if active(user) {
+            await MainActor.run {
                m.updateGroup(groupInfo)
            }
-        case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileStart(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileComplete(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileSndCancelled(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .rcvFileProgressXFTP(user, aChatItem, _, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .rcvFileError(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .sndFileStart(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .sndFileComplete(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupDirectFile(aChatItem)
-        case let .sndFileRcvCancelled(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupDirectFile(aChatItem)
-        case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
-            chatItemSimpleUpdate(user, aChatItem)
-        case let .sndFileCompleteXFTP(user, aChatItem, _):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .sndFileError(user, aChatItem):
-            chatItemSimpleUpdate(user, aChatItem)
-            cleanupFile(aChatItem)
-        case let .callInvitation(invitation):
-            m.callInvitations[invitation.contact.id] = invitation
-            activateCall(invitation)
-        case let .callOffer(_, contact, callType, offer, sharedKey, _):
-            withCall(contact) { call in
-                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(
-                    offer: offer.rtcSession,
-                    iceCandidates: offer.rtcIceCandidates,
-                    media: callType.media, aesKey: sharedKey,
-                    iceServers: iceServers,
-                    relay: useRelay
-                )
-            }
-        case let .callAnswer(_, contact, answer):
-            withCall(contact) { call in
-                call.callState = .answerReceived
-                m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
-            }
-        case let .callExtraInfo(_, contact, extraInfo):
-            withCall(contact) { _ in
-                m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
-            }
-        case let .callEnded(_, contact):
-            if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
-                CallController.shared.reportCallRemoteEnded(invitation: invitation)
-            }
-            withCall(contact) { call in
-                m.callCommand = .end
-                CallController.shared.reportCallRemoteEnded(call: call)
-            }
-        case .chatSuspended:
-            chatSuspended()
-        case let .contactSwitch(_, contact, switchProgress):
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
-        case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
-        case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
-        case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
-        default:
-            logger.debug("unsupported event: \(res.responseType)")
        }
+    case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileStart(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileComplete(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileSndCancelled(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileStart(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .sndFileComplete(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
+    case let .sndFileRcvCancelled(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
+    case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .sndFileCompleteXFTP(user, aChatItem, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
+    case let .callInvitation(invitation):
+        await MainActor.run {
+            m.callInvitations[invitation.contact.id] = invitation
+        }
+        activateCall(invitation)
+    case let .callOffer(_, contact, callType, offer, sharedKey, _):
+        await withCall(contact) { call in
+            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(
+                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)
+        }
+    case let .callExtraInfo(_, contact, extraInfo):
+        await withCall(contact) { _ in
+            m.callCommand = .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
+            CallController.shared.reportCallRemoteEnded(call: call)
+        }
+    case .chatSuspended:
+        chatSuspended()
+    case let .contactSwitch(_, contact, switchProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+        }
+    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+        }
+    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+        }
+    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+        }
+    default:
+        logger.debug("unsupported event: \(res.responseType)")
+    }

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

-func active(_ user: User) -> Bool {
-    user.id == ChatModel.shared.currentUser?.id
+func active(_ user: any UserLike) -> Bool {
+    user.userId == ChatModel.shared.currentUser?.id
 }

-func chatItemSimpleUpdate(_ user: User, _ aChatItem: AChatItem) {
+func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    let m = ChatModel.shared
    let cInfo = aChatItem.chatInfo
    let cItem = aChatItem.chatItem
-    if active(user) && m.upsertChatItem(cInfo, cItem) {
-        NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+    if active(user) {
+        if await MainActor.run(body: { m.upsertChatItem(cInfo, cItem) }) {
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
    }
 }

-func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) {
+func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
    let m = ChatModel.shared
-    for c in contactRefs {
-        m.networkStatuses[c.agentConnId] = status
+    await MainActor.run {
+        for c in contactRefs {
+            m.networkStatuses[c.agentConnId] = status
+        }
    }
 }

@@ -1542,7 +1646,9 @@ func activateCall(_ callInvitation: RcvCallInvitation) {
    let m = ChatModel.shared
    CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
        if let error = error {
-            m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
+            DispatchQueue.main.async {
+                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
+            }
            logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
        } else {
            logger.debug("reportNewIncomingCall success")
@@ -1554,15 +1660,3 @@ private struct UserResponse: Decodable {
    var user: User?
    var error: String?
 }
-
-struct RuntimeError: Error {
-    let message: String
-
-    init(_ message: String) {
-        self.message = message
-    }
-
-    public var localizedDescription: String {
-        return message
-    }
-}
--- a/apps/ios/Shared/Model/SuspendChat.swift
+++ b/apps/ios/Shared/Model/SuspendChat.swift
@@ -76,9 +76,11 @@ private func _chatSuspended() {
 }

 func activateChat(appState: AppState = .active) {
+    logger.debug("DEBUGGING: activateChat")
    suspendLockQueue.sync {
        appStateGroupDefault.set(appState)
        if ChatModel.ok { apiActivateChat() }
+        logger.debug("DEBUGGING: activateChat: after apiActivateChat")
    }
 }

@@ -95,10 +97,14 @@ func initChatAndMigrate(refreshInvitations: Bool = true) {
 }

 func startChatAndActivate() {
+    logger.debug("DEBUGGING: startChatAndActivate")
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.start()
+        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
    }
    if .active != appStateGroupDefault.get()  {
+        logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
        activateChat()
+        logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
    }
 }
--- a/apps/ios/Shared/SimpleXApp.swift
+++ b/apps/ios/Shared/SimpleXApp.swift
@@ -139,10 +139,10 @@ struct SimpleXApp: App {
               let chat = chatModel.getChat(id) {
                loadChat(chat: chat)
            }
-            if let chatId = chatModel.ntfContactRequest {
+            if let ncr = chatModel.ntfContactRequest {
                chatModel.ntfContactRequest = nil
-                if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                    Task { await acceptContactRequest(contactRequest) }
+                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
+                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                }
            }
        } catch let error {
--- a/apps/ios/Shared/Views/Chat/ChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatInfoView.swift
@@ -57,6 +57,37 @@ private func serverHost(_ s: String) -> String {
    }
 }

+enum SendReceipts: Identifiable, Hashable {
+    case yes
+    case no
+    case userDefault(Bool)
+
+    var id: Self { self }
+
+    var text: LocalizedStringKey {
+        switch self {
+        case .yes: return "yes"
+        case .no: return "no"
+        case let .userDefault(on): return on ? "default (yes)" : "default (no)"
+        }
+    }
+
+    func bool() -> Bool? {
+        switch self {
+        case .yes: return true
+        case .no: return false
+        case .userDefault: return nil
+        }
+    }
+
+    static func fromBool(_ enable: Bool?, userDefault def: Bool) -> SendReceipts {
+        if let enable = enable {
+            return enable ? .yes : .no
+        }
+        return .userDefault(def)
+    }
+}
+
 struct ChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
@@ -68,6 +99,8 @@ struct ChatInfoView: View {
    @Binding var connectionCode: String?
    @FocusState private var aliasTextFieldFocused: Bool
    @State private var alert: ChatInfoViewAlert? = nil
+    @State private var sendReceipts = SendReceipts.userDefault(true)
+    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

    enum ChatInfoViewAlert: Identifiable {
@@ -110,19 +143,26 @@ struct ChatInfoView: View {

                if let customUserProfile = customUserProfile {
                    Section("Incognito") {
-                        infoRow("Your random profile", customUserProfile.chatViewName)
+                        HStack {
+                            Text("Your random profile")
+                            Spacer()
+                            Text(customUserProfile.chatViewName)
+                                .foregroundStyle(.indigo)
+                        }
                    }
                }

                Section {
                    if let code = connectionCode { verifyCodeButton(code) }
                    contactPreferencesButton()
+                    sendReceiptsOption()
                    if let connStats = connectionStats,
                       connStats.ratchetSyncAllowed {
                        synchronizeConnectionButton()
-                    } else if developerTools {
-                        synchronizeConnectionButtonForce()
                    }
+//                    } else if developerTools {
+//                        synchronizeConnectionButtonForce()
+//                    }
                }

                if let contactLink = contact.contactLink {
@@ -153,7 +193,7 @@ struct ChatInfoView: View {
                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                            || connStats.ratchetSyncSendProhibited
                        )
-                        if connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil } {
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
                            Button("Abort changing address") {
                                alert = .abortSwitchAddressAlert
                            }
@@ -182,6 +222,12 @@ struct ChatInfoView: View {
            .navigationBarHidden(true)
        }
        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .onAppear {
+            if let currentUser = chatModel.currentUser {
+                sendReceiptsUserDefault = currentUser.sendRcptsContacts
+            }
+            sendReceipts = SendReceipts.fromBool(contact.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
+        }
        .alert(item: $alert) { alertItem in
            switch(alertItem) {
            case .deleteContactAlert: return deleteContactAlert()
@@ -202,20 +248,30 @@ struct ChatInfoView: View {
                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
-            HStack {
-                if contact.verified {
-                    Image(systemName: "checkmark.shield")
+            if contact.verified {
+                (
+                    Text(Image(systemName: "checkmark.shield"))
                        .foregroundColor(.secondary)
-                }
+                        .font(.title2)
+                    + Text(" ")
+                    + Text(contact.profile.displayName)
+                        .font(.largeTitle)
+                )
+                .multilineTextAlignment(.center)
+                .lineLimit(2)
+                .padding(.bottom, 2)
+            } else {
                Text(contact.profile.displayName)
                    .font(.largeTitle)
-                    .lineLimit(1)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(2)
                    .padding(.bottom, 2)
            }
            if cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName {
                Text(cInfo.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(4)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
@@ -295,6 +351,26 @@ struct ChatInfoView: View {
        }
    }

+    private func sendReceiptsOption() -> some View {
+        Picker(selection: $sendReceipts) {
+            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
+                Text(opt.text)
+            }
+        } label: {
+            Label("Send receipts", systemImage: "checkmark.message")
+        }
+        .frame(height: 36)
+        .onChange(of: sendReceipts) { _ in
+            setSendReceipts()
+        }
+    }
+
+    private func setSendReceipts() {
+        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+        chatSettings.sendRcpts = sendReceipts.bool()
+        updateChatSettings(chat, chatSettings: chatSettings)
+    }
+
    private func synchronizeConnectionButton() -> some View {
        Button {
            syncContactConnection(force: false)
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIEventView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIEventView.swift
@@ -10,20 +10,11 @@ import SwiftUI
 import SimpleXChat

 struct CIEventView: View {
-    var chatItem: ChatItem
+    var eventText: Text

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if let member = chatItem.memberDisplayName {
-                Text(member)
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-                    .fontWeight(.light)
-                + Text(" ")
-                + chatEventText(chatItem)
-            } else {
-                chatEventText(chatItem)
-            }
+            eventText
        }
        .padding(.leading, 6)
        .padding(.bottom, 6)
@@ -31,20 +22,8 @@ struct CIEventView: View {
    }
 }

-func chatEventText(_ ci: ChatItem) -> Text {
-    Text(ci.content.text)
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .fontWeight(.light)
-    + Text(" ")
-    + ci.timestampText
-        .font(.caption)
-        .foregroundColor(Color.secondary)
-        .fontWeight(.light)
-}
-
 struct CIEventView_Previews: PreviewProvider {
    static var previews: some View {
-        CIEventView(chatItem: ChatItem.getGroupEventSample())
+        CIEventView(eventText: Text("event happened"))
    }
 }
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift
@@ -16,8 +16,8 @@ struct CIFileView: View {

    var body: some View {
        let metaReserve = edited
-        ? "                         "
-        : "                     "
+        ? "                           "
+        : "                       "
        Button(action: fileAction) {
            HStack(alignment: .bottom, spacing: 6) {
                fileIndicator()
@@ -62,6 +62,7 @@ struct CIFileView: View {
            case .rcvComplete: return true
            case .rcvCancelled: return false
            case .rcvError: return false
+            case .invalid: return false
            }
        }
        return false
@@ -83,7 +84,8 @@ struct CIFileView: View {
                    Task {
                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                        if let user = ChatModel.shared.currentUser {
-                            await receiveFile(user: user, fileId: file.fileId)
+                            let encrypted = file.fileProtocol == .xftp && privacyEncryptLocalFilesGroupDefault.get()
+                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                        }
                    }
                } else {
@@ -108,9 +110,8 @@ struct CIFileView: View {
                }
            case .rcvComplete:
                logger.debug("CIFileView fileAction - in .rcvComplete")
-                if let filePath = getLoadedFilePath(file) {
-                    let url = URL(fileURLWithPath: filePath)
-                    showShareSheet(items: [url])
+                if let fileSource = getLoadedFileSource(file) {
+                    saveCryptoFile(fileSource)
                }
            default: break
            }
@@ -149,6 +150,7 @@ struct CIFileView: View {
            case .rcvComplete: fileIcon("doc.fill")
            case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
+            case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
            }
        } else {
            fileIcon("doc.fill")
@@ -191,11 +193,35 @@ struct CIFileView: View {
    }
 }

+func saveCryptoFile(_ fileSource: CryptoFile) {
+    if let cfArgs = fileSource.cryptoArgs {
+        let url = getAppFilePath(fileSource.filePath)
+        let tempUrl = getTempFilesDirectory().appendingPathComponent(fileSource.filePath)
+        Task {
+            do {
+                try decryptCryptoFile(fromPath: url.path, cryptoArgs: cfArgs, toPath: tempUrl.path)
+                await MainActor.run {
+                    showShareSheet(items: [tempUrl]) {
+                        removeFile(tempUrl)
+                    }
+                }
+            } catch {
+                await MainActor.run {
+                    AlertManager.shared.showAlertMsg(title: "Error decrypting file", message: "Error: \(error.localizedDescription)")
+                }
+            }
+        }
+    } else {
+        let url = getAppFilePath(fileSource.filePath)
+        showShareSheet(items: [url])
+    }
+}
+
 struct CIFileView_Previews: PreviewProvider {
    static var previews: some View {
        let sentFile: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .file("")),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift
@@ -16,6 +16,7 @@ struct CIImageView: View {
    let maxWidth: CGFloat
    @Binding var imgWidth: CGFloat?
    @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
    @State private var showFullScreenImage = false

    var body: some View {
@@ -36,9 +37,8 @@ struct CIImageView: View {
                            case .rcvInvitation:
                                Task {
                                    if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId)
+                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                    }
-                                    // TODO image accepted alert?
                                }
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -99,6 +99,7 @@ struct CIImageView: View {
            case .rcvTransfer: progressView()
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
            default: EmptyView()
            }
        }
@@ -109,7 +110,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
            .padding(padding)
    }

--- a/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift
@@ -13,17 +13,48 @@ struct CIMetaView: View {
    @EnvironmentObject var chat: Chat
    var chatItem: ChatItem
    var metaColor = Color.secondary
+    var paleMetaColor = Color(UIColor.tertiaryLabel)

    var body: some View {
        if chatItem.isDeletedContent {
            chatItem.timestampText.font(.caption).foregroundColor(metaColor)
        } else {
-            ciMetaText(chatItem.meta, chatTTL: chat.chatInfo.timedMessagesTTL, color: metaColor)
+            let meta = chatItem.meta
+            let ttl = chat.chatInfo.timedMessagesTTL
+            let encrypted = chatItem.encryptedFile
+            switch meta.itemStatus {
+            case let .sndSent(sndProgress):
+                switch sndProgress {
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
+                }
+            case let .sndRcvd(_, sndProgress):
+                switch sndProgress {
+                case .complete:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
+                    }
+                case .partial:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
+                    }
+                }
+            default:
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
+            }
        }
    }
 }

-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false) -> Text {
+enum SentCheckmark {
+    case sent
+    case rcvd1
+    case rcvd2
+}
+
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
    var r = Text("")
    if meta.itemEdited {
        r = r + statusIconText("pencil", color)
@@ -37,11 +68,24 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparen
        r = r + Text(" ")
    }
    if let (icon, statusColor) = meta.statusIcon(color) {
-        r = r + statusIconText(icon, transparent ? .clear : statusColor) + Text(" ")
+        let t = Text(Image(systemName: icon)).font(.caption2)
+        let gap = Text("  ").kerning(-1.25)
+        let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
+        switch sent {
+        case nil: r = r + t1
+        case .sent: r = r + t1 + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd2: r = r + gap + t1
+        }
+        r = r + Text(" ")
    } else if !meta.disappearing {
        r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
    }
-    return (r + meta.timestampText.foregroundColor(color)).font(.caption)
+    if let enc = encrypted {
+        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
+    }
+    r = r + meta.timestampText.foregroundColor(color)
+    return r.font(.caption)
 }

 private func statusIconText(_ icon: String, _ color: Color) -> Text {
@@ -51,8 +95,12 @@ 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))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, itemEdited: true))
+            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())
        }
        .previewLayout(.fixed(width: 360, height: 100))
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift
@@ -16,7 +16,6 @@ struct CIRcvDecryptionError: View {
    var msgDecryptError: MsgDecryptError
    var msgCount: UInt32
    var chatItem: ChatItem
-    var showMember = false
    @State private var alert: CIRcvDecryptionErrorAlert?

    enum CIRcvDecryptionErrorAlert: Identifiable {
@@ -106,9 +105,6 @@ struct CIRcvDecryptionError: View {
        ZStack(alignment: .bottomTrailing) {
            VStack(alignment: .leading, spacing: 2) {
                HStack {
-                    if showMember, let member = chatItem.memberDisplayName {
-                        Text(member).fontWeight(.medium) + Text(": ")
-                    }
                    Text(chatItem.content.text)
                        .foregroundColor(.red)
                        .italic()
@@ -122,7 +118,7 @@ struct CIRcvDecryptionError: View {
                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                )
            }
            .padding(.horizontal, 12)
@@ -137,20 +133,13 @@ struct CIRcvDecryptionError: View {
    }

    private func decryptionErrorItem(_ onClick: @escaping (() -> Void)) -> some View {
-        func text() -> Text {
-            Text(chatItem.content.text)
-                .foregroundColor(.red)
-                .italic()
-            + Text("   ")
-            + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
-        }
        return ZStack(alignment: .bottomTrailing) {
            HStack {
-                if showMember, let member = chatItem.memberDisplayName {
-                    Text(member).fontWeight(.medium) + Text(": ") + text()
-                } else {
-                    text()
-                }
+                Text(chatItem.content.text)
+                    .foregroundColor(.red)
+                    .italic()
+                + Text("   ")
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
            }
            .padding(.horizontal, 12)
            CIMetaView(chatItem: chatItem)
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift
@@ -22,6 +22,7 @@ struct CIVideoView: View {
    @State private var scrollProxy: ScrollViewProxy?
    @State private var preview: UIImage? = nil
    @State private var player: AVPlayer?
+    @State private var fullPlayer: AVPlayer?
    @State private var url: URL?
    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
@@ -36,6 +37,7 @@ struct CIVideoView: View {
        self.scrollProxy = scrollProxy
        if let url = getLoadedVideo(chatItem.file) {
            self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
+            self._fullPlayer = State(initialValue: AVPlayer(url: url))
            self._url = State(initialValue: url)
        }
        if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -57,7 +59,7 @@ struct CIVideoView: View {
                        if let file = file {
                            switch file.fileStatus {
                            case .rcvInvitation:
-                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
                                case .xftp:
@@ -83,7 +85,7 @@ struct CIVideoView: View {
            }
            if let file = file, case .rcvInvitation = file.fileStatus {
                Button {
-                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                } label: {
                    playPauseIcon("play.fill")
                }
@@ -96,6 +98,7 @@ struct CIVideoView: View {
        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
+                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
@@ -113,7 +116,9 @@ struct CIVideoView: View {
                        player.pause()
                        videoPlaying = false
                    case .paused:
-                        showFullScreenPlayer = true
+                        if canBePlayed {
+                            showFullScreenPlayer = true
+                        }
                    default: ()
                    }
                }
@@ -122,8 +127,9 @@ struct CIVideoView: View {
                        ChatModel.shared.stopPreviousRecPlay = url
                        player.play()
                    } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                    }
+                    .disabled(!canBePlayed)
                }
            }
            loadingIndicator()
@@ -212,6 +218,7 @@ struct CIVideoView: View {
                }
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
+            case .invalid: fileIcon("questionmark", 10, 13)
            default: EmptyView()
            }
        }
@@ -246,10 +253,11 @@ struct CIVideoView: View {
        .padding([.trailing, .top], 11)
    }

-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64) async -> Void) {
+    // 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 {
-                await receiveFile(user, file.fileId)
+                await receiveFile(user, file.fileId, encrypted, false)
            }
        }
    }
@@ -257,8 +265,7 @@ struct CIVideoView: View {
    private func fullScreenPlayer(_ url: URL) -> some View {
        ZStack {
            Color.black.edgesIgnoringSafeArea(.all)
-            VideoPlayer(player: createFullScreenPlayerAndPlay(url)) {
-            }
+            VideoPlayer(player: fullPlayer)
            .overlay(alignment: .topLeading, content: {
                Button(action: { showFullScreenPlayer = false },
                    label: {
@@ -281,28 +288,29 @@ struct CIVideoView: View {
                    }
                }
            )
+            .onAppear {
+                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                    ChatModel.shared.stopPreviousRecPlay = url
+                    if let player = fullPlayer {
+                        player.play()
+                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
+                            player.seek(to: CMTime.zero)
+                            player.play()
+                        }
+                    }
+                }
+            }
            .onDisappear {
                if let fullScreenTimeObserver = fullScreenTimeObserver {
                    NotificationCenter.default.removeObserver(fullScreenTimeObserver)
                }
                fullScreenTimeObserver = nil
+                fullPlayer?.pause()
+                fullPlayer?.seek(to: CMTime.zero)
            }
        }
    }

-    private func createFullScreenPlayerAndPlay(_ url: URL) -> AVPlayer {
-        let player = AVPlayer(url: url)
-        DispatchQueue.main.asyncAfter(deadline: .now()) {
-            ChatModel.shared.stopPreviousRecPlay = url
-            player.play()
-            fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
-                player.seek(to: CMTime.zero)
-                player.play()
-            }
-        }
-        return player
-    }
-
    private func addObserver(_ player: AVPlayer, _ url: URL) {
        timeObserver = player.addPeriodicTimeObserver(forInterval: CMTime(seconds: 0.01, preferredTimescale: CMTimeScale(NSEC_PER_SEC)), queue: .main) { time in
            if let item = player.currentItem {
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIVoiceView.swift
@@ -144,6 +144,7 @@ struct VoiceMessagePlayer: View {
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
+                case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                }
            } else {
                playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -158,7 +159,8 @@ struct VoiceMessagePlayer: View {
            }
        }
        .onChange(of: chatModel.stopPreviousRecPlay) { it in
-            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
+            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
+               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                audioPlayer?.stop()
                playbackState = .noPlayback
                playbackTime = TimeInterval(0)
@@ -173,8 +175,8 @@ struct VoiceMessagePlayer: View {
        switch playbackState {
        case .noPlayback:
            Button {
-                if let recordingFileName = getLoadedFileName(recordingFile) {
-                    startPlayback(recordingFileName)
+                if let recordingSource = getLoadedFileSource(recordingFile) {
+                    startPlayback(recordingSource)
                }
            } label: {
                playPauseIcon("play.fill")
@@ -218,7 +220,7 @@ struct VoiceMessagePlayer: View {
        Button {
            Task {
                if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                }
            }
        } label: {
@@ -250,8 +252,8 @@ struct VoiceMessagePlayer: View {
            .clipShape(Circle())
    }

-    private func startPlayback(_ recordingFileName: String) {
-        chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
+    private func startPlayback(_ recordingSource: CryptoFile) {
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
        audioPlayer = AudioPlayer(
            onTimer: { playbackTime = $0 },
            onFinishPlayback: {
@@ -259,7 +261,7 @@ struct VoiceMessagePlayer: View {
                playbackTime = TimeInterval(0)
            }
        )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
        playbackState = .playing
    }
 }
@@ -268,7 +270,7 @@ struct CIVoiceView_Previews: PreviewProvider {
    static var previews: some View {
        let sentVoiceMessage: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
--- a/apps/ios/Shared/Views/Chat/ChatItem/DeletedItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/DeletedItemView.swift
@@ -12,13 +12,9 @@ import SimpleXChat
 struct DeletedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).fontWeight(.medium) + Text(": ")
-            }
            Text(chatItem.content.text)
                .foregroundColor(.secondary)
                .italic()
@@ -37,10 +33,7 @@ struct DeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(
-                chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)),
-                showMember: true
-            )
+            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
--- a/apps/ios/Shared/Views/Chat/ChatItem/EmojiItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/EmojiItemView.swift
@@ -32,7 +32,7 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
            EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
        }
        .previewLayout(.fixed(width: 360, height: 70))
--- a/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/FramedCIVoiceView.swift
@@ -75,14 +75,14 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
    static var previews: some View {
        let sentVoiceMessage: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "Hello there", duration: 30)),
            quotedItem: nil,
            file: CIFile.getSample(fileStatus: .sndComplete)
        )
        let voiceMessageWithQuote: ChatItem = ChatItem(
            chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
            content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
            quotedItem: CIQuote.getSample(1, .now, "Hi", chatDir: .directRcv),
            file: CIFile.getSample(fileStatus: .sndComplete)
--- a/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift
@@ -18,7 +18,6 @@ struct FramedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember = false
    var maxWidth: CGFloat = .infinity
    @State var scrollProxy: ScrollViewProxy? = nil
    @State var msgWidth: CGFloat = 0
@@ -57,7 +56,7 @@ struct FramedItemView: View {
                        }
                }

-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: framedMsgContentView)
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: framedMsgContentView)
                    .padding(chatItem.content.msgContent != nil ? 0 : 4)
                    .overlay(DetermineWidth())
            }
@@ -68,6 +67,7 @@ struct FramedItemView: View {
                    .padding(.horizontal, 12)
                    .padding(.bottom, 6)
                    .overlay(DetermineWidth())
+                    .accessibilityLabel("")
            }
        }
            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, colorScheme))
@@ -97,7 +97,7 @@ struct FramedItemView: View {
        } else {
            switch (chatItem.content.msgContent) {
            case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
                    .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
@@ -107,7 +107,7 @@ struct FramedItemView: View {
                            value: .white
                        )
                } else {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .video(text, image, duration):
                CIVideoView(chatItem: chatItem, image: image, duration: duration, maxWidth: maxWidth, videoWidth: $videoWidth, scrollProxy: scrollProxy)
@@ -120,27 +120,27 @@ struct FramedItemView: View {
                        value: .white
                    )
                } else {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .voice(text, duration):
                FramedCIVoiceView(chatItem: chatItem, recordingFile: chatItem.file, duration: duration, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
                    .overlay(DetermineWidth())
                if text != "" {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                }
            case let .file(text):
                ciFileView(chatItem, text)
            case let .link(_, preview):
                CILinkView(linkPreview: preview)
-                ciMsgContentView (chatItem, showMember)
+                ciMsgContentView(chatItem)
            case let .unknown(_, text: text):
                if chatItem.file == nil {
-                    ciMsgContentView (chatItem, showMember)
+                    ciMsgContentView(chatItem)
                } else {
                    ciFileView(chatItem, text)
                }
            default:
-                ciMsgContentView (chatItem, showMember)
+                ciMsgContentView(chatItem)
            }
        }
    }
@@ -232,17 +232,27 @@ struct FramedItemView: View {
    }
    
    private func ciQuotedMsgView(_ qi: CIQuote) -> some View {
-        MsgContentView(
-            text: qi.text,
-            formattedText: qi.formattedText,
-            sender: qi.getSender(membership())
-        )
-        .lineLimit(3)
-        .font(.subheadline)
-        .padding(.vertical, 6)
+        Group {
+            if let sender = qi.getSender(membership()) {
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    ciQuotedMsgTextView(qi, lines: 2)
+                }
+            } else {
+                ciQuotedMsgTextView(qi, lines: 3)
+            }
+        }
+        .padding(.top, 6)
        .padding(.horizontal, 12)
    }
    
+    private func ciQuotedMsgTextView(_ qi: CIQuote, lines: Int) -> some View {
+        MsgContentView(text: qi.text, formattedText: qi.formattedText)
+            .lineLimit(lines)
+            .font(.subheadline)
+            .padding(.bottom, 6)
+    }
+
    private func ciQuoteIconView(_ image: String) -> some View {
        Image(systemName: image)
            .resizable()
@@ -260,13 +270,12 @@ struct FramedItemView: View {
        }
    }
    
-    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, _ showMember: Bool = false) -> some View {
+    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem) -> some View {
        let text = ci.meta.isLive ? ci.content.msgContent?.text ?? ci.text : ci.text
        let rtl = isRightToLeft(text)
        let v = MsgContentView(
            text: text,
            formattedText: text == "" ? [] : ci.formattedText,
-            sender: showMember ? ci.memberDisplayName : nil,
            meta: ci.meta,
            rightToLeft: rtl
        )
@@ -288,7 +297,7 @@ struct FramedItemView: View {
        CIFileView(file: chatItem.file, edited: chatItem.meta.itemEdited)
            .overlay(DetermineWidth())
        if text != "" || ci.meta.isLive {
-            ciMsgContentView (chatItem, showMember)
+            ciMsgContentView (chatItem)
        }
    }

@@ -349,8 +358,8 @@ struct FramedItemView_Previews: PreviewProvider {
        Group{
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -363,10 +372,10 @@ struct FramedItemView_Previews: PreviewProvider {
 struct FramedItemView_Edited_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -381,10 +390,10 @@ struct FramedItemView_Edited_Previews: PreviewProvider {
 struct FramedItemView_Deleted_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
--- a/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift
@@ -12,10 +12,9 @@ import SimpleXChat
 struct IntegrityErrorItemView: View {
    var msgError: MsgErrorType
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
-        CIMsgError(chatItem: chatItem, showMember: showMember) {
+        CIMsgError(chatItem: chatItem) {
            switch msgError {
            case .msgSkipped:
                AlertManager.shared.showAlertMsg(
@@ -54,14 +53,10 @@ struct IntegrityErrorItemView: View {

 struct CIMsgError: View {
    var chatItem: ChatItem
-    var showMember = false
    var onTap: () -> Void

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).fontWeight(.medium) + Text(": ")
-            }
            Text(chatItem.content.text)
                .foregroundColor(.red)
                .italic()
--- a/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift
@@ -12,13 +12,9 @@ import SimpleXChat
 struct MarkedDeletedItemView: View {
    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
-    var showMember = false

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
-            if showMember, let member = chatItem.memberDisplayName {
-                Text(member).font(.caption).fontWeight(.medium) + Text(": ").font(.caption)
-            }
            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
            } else {
@@ -46,7 +42,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
--- a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
@@ -80,14 +80,14 @@ struct MsgContentView: View {
    }

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

 func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
    let s = text
    var res: Text
-    if let ft = formattedText, ft.count > 0 {
+    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
        res = formatText(ft[0], preview)
        var i = 1
        while i < ft.count {
--- a/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemInfoView.swift
@@ -13,7 +13,25 @@ struct ChatItemInfoView: View {
    @Environment(\.colorScheme) var colorScheme
    var ci: ChatItem
    @Binding var chatItemInfo: ChatItemInfo?
+    @State private var selection: CIInfoTab = .history
+    @State private var alert: CIInfoViewAlert? = nil
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+
+    enum CIInfoTab {
+        case history
+        case quote
+        case delivery
+    }
+
+    enum CIInfoViewAlert: Identifiable {
+        case alert(title: String, text: String)
+
+        var id: String {
+            switch self {
+            case let .alert(title, text): return "alert \(title) \(text)"
+            }
+        }
+    }
    
    var body: some View {
        NavigationView {
@@ -25,6 +43,11 @@ struct ChatItemInfoView: View {
                        }
                    }
                }
+                .alert(item: $alert) { a in
+                    switch(a) {
+                    case let .alert(title, text): return Alert(title: Text(title), message: Text(text))
+                    }
+                }
        }
    }

@@ -34,44 +57,92 @@ struct ChatItemInfoView: View {
        : NSLocalizedString("Received message", comment: "message info title")
    }

+    private var numTabs: Int {
+        var numTabs = 1
+        if chatItemInfo?.memberDeliveryStatuses != nil {
+            numTabs += 1
+        }
+        if ci.quotedItem != nil {
+            numTabs += 1
+        }
+        return numTabs
+    }
+
    @ViewBuilder private func itemInfoView() -> some View {
+        if numTabs > 1 {
+            TabView(selection: $selection) {
+                if let mdss = chatItemInfo?.memberDeliveryStatuses {
+                    deliveryTab(mdss)
+                        .tabItem {
+                            Label("Delivery", systemImage: "checkmark.message")
+                        }
+                        .tag(CIInfoTab.delivery)
+                }
+                historyTab()
+                    .tabItem {
+                        Label("History", systemImage: "clock")
+                    }
+                    .tag(CIInfoTab.history)
+                if let qi = ci.quotedItem {
+                    quoteTab(qi)
+                        .tabItem {
+                            Label("In reply to", systemImage: "arrowshape.turn.up.left")
+                        }
+                        .tag(CIInfoTab.quote)
+                }
+            }
+            .onAppear {
+                if chatItemInfo?.memberDeliveryStatuses != nil {
+                    selection = .delivery
+                }
+            }
+        } else {
+            historyTab()
+        }
+    }
+
+    @ViewBuilder private func details() -> some View {
        let meta = ci.meta
+        VStack(alignment: .leading, spacing: 16) {
+            Text(title)
+                .font(.largeTitle)
+                .bold()
+                .padding(.bottom)
+
+            infoRow("Sent at", localTimestamp(meta.itemTs))
+            if !ci.chatDir.sent {
+                infoRow("Received at", localTimestamp(meta.createdAt))
+            }
+            switch (meta.itemDeleted) {
+            case let .deleted(deletedTs):
+                if let deletedTs = deletedTs {
+                    infoRow("Deleted at", localTimestamp(deletedTs))
+                }
+            case let .moderated(deletedTs, _):
+                if let deletedTs = deletedTs {
+                    infoRow("Moderated at", localTimestamp(deletedTs))
+                }
+            default: EmptyView()
+            }
+            if let deleteAt = meta.itemTimed?.deleteAt {
+                infoRow("Disappears at", localTimestamp(deleteAt))
+            }
+            if developerTools {
+                infoRow("Database ID", "\(meta.itemId)")
+                infoRow("Record updated at", localTimestamp(meta.updatedAt))
+            }
+        }
+    }
+
+    @ViewBuilder private func historyTab() -> some View {
        GeometryReader { g in
+            let maxWidth = (g.size.width - 32) * 0.84
            ScrollView {
                VStack(alignment: .leading, spacing: 16) {
-                    Text(title)
-                        .font(.largeTitle)
-                        .bold()
-                        .padding(.bottom)
-
-                    let maxWidth = (g.size.width - 32) * 0.84
-                    infoRow("Sent at", localTimestamp(meta.itemTs))
-                    if !ci.chatDir.sent {
-                        infoRow("Received at", localTimestamp(meta.createdAt))
-                    }
-                    switch (meta.itemDeleted) {
-                    case let .deleted(deletedTs):
-                        if let deletedTs = deletedTs {
-                            infoRow("Deleted at", localTimestamp(deletedTs))
-                        }
-                    case let .moderated(deletedTs, _):
-                        if let deletedTs = deletedTs {
-                            infoRow("Moderated at", localTimestamp(deletedTs))
-                        }
-                    default: EmptyView()
-                    }
-                    if let deleteAt = meta.itemTimed?.deleteAt {
-                        infoRow("Disappears at", localTimestamp(deleteAt))
-                    }
-                    if developerTools {
-                        infoRow("Database ID", "\(meta.itemId)")
-                        infoRow("Record updated at", localTimestamp(meta.updatedAt))
-                    }
-
+                    details()
+                    Divider().padding(.vertical)
                    if let chatItemInfo = chatItemInfo,
                       !chatItemInfo.itemVersions.isEmpty {
-                        Divider().padding(.vertical)
-
                        Text("History")
                            .font(.title2)
                            .padding(.bottom, 4)
@@ -81,16 +152,21 @@ struct ChatItemInfoView: View {
                            }
                        }
                    }
+                    else {
+                        Text("No history")
+                            .foregroundColor(.secondary)
+                            .frame(maxWidth: .infinity)
+                    }
                }
+                .padding()
            }
-            .padding()
            .frame(maxHeight: .infinity, alignment: .top)
        }
    }
-    
+
    @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
        VStack(alignment: .leading, spacing: 4) {
-            versionText(itemVersion)
+            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
                .allowsHitTesting(false)
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
@@ -119,9 +195,9 @@ struct ChatItemInfoView: View {
        .frame(maxWidth: maxWidth, alignment: .leading)
    }

-    @ViewBuilder private func versionText(_ itemVersion: ChatItemVersion) -> some View {
-        if itemVersion.msgContent.text != "" {
-            messageText(itemVersion.msgContent.text, itemVersion.formattedText, nil)
+    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
+        if text != "" {
+            messageText(text, formattedText, sender)
        } else {
            Text("no text")
                .italic()
@@ -129,9 +205,141 @@ struct ChatItemInfoView: View {
        }
    }

+    @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
+        GeometryReader { g in
+            let maxWidth = (g.size.width - 32) * 0.84
+            ScrollView {
+                VStack(alignment: .leading, spacing: 16) {
+                    details()
+                    Divider().padding(.vertical)
+                    Text("In reply to")
+                        .font(.title2)
+                        .padding(.bottom, 4)
+                    quotedMsgView(qi, maxWidth)
+                }
+                .padding()
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+    }
+
+    @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
+        VStack(alignment: .leading, spacing: 4) {
+            textBubble(qi.text, qi.formattedText, qi.getSender(nil))
+                .allowsHitTesting(false)
+                .padding(.horizontal, 12)
+                .padding(.vertical, 6)
+                .background(quotedMsgFrameColor(qi, colorScheme))
+                .cornerRadius(18)
+                .contextMenu {
+                    if qi.text != "" {
+                        Button {
+                            showShareSheet(items: [qi.text])
+                        } label: {
+                            Label("Share", systemImage: "square.and.arrow.up")
+                        }
+                        Button {
+                            UIPasteboard.general.string = qi.text
+                        } label: {
+                            Label("Copy", systemImage: "doc.on.doc")
+                        }
+                    }
+                }
+            Text(localTimestamp(qi.sentAt))
+                .foregroundStyle(.secondary)
+                .font(.caption)
+                .padding(.horizontal, 12)
+        }
+        .frame(maxWidth: maxWidth, alignment: .leading)
+    }
+
+    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
+        (qi.chatDir?.sent ?? false)
+        ? (colorScheme == .light ? sentColorLight : sentColorDark)
+        : Color(uiColor: .tertiarySystemGroupedBackground)
+    }
+
+    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 16) {
+                details()
+                Divider().padding(.vertical)
+                Text("Delivery")
+                    .font(.title2)
+                    .padding(.bottom, 4)
+                memberDeliveryStatusesView(memberDeliveryStatuses)
+            }
+            .padding()
+        }
+        .frame(maxHeight: .infinity, alignment: .top)
+    }
+
+    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+        VStack(alignment: .leading, spacing: 12) {
+            let mss = membersStatuses(memberDeliveryStatuses)
+            if !mss.isEmpty {
+                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                }
+            } else {
+                Text("No delivery information")
+                    .foregroundColor(.secondary)
+            }
+        }
+    }
+
+    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)
+            } else {
+                return nil
+            }
+        })
+    }
+
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+        HStack{
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
+                .padding(.trailing, 2)
+            Text(member.chatViewName)
+                .lineLimit(1)
+            Spacer()
+            let v = Group {
+                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                    switch status {
+                    case .sndRcvd:
+                        ZStack(alignment: .trailing) {
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                                .padding(.trailing, 6)
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                        }
+                    default:
+                        Image(systemName: icon)
+                            .foregroundColor(statusColor)
+                    }
+                } else {
+                    Image(systemName: "ellipsis")
+                        .foregroundColor(Color.secondary)
+                }
+            }
+
+            if let (title, text) = status.statusInfo {
+                v.onTapGesture {
+                    alert = .alert(title: title, text: text)
+                }
+            } else {
+                v
+            }
+        }
+    }
+
    private func itemInfoShareText() -> String {
        let meta = ci.meta
-        var shareText: [String] = [title, ""]
+        var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
        shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
        if !ci.chatDir.sent {
            shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
@@ -156,9 +364,27 @@ struct ChatItemInfoView: View {
                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt))
            ]
        }
+        if let qi = ci.quotedItem {
+            shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]
+            let t = qi.text
+            shareText += [""]
+            if let sender = qi.getSender(nil) {
+                shareText += [String.localizedStringWithFormat(
+                    NSLocalizedString("%@ at %@:", comment: "copied message info, <sender> at <time>"),
+                    sender,
+                    localTimestamp(qi.sentAt)
+                )]
+            } else {
+                shareText += [String.localizedStringWithFormat(
+                    NSLocalizedString("%@:", comment: "copied message info"),
+                    localTimestamp(qi.sentAt)
+                )]
+            }
+            shareText += [t != "" ? t : NSLocalizedString("no text", comment: "copied message info in history")]
+        }
        if let chatItemInfo = chatItemInfo,
           !chatItemInfo.itemVersions.isEmpty {
-            shareText += ["", NSLocalizedString("History", comment: "copied message info")]
+            shareText += ["", NSLocalizedString("## History", comment: "copied message info")]
            for (index, itemVersion) in chatItemInfo.itemVersions.enumerated() {
                let t = itemVersion.msgContent.text
                shareText += [
--- a/apps/ios/Shared/Views/Chat/ChatItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemView.swift
@@ -12,7 +12,6 @@ import SimpleXChat
 struct ChatItemView: View {
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember = false
    var maxWidth: CGFloat = .infinity
    @State var scrollProxy: ScrollViewProxy? = nil
    @Binding var revealed: Bool
@@ -23,7 +22,6 @@ struct ChatItemView: View {
    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
        self.chatItem = chatItem
-        self.showMember = showMember
        self.maxWidth = maxWidth
        _scrollProxy = .init(initialValue: scrollProxy)
        _revealed = revealed
@@ -36,14 +34,14 @@ struct ChatItemView: View {
    var body: some View {
        let ci = chatItem
        if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chatItem: chatItem, showMember: showMember)
+            MarkedDeletedItemView(chatItem: chatItem)
        } 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)
            } 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)
            } else if ci.content.msgContent == nil {
-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
                framedItemView()
            }
@@ -53,14 +51,14 @@ struct ChatItemView: View {
    }

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

 struct ChatItemContentView<Content: View>: View {
+    @EnvironmentObject var chatModel: ChatModel
    var chatInfo: ChatInfo
    var chatItem: ChatItem
-    var showMember: Bool
    var msgContentView: () -> Content

    var body: some View {
@@ -71,10 +69,11 @@ 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, showMember: showMember)
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem, showMember: showMember)
+        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(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 .rcvGroupEvent: eventItemView()
        case .sndGroupEvent: eventItemView()
        case .rcvConnEvent: eventItemView()
@@ -96,7 +95,7 @@ struct ChatItemContentView<Content: View>: View {
    }

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

    private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
@@ -108,12 +107,54 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func eventItemView() -> some View {
-        CIEventView(chatItem: chatItem)
+        return CIEventView(eventText: eventItemViewText())
+    }
+
+    private func eventItemViewText() -> Text {
+        if let member = chatItem.memberDisplayName {
+            return Text(member + " ")
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+                    .fontWeight(.light)
+                + chatEventText(chatItem)
+        } else {
+            return chatEventText(chatItem)
+        }
    }

    private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
    }
+
+    private var membersConnectedItemText: Text {
+        if let t = membersConnectedText {
+            return chatEventText(t, chatItem.timestampText)
+        } else {
+            return eventItemViewText()
+        }
+    }
+
+    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)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
+}
+
+func chatEventText(_ ci: ChatItem) -> Text {
+    chatEventText("\(ci.content.text)", ci.timestampText)
 }

 struct ChatItemView_Previews: PreviewProvider {
@@ -125,9 +166,9 @@ struct ChatItemView_Previews: PreviewProvider {
            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, itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent, itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemLive: true), revealed: Binding.constant(true))
+            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))
        }
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -261,7 +261,7 @@ struct ChatView: View {
        return GeometryReader { g in
            ScrollViewReader { proxy in
                ScrollView {
-                    LazyVStack(spacing: 5)  {
+                    LazyVStack(spacing: 0)  {
                        ForEach(chatModel.reversedChatItems, id: \.viewId) { ci in
                            let voiceNoFrame = voiceWithoutFrame(ci)
                            let maxWidth = cInfo.chatType == .group
@@ -430,68 +430,77 @@ 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 = chatModel.getPrevChatItem(ci)
-            HStack(alignment: .top, spacing: 0) {
-                let showMember = prevItem == nil || showMemberImage(member, prevItem)
-                if showMember {
-                    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)
+            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 {
-                    Rectangle().fill(.clear)
-                        .frame(width: memberImageSize, height: memberImageSize)
+                    chatItemWithMenu(ci, maxWidth)
+                        .padding(.top, 5)
+                        .padding(.trailing)
+                        .padding(.leading, memberImageSize + 8 + 12)
                }
-                ChatItemWithMenu(
-                    ci: ci,
-                    showMember: showMember,
-                    maxWidth: maxWidth,
-                    scrollProxy: scrollProxy,
-                    deleteMessage: deleteMessage,
-                    deletingItem: $deletingItem,
-                    composeState: $composeState,
-                    showDeleteMessage: $showDeleteMessage
-                )
-                .padding(.leading, 8)
-                .environmentObject(chat)
            }
-            .padding(.trailing)
-            .padding(.leading, 12)
        } else {
-            ChatItemWithMenu(
-                ci: ci,
-                maxWidth: maxWidth,
-                scrollProxy: scrollProxy,
-                deleteMessage: deleteMessage,
-                deletingItem: $deletingItem,
-                composeState: $composeState,
-                showDeleteMessage: $showDeleteMessage
-            )
-            .padding(.horizontal)
-            .environmentObject(chat)
+            chatItemWithMenu(ci, maxWidth)
+                .padding(.horizontal)
+                .padding(.top, 5)
        }
    }
-    
+
+    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
+        ChatItemWithMenu(
+            ci: ci,
+            maxWidth: maxWidth,
+            scrollProxy: scrollProxy,
+            deleteMessage: deleteMessage,
+            deletingItem: $deletingItem,
+            composeState: $composeState,
+            showDeleteMessage: $showDeleteMessage
+        )
+        .environmentObject(chat)
+    }
+
    private struct ChatItemWithMenu: View {
        @EnvironmentObject var chat: Chat
        @Environment(\.colorScheme) var colorScheme
        var ci: ChatItem
-        var showMember: Bool = false
        var maxWidth: CGFloat
        var scrollProxy: ScrollViewProxy?
        var deleteMessage: (CIDeleteMode) -> Void
        @Binding var deletingItem: ChatItem?
        @Binding var composeState: ComposeState
        @Binding var showDeleteMessage: Bool
-        
+
        @State private var revealed = false
        @State private var showChatItemInfoSheet: Bool = false
        @State private var chatItemInfo: ChatItemInfo?
-        
+
        @State private var allowMenu: Bool = true
-        
+
        @State private var audioPlayer: AudioPlayer?
        @State private var playbackState: VoiceMessagePlaybackState = .noPlayback
        @State private var playbackTime: TimeInterval?
@@ -504,8 +513,9 @@ struct ChatView: View {
            )
            
            VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+                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("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                    chatItemReactions()
                        .padding(.bottom, 4)
@@ -591,15 +601,15 @@ struct ChatView: View {
                }
                menu.append(shareUIAction())
                menu.append(copyUIAction())
-                if let filePath = getLoadedFilePath(ci.file) {
+                if let fileSource = getLoadedFileSource(ci.file) {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
-                            menu.append(saveFileAction(filePath))
+                            menu.append(saveFileAction(fileSource))
                        } else {
                            menu.append(saveImageAction(image))
                        }
                    } else {
-                        menu.append(saveFileAction(filePath))
+                        menu.append(saveFileAction(fileSource))
                    }
                }
                if ci.meta.editable && !mc.isVoice && !live {
@@ -627,6 +637,7 @@ struct ChatView: View {
                menu.append(viewInfoUIAction())
                menu.append(deleteUIAction())
            } else if ci.isDeletedContent {
+                menu.append(viewInfoUIAction())
                menu.append(deleteUIAction())
            }
            return menu
@@ -736,13 +747,12 @@ struct ChatView: View {
            }
        }
        
-        private func saveFileAction(_ filePath: String) -> UIAction {
+        private func saveFileAction(_ fileSource: CryptoFile) -> UIAction {
            UIAction(
                title: NSLocalizedString("Save", comment: "chat item action"),
-                image: UIImage(systemName: "square.and.arrow.down")
+                image: UIImage(systemName: fileSource.cryptoArgs == nil ? "square.and.arrow.down" : "lock.open")
            ) { _ in
-                let fileURL = URL(fileURLWithPath: filePath)
-                showShareSheet(items: [fileURL])
+                saveCryptoFile(fileSource)
            }
        }
        
@@ -769,6 +779,12 @@ struct ChatView: View {
                        await MainActor.run {
                            chatItemInfo = ciInfo
                        }
+                        if case let .group(gInfo) = chat.chatInfo {
+                            let groupMembers = await apiListMembers(gInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                            }
+                        }
                    } catch let error {
                        logger.error("apiGetChatItemInfo error: \(responseError(error))")
                    }
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
@@ -44,7 +44,6 @@ struct ComposeState {
    var contextItem: ComposeContextItem
    var voiceMessageRecordingState: VoiceMessageRecordingState
    var inProgress = false
-    var disabled = false
    var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)

    init(
@@ -168,25 +167,23 @@ struct ComposeState {
 }

 func chatItemPreview(chatItem: ChatItem) -> ComposePreview {
-    let chatItemPreview: ComposePreview
    switch chatItem.content.msgContent {
    case .text:
-        chatItemPreview = .noPreview
+        return .noPreview
    case let .link(_, preview: preview):
-        chatItemPreview = .linkPreview(linkPreview: preview)
+        return .linkPreview(linkPreview: preview)
    case let .image(_, image):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
    case let .video(_, image, _):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
    case let .voice(_, duration):
-        chatItemPreview = .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
+        return .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
    case .file:
        let fileName = chatItem.file?.fileName ?? ""
-        chatItemPreview = .filePreview(fileName: fileName, file: getAppFilePath(fileName))
+        return .filePreview(fileName: fileName, file: getAppFilePath(fileName))
    default:
-        chatItemPreview = .noPreview
+        return .noPreview
    }
-    return chatItemPreview
 }

 enum UploadContent: Equatable {
@@ -241,6 +238,7 @@ struct ComposeView: View {
    @State var pendingLinkUrl: URL? = nil
    @State var cancelledLinks: Set<String> = []

+    @Environment(\.colorScheme) private var colorScheme
    @State private var showChooseSource = false
    @State private var showMediaPicker = false
    @State private var showTakePhoto = false
@@ -255,6 +253,8 @@ struct ComposeView: View {
    // this is a workaround to fire an explicit event in certain cases
    @State private var stopPlayback: Bool = false

+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+
    var body: some View {
        VStack(spacing: 0) {
            contextItemView()
@@ -309,7 +309,10 @@ struct ComposeView: View {
                        allowVoiceMessagesToContact: allowVoiceMessagesToContact,
                        timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                        onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
-                        keyboardVisible: $keyboardVisible
+                        keyboardVisible: $keyboardVisible,
+                        sendButtonColor: chat.chatInfo.incognito
+                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
+                            : .accentColor
                    )
                    .padding(.trailing, 12)
                    .background(.background)
@@ -442,7 +445,15 @@ struct ComposeView: View {
            } else if (composeState.inProgress) {
                clearCurrentDraft()
            } else if !composeState.empty  {
-                saveCurrentDraft()
+                if case .recording = composeState.voiceMessageRecordingState {
+                    finishVoiceMessageRecording()
+                    if let fileName = composeState.voiceMessageRecordingFileName {
+                        chatModel.filesToDelete.insert(getAppFilePath(fileName))
+                    }
+                }
+                if saveLastDraft {
+                    saveCurrentDraft()
+                }
            } else {
                cancelCurrentVoiceRecording()
                clearCurrentDraft()
@@ -643,10 +654,10 @@ struct ComposeView: View {
                }
            case let .voicePreview(recordingFileName, duration):
                stopPlayback.toggle()
-                chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
+                let file = voiceCryptoFile(recordingFileName)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
            case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file) {
+                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                }
            }
@@ -655,27 +666,28 @@ struct ComposeView: View {
        return sent

        func sending() async {
-            await MainActor.run { composeState.disabled = true }
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                if composeState.disabled { composeState.inProgress = true }
-            }
+            await MainActor.run { composeState.inProgress = true }
        }

        func updateMessage(_ ei: ChatItem, live: Bool) async -> ChatItem? {
            if let oldMsgContent = ei.content.msgContent {
                do {
                    let mc = updateMsgContent(oldMsgContent)
-                    let chatItem = try await apiUpdateChatItem(
-                        type: chat.chatInfo.chatType,
-                        id: chat.chatInfo.apiId,
-                        itemId: ei.id,
-                        msg: mc,
-                        live: live
-                    )
-                    await MainActor.run {
-                        _ = self.chatModel.upsertChatItem(self.chat.chatInfo, chatItem)
+                    if mc != oldMsgContent || (ei.meta.itemLive ?? false) {
+                        let chatItem = try await apiUpdateChatItem(
+                            type: chat.chatInfo.chatType,
+                            id: chat.chatInfo.apiId,
+                            itemId: ei.id,
+                            msg: mc,
+                            live: live
+                        )
+                        await MainActor.run {
+                            _ = self.chatModel.upsertChatItem(self.chat.chatInfo, chatItem)
+                        }
+                        return chatItem
+                    } else {
+                        return nil
                    }
-                    return chatItem
                } catch {
                    logger.error("ChatView.sendMessage error: \(error.localizedDescription)")
                    AlertManager.shared.showAlertMsg(title: "Error updating message", message: "Error: \(responseError(error))")
@@ -713,13 +725,28 @@ struct ComposeView: View {

        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
            let (image, data) = imageData
-            if case let .video(_, url, duration) = data, let savedFile = saveFileFromURLWithoutLoad(url) {
+            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
            }
            return nil
        }

-        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
+            if !privacyEncryptLocalFilesGroupDefault.get() {
+                return CryptoFile.plain(fileName)
+            }
+            let url = getAppFilePath(fileName)
+            let toFile = generateNewFileName("voice", "m4a")
+            let toUrl = getAppFilePath(toFile)
+            if let cfArgs = try? encryptCryptoFile(fromPath: url.path, toPath: toUrl.path) {
+                removeFile(url)
+                return CryptoFile(filePath: toFile, cryptoArgs: cfArgs)
+            } else {
+                return nil
+            }
+        }
+
+        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
            if let chatItem = await apiSendMessage(
                type: chat.chatInfo.chatType,
                id: chat.chatInfo.apiId,
@@ -736,7 +763,7 @@ struct ComposeView: View {
                return chatItem
            }
            if let file = file {
-                removeFile(file)
+                removeFile(file.filePath)
            }
            return nil
        }
@@ -756,7 +783,7 @@ struct ComposeView: View {
            }
        }

-        func saveAnyImage(_ img: UploadContent) -> String? {
+        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
            switch img {
            case let .simpleImage(image): return saveImage(image)
            case let .animatedImage(image): return saveAnimImage(image)
@@ -848,7 +875,6 @@ struct ComposeView: View {

    private func clearState(live: Bool = false) {
        if live {
-            composeState.disabled = false
            composeState.inProgress = false
        } else {
            composeState = ComposeState()
@@ -861,12 +887,6 @@ struct ComposeView: View {
    }

    private func saveCurrentDraft() {
-        if case .recording = composeState.voiceMessageRecordingState {
-            finishVoiceMessageRecording()
-            if let fileName = composeState.voiceMessageRecordingFileName {
-                chatModel.filesToDelete.insert(getAppFilePath(fileName))
-            }
-        }
        chatModel.draft = composeState
        chatModel.draftChatId = chat.id
    }
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeVoiceView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeVoiceView.swift
@@ -188,7 +188,7 @@ struct ComposeVoiceView: View {
                playbackTime = recordingTime // animate progress bar to the end
            }
        )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: CryptoFile.plain(recordingFileName), at: playbackTime)
        playbackState = .playing
    }
 }
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift
@@ -22,13 +22,14 @@ struct ContextItemView: View {
                .aspectRatio(contentMode: .fit)
                .frame(width: 16, height: 16)
                .foregroundColor(.secondary)
-            MsgContentView(
-                text: contextItem.text,
-                formattedText: contextItem.formattedText,
-                sender: contextItem.memberDisplayName
-            )
-            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-            .lineLimit(3)
+            if let sender = contextItem.memberDisplayName {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    msgContentView(lines: 2)
+                }
+            } else {
+                msgContentView(lines: 3)
+            }
            Spacer()
            Button {
                withAnimation {
@@ -44,6 +45,15 @@ struct ContextItemView: View {
        .background(chatItemFrameColor(contextItem, colorScheme))
        .padding(.top, 8)
    }
+
+    private func msgContentView(lines: Int) -> some View {
+        MsgContentView(
+            text: contextItem.text,
+            formattedText: contextItem.formattedText
+        )
+        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+        .lineLimit(lines)
+    }
 }

 struct ContextItemView_Previews: PreviewProvider {
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift
@@ -28,6 +28,7 @@ struct SendMessageView: View {
    @State private var holdingVMR = false
    @Namespace var namespace
    @Binding var keyboardVisible: Bool
+    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)
@@ -36,6 +37,7 @@ struct SendMessageView: View {
    @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
@@ -81,7 +83,7 @@ struct SendMessageView: View {
                    }
                }

-                if composeState.inProgress {
+                if progressByTimeout {
                    ProgressView()
                        .scaleEffect(1.4)
                        .frame(width: 31, height: 31, alignment: .center)
@@ -102,6 +104,15 @@ struct SendMessageView: View {
                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
                .frame(height: teHeight)
        }
+        .onChange(of: composeState.inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+                    progressByTimeout = composeState.inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
+        }
        .padding(.vertical, 8)
    }

@@ -119,7 +130,7 @@ struct SendMessageView: View {
                        startVoiceMessageRecording: startVoiceMessageRecording,
                        finishVoiceMessageRecording: finishVoiceMessageRecording,
                        holdingVMR: $holdingVMR,
-                        disabled: composeState.disabled
+                        disabled: composeState.inProgress
                    )
                } else {
                    voiceMessageNotAllowedButton()
@@ -159,13 +170,13 @@ struct SendMessageView: View {
                  ? "checkmark.circle.fill"
                  : "arrow.up.circle.fill")
            .resizable()
-            .foregroundColor(.accentColor)
+            .foregroundColor(sendButtonColor)
            .frame(width: sendButtonSize, height: sendButtonSize)
            .opacity(sendButtonOpacity)
        }
        .disabled(
            !composeState.sendEnabled ||
-            composeState.disabled ||
+            composeState.inProgress ||
            (!voiceMessageAllowed && composeState.voicePreview) ||
            composeState.endLiveDisabled
        )
@@ -293,7 +304,7 @@ struct SendMessageView: View {
            Image(systemName: "mic")
                .foregroundColor(.secondary)
        }
-        .disabled(composeState.disabled)
+        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
        .padding([.bottom, .trailing], 4)
    }
@@ -378,7 +389,7 @@ struct SendMessageView: View {
            Image(systemName: "stop.fill")
                .foregroundColor(.accentColor)
        }
-        .disabled(composeState.disabled)
+        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
        .padding([.bottom, .trailing], 4)
    }
--- a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
@@ -9,6 +9,8 @@
 import SwiftUI
 import SimpleXChat

+let SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
+
 struct GroupChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
@@ -21,6 +23,8 @@ struct GroupChatInfoView: View {
    @State private var showAddMembersSheet: Bool = false
    @State private var connectionStats: ConnectionStats?
    @State private var connectionCode: String?
+    @State private var sendReceipts = SendReceipts.userDefault(true)
+    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @State private var searchText: String = ""
    @FocusState private var searchFocussed
@@ -30,6 +34,7 @@ struct GroupChatInfoView: View {
        case clearChatAlert
        case leaveGroupAlert
        case cantInviteIncognitoAlert
+        case largeGroupReceiptsDisabled

        var id: GroupChatInfoViewAlert { get { self } }
    }
@@ -52,6 +57,11 @@ struct GroupChatInfoView: View {
                        addOrEditWelcomeMessage()
                    }
                    groupPreferencesButton($groupInfo)
+                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                        sendReceiptsOption()
+                    } else {
+                        sendReceiptsOptionDisabled()
+                    }
                } header: {
                    Text("")
                } footer: {
@@ -115,9 +125,14 @@ struct GroupChatInfoView: View {
            case .clearChatAlert: return clearChatAlert()
            case .leaveGroupAlert: return leaveGroupAlert()
            case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
+            case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
            }
        }
        .onAppear {
+            if let currentUser = chatModel.currentUser {
+                sendReceiptsUserDefault = currentUser.sendRcptsSmallGroups
+            }
+            sendReceipts = SendReceipts.fromBool(groupInfo.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
            do {
                if let link = try apiGetGroupLink(groupInfo.groupId) {
                    (groupLink, groupLinkMemberRole) = link
@@ -138,12 +153,14 @@ struct GroupChatInfoView: View {
                .padding()
            Text(cInfo.displayName)
                .font(.largeTitle)
-                .lineLimit(1)
+                .multilineTextAlignment(.center)
+                .lineLimit(4)
                .padding(.bottom, 2)
            if cInfo.fullName != "" && cInfo.fullName != cInfo.displayName {
                Text(cInfo.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(8)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
@@ -326,6 +343,38 @@ struct GroupChatInfoView: View {
            secondaryButton: .cancel()
        )
    }
+
+    private func sendReceiptsOption() -> some View {
+        Picker(selection: $sendReceipts) {
+            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
+                Text(opt.text)
+            }
+        } label: {
+            Label("Send receipts", systemImage: "checkmark.message")
+        }
+        .frame(height: 36)
+        .onChange(of: sendReceipts) { _ in
+            setSendReceipts()
+        }
+    }
+
+    private func setSendReceipts() {
+        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
+        chatSettings.sendRcpts = sendReceipts.bool()
+        updateChatSettings(chat, chatSettings: chatSettings)
+    }
+
+    private func sendReceiptsOptionDisabled() -> some View {
+        HStack {
+            Label("Send receipts", systemImage: "checkmark.message")
+            Spacer()
+            Text("disabled")
+                .foregroundStyle(.secondary)
+        }
+        .onTapGesture {
+            alert = .largeGroupReceiptsDisabled
+        }
+    }
 }

 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -354,6 +403,13 @@ func cantInviteIncognitoAlert() -> Alert {
    )
 }

+func largeGroupReceiptsDisabledAlert() -> Alert {
+    Alert(
+        title: Text("Receipts are disabled"),
+        message: Text("This group has over \(SMALL_GROUPS_RCPS_MEM_LIMIT) members, delivery receipts are not sent.")
+    )
+}
+
 struct GroupChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
--- a/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
@@ -19,6 +19,7 @@ struct GroupMemberInfoView: View {
    @State private var connectionCode: String? = nil
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
+    @State private var connectToMemberDialog: Bool = false
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @State private var justOpened = true

@@ -38,8 +39,8 @@ struct GroupMemberInfoView: View {
            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
-            case .connRequestSentAlert: return "connRequestSentAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
+            case .connRequestSentAlert: return "connRequestSentAlert"
            case let .error(title, _): return "error \(title)"
            case let .other(alert): return "other \(alert)"
            }
@@ -82,9 +83,10 @@ struct GroupMemberInfoView: View {
                        if let connStats = connectionStats,
                           connStats.ratchetSyncAllowed {
                            synchronizeConnectionButton()
-                        } else if developerTools {
-                            synchronizeConnectionButtonForce()
                        }
+//                        } else if developerTools {
+//                            synchronizeConnectionButtonForce()
+//                        }
                    }
                }

@@ -141,7 +143,7 @@ struct GroupMemberInfoView: View {
                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                            || connStats.ratchetSyncSendProhibited
                        )
-                        if connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil } {
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
                            Button("Abort changing address") {
                                alert = .abortSwitchAddressAlert
                            }
@@ -209,15 +211,19 @@ struct GroupMemberInfoView: View {

    func connectViaAddressButton(_ contactLink: String) -> some View {
        Button {
-            connectViaAddress(contactLink)
+            connectToMemberDialog = true
        } 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(_ contactLink: String) {
+    func connectViaAddress(incognito: Bool, contactLink: String) {
        Task {
-            let (connReqType, connectAlert) = await apiConnect_(connReq: contactLink)
+            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
            if let connReqType = connReqType {
                alert = .connRequestSentAlert(type: connReqType)
            } else if let connectAlert = connectAlert {
@@ -260,19 +266,30 @@ struct GroupMemberInfoView: View {
                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
-            HStack {
-                if mem.verified {
-                    Image(systemName: "checkmark.shield")
-                }
+            if mem.verified {
+                (
+                    Text(Image(systemName: "checkmark.shield"))
+                        .foregroundColor(.secondary)
+                        .font(.title2)
+                    + Text(" ")
+                    + Text(mem.displayName)
+                        .font(.largeTitle)
+                )
+                .multilineTextAlignment(.center)
+                .lineLimit(2)
+                .padding(.bottom, 2)
+            } else {
                Text(mem.displayName)
                    .font(.largeTitle)
-                    .lineLimit(1)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(2)
+                    .padding(.bottom, 2)
            }
-            .padding(.bottom, 2)
            if mem.fullName != "" && mem.fullName != mem.displayName {
                Text(mem.fullName)
                    .font(.title2)
-                    .lineLimit(2)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(4)
            }
        }
        .frame(maxWidth: .infinity, alignment: .center)
--- a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
@@ -130,7 +130,7 @@ struct GroupProfileView: View {
                let err = responseError(error)
                saveGroupError = err
                showSaveErrorAlert = true
-                logger.error("UserProfile apiUpdateProfile error: \(err)")
+                logger.error("GroupProfile apiUpdateGroup error: \(err)")
            }
        }
    }
--- a/apps/ios/Shared/Views/Chat/ScanCodeView.swift
+++ b/apps/ios/Shared/Views/Chat/ScanCodeView.swift
@@ -19,7 +19,7 @@ struct ScanCodeView: View {
        VStack(alignment: .leading) {
            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
-                .border(.gray)
+                .cornerRadius(12)
            Text("Scan security code from your contact's app.")
                .padding(.top)
        }
--- a/apps/ios/Shared/Views/Chat/VerifyCodeView.swift
+++ b/apps/ios/Shared/Views/Chat/VerifyCodeView.swift
@@ -64,7 +64,7 @@ struct VerifyCodeView: View {
                        HStack {
                            NavigationLink {
                                ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
-                                    .navigationBarTitleDisplayMode(.inline)
+                                    .navigationBarTitleDisplayMode(.large)
                                    .navigationTitle("Scan code")
                            } label: {
                                Label("Scan code", systemImage: "qrcode")
--- a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
@@ -222,9 +222,15 @@ struct ChatListNavLink: View {
        ContactRequestView(contactRequest: contactRequest, chat: chat)
        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
            Button {
-                Task { await acceptContactRequest(contactRequest) }
-            } label: { Label("Accept", systemImage: chatModel.incognito ? "theatermasks" : "checkmark") }
-                .tint(chatModel.incognito ? .indigo : .accentColor)
+                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
+            } label: { Label("Accept", systemImage: "checkmark") }
+                .tint(.accentColor)
+            Button {
+                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
+            } label: {
+                Label("Accept incognito", systemImage: "theatermasks")
+            }
+            .tint(.indigo)
            Button {
                AlertManager.shared.showAlert(rejectContactRequestAlert(contactRequest))
            } label: {
@@ -234,9 +240,10 @@ struct ChatListNavLink: View {
        }
        .frame(height: rowHeights[dynamicTypeSize])
        .onTapGesture { showContactRequestDialog = true }
-        .confirmationDialog("Connection request", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
-            Button(chatModel.incognito ? "Accept incognito" : "Accept contact") { Task { await acceptContactRequest(contactRequest) } }
-            Button("Reject contact (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
+        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
+            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
+            Button("Accept incognito") { Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) } }
+            Button("Reject (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
        }
    }

@@ -263,6 +270,7 @@ struct ChatListNavLink: View {
        .sheet(isPresented: $showContactConnectionInfo) {
            if case let .contactConnection(contactConnection) = chat.chatInfo {
                ContactConnectionInfo(contactConnection: contactConnection)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
        }
        .onTapGesture {
@@ -379,6 +387,7 @@ struct ChatListNavLink: View {
            .onTapGesture { showInvalidJSON = true }
            .sheet(isPresented: $showInvalidJSON) {
                invalidJSONView(json)
+                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
    }
 }
--- a/apps/ios/Shared/Views/ChatList/ChatListView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListView.swift
@@ -60,8 +60,6 @@ struct ChatListView: View {
                chatList
            }
        }
-        .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
-        .onAppear() { connectViaUrl() }
        .onDisappear() { withAnimation { userPickerVisible = false } }
        .refreshable {
            AlertManager.shared.showAlert(Alert(
@@ -108,11 +106,6 @@ struct ChatListView: View {
            }
            ToolbarItem(placement: .principal) {
                HStack(spacing: 4) {
-                    if (chatModel.incognito) {
-                        Image(systemName: "theatermasks")
-                            .foregroundColor(.indigo)
-                            .padding(.trailing, 8)
-                    }
                    Text("Chats")
                        .font(.headline)
                    if chatModel.chats.count > 0 {
--- a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
@@ -15,6 +15,8 @@ struct ChatPreviewView: View {
    @Environment(\.colorScheme) var colorScheme
    var darkGreen = Color(red: 0, green: 0.5, blue: 0)

+    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
+
    var body: some View {
        let cItem = chat.chatItems.last
        return HStack(spacing: 8) {
@@ -41,11 +43,9 @@ struct ChatPreviewView: View {

                ZStack(alignment: .topTrailing) {
                    chatMessagePreview(cItem)
-                    if case .direct = chat.chatInfo {
-                        chatStatusImage()
-                            .padding(.top, 24)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    }
+                    chatStatusImage()
+                        .padding(.top, 26)
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                }
                .padding(.trailing, 8)
                
@@ -59,12 +59,9 @@ struct ChatPreviewView: View {
    @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
        if case let .group(groupInfo) = chat.chatInfo {
            switch (groupInfo.membership.memberStatus) {
-            case .memLeft:
-                groupInactiveIcon()
-            case .memRemoved:
-                groupInactiveIcon()
-            case .memGroupDeleted:
-                groupInactiveIcon()
+            case .memLeft: groupInactiveIcon()
+            case .memRemoved: groupInactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
            default: EmptyView()
            }
        } else {
@@ -74,7 +71,7 @@ struct ChatPreviewView: View {

    @ViewBuilder private func groupInactiveIcon() -> some View {
        Image(systemName: "multiply.circle.fill")
-            .foregroundColor(.secondary)
+            .foregroundColor(.secondary.opacity(0.65))
            .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
    }

@@ -106,7 +103,7 @@ struct ChatPreviewView: View {
            .kerning(-2)
    }

-    private func chatPreviewLayout(_ text: Text) -> some View {
+    private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
        ZStack(alignment: .topTrailing) {
            text
                .lineLimit(2)
@@ -114,6 +111,8 @@ struct ChatPreviewView: View {
                .frame(maxWidth: .infinity, alignment: .topLeading)
                .padding(.leading, 8)
                .padding(.trailing, 36)
+                .privacySensitive(!showChatPreviews && !draft)
+                .redacted(reason: .privacy)
            let s = chat.chatStats
            if s.unreadCount > 0 || s.unreadChat {
                unreadCountText(s.unreadCount)
@@ -175,7 +174,7 @@ struct ChatPreviewView: View {

    @ViewBuilder private func chatMessagePreview(_ cItem: ChatItem?) -> some View {
        if chatModel.draftChatId == chat.id, let draft = chatModel.draft {
-            chatPreviewLayout(messageDraft(draft))
+            chatPreviewLayout(messageDraft(draft), draft: true)
        } else if let cItem = cItem {
            chatPreviewLayout(itemStatusMark(cItem) + chatItemPreview(cItem))
        } else {
@@ -198,10 +197,7 @@ struct ChatPreviewView: View {
    @ViewBuilder private func groupInvitationPreviewText(_ groupInfo: GroupInfo) -> some View {
        groupInfo.membership.memberIncognito
        ? chatPreviewInfoText("join as \(groupInfo.membership.memberProfile.displayName)")
-        : (chatModel.incognito
-           ? chatPreviewInfoText("join as \(chatModel.currentUser?.profile.displayName ?? "yourself")")
-           : chatPreviewInfoText("you are invited to group")
-        )
+        : chatPreviewInfoText("you are invited to group")
    }

    @ViewBuilder private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
@@ -229,7 +225,7 @@ struct ChatPreviewView: View {
        switch chat.chatInfo {
        case let .direct(contact):
            switch (chatModel.contactNetworkStatus(contact)) {
-            case .connected: EmptyView()
+            case .connected: incognitoIcon(chat.chatInfo.incognito)
            case .error:
                Image(systemName: "exclamationmark.circle")
                    .resizable()
@@ -240,11 +236,23 @@ struct ChatPreviewView: View {
                ProgressView()
            }
        default:
-            EmptyView()
+            incognitoIcon(chat.chatInfo.incognito)
        }
    }
 }

+@ViewBuilder func incognitoIcon(_ incognito: Bool) -> some View {
+    if incognito {
+        Image(systemName: "theatermasks")
+            .resizable()
+            .scaledToFit()
+            .frame(width: 22, height: 22)
+            .foregroundColor(.secondary)
+    } else {
+        EmptyView()
+    }
+}
+
 func unreadCountText(_ n: Int) -> Text {
    Text(n > 999 ? "\(n / 1000)k" : n > 0 ? "\(n)" : "")
 }
@@ -258,20 +266,20 @@ struct ChatPreviewView_Previews: PreviewProvider {
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now))]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
            ))
            ChatPreviewView(chat: Chat(
                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
            ))
            ChatPreviewView(chat: Chat(
--- a/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift
+++ b/apps/ios/Shared/Views/ChatList/ContactConnectionInfo.swift
@@ -15,6 +15,7 @@ struct ContactConnectionInfo: View {
    @State var contactConnection: PendingContactConnection
    @State private var alert: CCInfoAlert?
    @State private var localAlias = ""
+    @State private var showIncognitoSheet = false
    @FocusState private var aliasTextFieldFocused: Bool

    enum CCInfoAlert: Identifiable {
@@ -31,19 +32,14 @@ struct ContactConnectionInfo: View {

    var body: some View {
        NavigationView {
-            List {
+            let v = List {
                Group {
-                    Text(contactConnection.initiated ? "You invited your contact" : "You accepted connection")
+                    Text(contactConnection.initiated ? "You invited a contact" : "You accepted connection")
                        .font(.largeTitle)
                        .bold()
-                        .padding(.bottom, 16)
+                        .padding(.bottom)

                    Text(contactConnectionText(contactConnection))
-                        .padding(.bottom, 16)
-
-                    if let connReqInv = contactConnection.connReqInv {
-                        OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInv)
-                    }
                }
                .listRowBackground(Color.clear)
                .listRowSeparator(.hidden)
@@ -65,10 +61,16 @@ struct ContactConnectionInfo: View {

                    if contactConnection.initiated,
                       let connReqInv = contactConnection.connReqInv {
-                        oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInv)
+                        QRCode(uri: connReqInv)
+                        incognitoEnabled()
+                        shareLinkButton(connReqInv)
+                        oneTimeLinkLearnMoreButton()
                    } else {
+                        incognitoEnabled()
                        oneTimeLinkLearnMoreButton()
                    }
+                } footer: {
+                    sharedProfileInfo(contactConnection.incognito)
                }

                Section {
@@ -80,6 +82,14 @@ struct ContactConnectionInfo: View {
                    }
                }
            }
+            if #available(iOS 16, *) {
+                v
+            } else {
+                // navigationBarHidden is added conditionally,
+                // because the view jumps in iOS 17 if this is added,
+                // and on iOS 16+ it is hidden without it.
+                v.navigationBarHidden(true)
+            }
        }
        .alert(item: $alert) { _alert in
            switch _alert {
@@ -128,6 +138,30 @@ struct ContactConnectionInfo: View {
        )
        : "You will be connected when your contact's device is online, please wait or check later!"
    }
+
+    @ViewBuilder private func incognitoEnabled() -> some View {
+        if contactConnection.incognito {
+            ZStack(alignment: .leading) {
+                Image(systemName: "theatermasks.fill")
+                    .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                    .foregroundColor(Color.indigo)
+                    .font(.system(size: 14))
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+                .padding(.leading, 36)
+            }
+            .sheet(isPresented: $showIncognitoSheet) {
+                IncognitoHelp()
+            }
+        }
+    }
 }

 struct ContactConnectionInfo_Previews: PreviewProvider {
--- a/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift
+++ b/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift
@@ -58,10 +58,14 @@ struct ContactConnectionView: View {
                }
                .padding(.bottom, 2)

-                Text(contactConnection.description)
-                    .frame(alignment: .topLeading)
-                    .padding(.horizontal, 8)
-                    .padding(.bottom, 2)
+                ZStack(alignment: .topTrailing) {
+                    Text(contactConnection.description)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    incognitoIcon(contactConnection.incognito)
+                        .padding(.top, 26)
+                        .frame(maxWidth: .infinity, alignment: .trailing)
+                }
+                .padding(.horizontal, 8)

                Spacer()
            }
--- a/apps/ios/Shared/Views/ChatList/ContactRequestView.swift
+++ b/apps/ios/Shared/Views/ChatList/ContactRequestView.swift
@@ -24,7 +24,7 @@ struct ContactRequestView: View {
                    Text(contactRequest.chatViewName)
                        .font(.title3)
                        .fontWeight(.bold)
-                        .foregroundColor(chatModel.incognito ? .indigo : .accentColor)
+                        .foregroundColor(.accentColor)
                        .padding(.leading, 8)
                        .frame(alignment: .topLeading)
                    Spacer()
--- a/apps/ios/Shared/Views/Helpers/ImagePicker.swift
+++ b/apps/ios/Shared/Views/Helpers/ImagePicker.swift
@@ -133,7 +133,7 @@ struct LibraryMediaListPicker: UIViewControllerRepresentable {
        config.filter = .any(of: [.images, .videos])
        config.selectionLimit = selectionLimit
        config.selection = .ordered
-        //config.preferredAssetRepresentationMode = .current
+        config.preferredAssetRepresentationMode = .current
        let controller = PHPickerViewController(configuration: config)
        controller.delegate = context.coordinator
        return controller
--- a/apps/ios/Shared/Views/Helpers/LocalAuthenticationUtils.swift
+++ b/apps/ios/Shared/Views/Helpers/LocalAuthenticationUtils.swift
@@ -37,7 +37,7 @@ struct LocalAuthRequest {
 }

 func authenticate(title: LocalizedStringKey? = nil, reason: String, selfDestruct: Bool = false, completed: @escaping (LAResult) -> Void) {
-    logger.debug("authenticate")
+    logger.debug("DEBUGGING: authenticate")
    switch privacyLocalAuthModeDefault.get() {
    case .system: systemAuthenticate(reason, completed)
    case .passcode:
@@ -58,21 +58,24 @@ func authenticate(title: LocalizedStringKey? = nil, reason: String, selfDestruct
 }

 func systemAuthenticate(_ reason: String, _ completed: @escaping (LAResult) -> Void) {
+    logger.debug("DEBUGGING: systemAuthenticate")
    let laContext = LAContext()
    var authAvailabilityError: NSError?
    if laContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: &authAvailabilityError) {
+        logger.debug("DEBUGGING: systemAuthenticate: canEvaluatePolicy callback")
        laContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { success, authError in
+            logger.debug("DEBUGGING: systemAuthenticate evaluatePolicy callback")
            DispatchQueue.main.async {
                if success {
                    completed(LAResult.success)
                } else {
-                    logger.error("authentication error: \(authError.debugDescription)")
+                    logger.error("DEBUGGING: systemAuthenticate authentication error: \(authError.debugDescription)")
                    completed(LAResult.failed(authError: authError?.localizedDescription))
                }
            }
        }
    } else {
-        logger.error("authentication availability error: \(authAvailabilityError.debugDescription)")
+        logger.error("DEBUGGING: authentication availability error: \(authAvailabilityError.debugDescription)")
        completed(LAResult.unavailable(authError: authAvailabilityError?.localizedDescription))
    }
 }
--- a/apps/ios/Shared/Views/Helpers/ShareSheet.swift
+++ b/apps/ios/Shared/Views/Helpers/ShareSheet.swift
@@ -8,11 +8,15 @@

 import SwiftUI

-func showShareSheet(items: [Any]) {
+func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
    let keyWindowScene = UIApplication.shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
    if let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first,
       let presentedViewController = keyWindow.rootViewController?.presentedViewController ?? keyWindow.rootViewController {
        let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
+        if let completed = completed {
+            let handler: UIActivityViewController.CompletionWithItemsHandler = { _,_,_,_ in completed() }
+            activityViewController.completionWithItemsHandler = handler
+        }
        presentedViewController.present(activityViewController, animated: true)
    }
 }
--- a/apps/ios/Shared/Views/NewChat/AddContactView.swift
+++ b/apps/ios/Shared/Views/NewChat/AddContactView.swift
@@ -12,38 +12,92 @@ import SimpleXChat

 struct AddContactView: View {
    @EnvironmentObject private var chatModel: ChatModel
-    var contactConnection: PendingContactConnection? = nil
+    @Binding var contactConnection: PendingContactConnection?
    var connReqInvitation: String
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false

    var body: some View {
-        List {
-            OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
-                .listRowBackground(Color.clear)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
-            Section("1-time link") {
-                oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
+        VStack {
+            List {
+                Section {
+                    if connReqInvitation != "" {
+                        QRCode(uri: connReqInvitation)
+                    } else {
+                        ProgressView()
+                            .progressViewStyle(.circular)
+                            .scaleEffect(2)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical)
+                    }
+                    IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                        .disabled(contactConnection == nil)
+                    shareLinkButton(connReqInvitation)
+                    oneTimeLinkLearnMoreButton()
+                } header: {
+                    Text("1-time link")
+                } footer: {
+                    sharedProfileInfo(incognitoDefault)
+                }
            }
        }
        .onAppear { chatModel.connReqInv = connReqInvitation }
+        .onChange(of: incognitoDefault) { incognito in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            ChatModel.shared.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
+        }
    }
 }

-@ViewBuilder func oneTimeLinkSection(contactConnection: PendingContactConnection? = nil, connReqInvitation: String) -> some View {
-    if connReqInvitation != "" {
-        QRCode(uri: connReqInvitation)
-    } else {
-        ProgressView()
-            .progressViewStyle(.circular)
-            .scaleEffect(2)
-            .frame(maxWidth: .infinity)
-            .padding(.vertical)
+struct IncognitoToggle: View {
+    @Binding var incognitoEnabled: Bool
+    @State private var showIncognitoSheet = false
+
+    var body: some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
+                .font(.system(size: 14))
+            Toggle(isOn: $incognitoEnabled) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+            }
+            .padding(.leading, 36)
+        }
+        .sheet(isPresented: $showIncognitoSheet) {
+            IncognitoHelp()
+        }
    }
-    shareLinkButton(connReqInvitation)
-    oneTimeLinkLearnMoreButton()
 }

-private func shareLinkButton(_ connReqInvitation: String) -> some View {
+func sharedProfileInfo(_ 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 shareLinkButton(_ connReqInvitation: String) -> some View {
    Button {
        showShareSheet(items: [connReqInvitation])
    } label: {
@@ -65,26 +119,11 @@ func oneTimeLinkLearnMoreButton() -> some View {
    }
 }

-struct OneTimeLinkProfileText: View {
-    @EnvironmentObject private var chatModel: ChatModel
-    var contactConnection: PendingContactConnection? = nil
-    var connReqInvitation: String
-
-    var body: some View {
-        HStack {
-            if (contactConnection?.incognito ?? chatModel.incognito) {
-                Image(systemName: "theatermasks").foregroundColor(.indigo)
-                Text("A random profile will be sent to your contact")
-            } else {
-                Image(systemName: "info.circle").foregroundColor(.secondary)
-                Text("Your chat profile will be sent to your contact")
-            }
-        }
-    }
-}
-
 struct AddContactView_Previews: PreviewProvider {
    static var previews: some View {
-        AddContactView(connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D")
+        AddContactView(
+            contactConnection: Binding.constant(PendingContactConnection.getSampleData()),
+            connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D"
+        )
    }
 }
--- a/apps/ios/Shared/Views/NewChat/AddGroupView.swift
+++ b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
@@ -47,21 +47,13 @@ struct AddGroupView: View {
                .padding(.vertical, 4)
            Text("The group is fully decentralized – it is visible only to the members.")
                .padding(.bottom, 4)
-            if (m.incognito) {
-                HStack {
-                    Image(systemName: "info.circle").foregroundColor(.orange).font(.footnote)
-                    Spacer().frame(width: 8)
-                    Text("Incognito mode is not supported here - your main profile will be sent to group members").font(.footnote)
-                }
-                .padding(.bottom)
-            } else {
-                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)
+
+            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) {
--- a/apps/ios/Shared/Views/NewChat/CreateLinkView.swift
+++ b/apps/ios/Shared/Views/NewChat/CreateLinkView.swift
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import SimpleXChat

 enum CreateLinkTab {
    case oneTime
@@ -24,6 +25,7 @@ struct CreateLinkView: View {
    @EnvironmentObject var m: ChatModel
    @State var selection: CreateLinkTab
    @State var connReqInvitation: String = ""
+    @State var contactConnection: PendingContactConnection? = nil
    @State private var creatingConnReq = false
    var viaNavLink = false

@@ -39,7 +41,7 @@ struct CreateLinkView: View {

    private func createLinkView() -> some View {
        TabView(selection: $selection) {
-            AddContactView(connReqInvitation: connReqInvitation)
+            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
                .tabItem {
                    Label(
                        connReqInvitation == ""
@@ -56,7 +58,7 @@ struct CreateLinkView: View {
                .tag(CreateLinkTab.longTerm)
        }
        .onChange(of: selection) { _ in
-            if case .oneTime = selection, connReqInvitation == "" && !creatingConnReq {
+            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
                createInvitation()
            }
        }
@@ -69,12 +71,14 @@ struct CreateLinkView: View {
    private func createInvitation() {
        creatingConnReq = true
        Task {
-            let connReq = await apiAddContact()
-            await MainActor.run {
-                if let connReq = connReq {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
                    connReqInvitation = connReq
+                    contactConnection = pcc
                    m.connReqInv = connReq
-                } else {
+                }
+            } else {
+                await MainActor.run {
                    creatingConnReq = false
                }
            }
--- a/apps/ios/Shared/Views/NewChat/NewChatButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatButton.swift
@@ -10,13 +10,13 @@ import SwiftUI
 import SimpleXChat

 enum NewChatAction: Identifiable {
-    case createLink(link: String)
+    case createLink(link: String, connection: PendingContactConnection)
    case connectViaLink
    case createGroup

    var id: String {
        switch self {
-        case let .createLink(link): return "createLink \(link)"
+        case let .createLink(link, _): return "createLink \(link)"
        case .connectViaLink: return "connectViaLink"
        case .createGroup: return "createGroup"
        }
@@ -41,8 +41,8 @@ struct NewChatButton: View {
        }
        .sheet(item: $actionSheet) { sheet in
            switch sheet {
-            case let .createLink(link):
-                CreateLinkView(selection: .oneTime, connReqInvitation: link)
+            case let .createLink(link, pcc):
+                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
            case .connectViaLink: ConnectViaLinkView()
            case .createGroup: AddGroupView()
            }
@@ -51,8 +51,8 @@ struct NewChatButton: View {

    func addContactAction() {
        Task {
-            if let connReq = await apiAddContact() {
-                actionSheet = .createLink(link: connReq)
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                actionSheet = .createLink(link: connReq, connection: pcc)
            }
        }
    }
@@ -63,9 +63,9 @@ enum ConnReqType: Equatable {
    case invitation
 }

-func connectViaLink(_ connectionLink: String, _ dismiss: DismissAction? = nil) {
+func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
    Task {
-        if let connReqType = await apiConnect(connReq: connectionLink) {
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
            DispatchQueue.main.async {
                dismiss?()
                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
@@ -100,12 +100,12 @@ func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
    return crData.type == "group" && crData.groupLinkId != nil
 }

-func groupLinkAlert(_ connectionLink: String) -> Alert {
+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("Connect")) {
-            connectViaLink(connectionLink)
+        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
+            connectViaLink(connectionLink, incognito: incognito)
        },
        secondaryButton: .cancel()
    )
--- a/apps/ios/Shared/Views/NewChat/PasteToConnectView.swift
+++ b/apps/ios/Shared/Views/NewChat/PasteToConnectView.swift
@@ -7,76 +7,77 @@
 //

 import SwiftUI
+import SimpleXChat

 struct PasteToConnectView: View {
-    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
    @State private var connectionLink: String = ""
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @FocusState private var linkEditorFocused: Bool

    var body: some View {
-        ScrollView {
-            VStack(alignment: .leading) {
-                Text("Connect via link")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.vertical)
-                Text("Paste the link you received into the box below to connect with your contact.")
-                    .padding(.bottom, 4)
-                if (chatModel.incognito) {
-                    HStack {
-                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("A random profile will be sent to the contact that you received this link from").font(.footnote)
+        List {
+            Text("Connect via link")
+                .font(.largeTitle)
+                .bold()
+                .fixedSize(horizontal: false, vertical: true)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .onTapGesture { linkEditorFocused = false }
+
+            Section {
+                linkEditor()
+
+                Button {
+                    if connectionLink == "" {
+                        connectionLink = UIPasteboard.general.string ?? ""
+                    } else {
+                        connectionLink = ""
                    }
-                    .padding(.bottom)
-                } else {
-                    HStack {
-                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("Your profile will be sent to the contact that you received this link from").font(.footnote)
+                } label: {
+                    if connectionLink == "" {
+                        settingsRow("doc.plaintext") { Text("Paste") }
+                    } else {
+                        settingsRow("multiply") { Text("Clear") }
                    }
-                    .padding(.bottom)
+                }
+                
+                Button {
+                    connect()
+                } label: {
+                    settingsRow("link") { Text("Connect") }
+                }
+                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
+                
+                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.")
+            }
+        }
+    }
+
+    private func linkEditor() -> some View {
+        ZStack {
+            Group {
+                if connectionLink.isEmpty {
+                    TextEditor(text: Binding.constant(NSLocalizedString("Paste the link you received to connect with your contact.", comment: "placeholder")))
+                        .foregroundColor(.secondary)
+                        .disabled(true)
                }
                TextEditor(text: $connectionLink)
                    .onSubmit(connect)
                    .textInputAutocapitalization(.never)
                    .disableAutocorrection(true)
-                    .allowsTightening(false)
-                    .frame(height: 180)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 10)
-                            .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                    )
-
-                HStack(spacing: 20) {
-                    if connectionLink == "" {
-                        Button {
-                            connectionLink = UIPasteboard.general.string ?? ""
-                        } label: {
-                            Label("Paste", systemImage: "doc.plaintext")
-                        }
-                    } else {
-                        Button {
-                            connectionLink = ""
-                        } label: {
-                            Label("Clear", systemImage: "multiply")
-                        }
-
-                    }
-                    Spacer()
-                    Button(action: connect, label: {
-                        Label("Connect", systemImage: "link")
-                    })
-                    .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
-                }
-                .frame(height: 48)
-                .padding(.bottom)
-
-                Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+                    .focused($linkEditorFocused)
            }
-            .padding()
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+            .allowsTightening(false)
+            .padding(.horizontal, -5)
+            .padding(.top, -8)
+            .frame(height: 180, alignment: .topLeading)
+            .frame(maxWidth: .infinity, alignment: .leading)
        }
    }

@@ -85,9 +86,9 @@ struct PasteToConnectView: View {
        if let crData = parseLinkQueryData(link),
           checkCRDataGroup(crData) {
            dismiss()
-            AlertManager.shared.showAlert(groupLinkAlert(link))
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
        } else {
-            connectViaLink(link, dismiss)
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
        }
    }
 }
--- a/apps/ios/Shared/Views/NewChat/ScanToConnectView.swift
+++ b/apps/ios/Shared/Views/NewChat/ScanToConnectView.swift
@@ -7,11 +7,12 @@
 //

 import SwiftUI
+import SimpleXChat
 import CodeScanner

 struct ScanToConnectView: View {
-    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false

    var body: some View {
        ScrollView {
@@ -19,34 +20,35 @@ struct ScanToConnectView: View {
                Text("Scan QR code")
                    .font(.largeTitle)
                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
                    .padding(.vertical)
-                if (chatModel.incognito) {
-                    HStack {
-                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("A random profile will be sent to your contact").font(.footnote)
-                    }
-                    .padding(.bottom)
-                } else {
-                    HStack {
-                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                        Spacer().frame(width: 8)
-                        Text("Your chat profile will be sent to your contact").font(.footnote)
-                    }
-                    .padding(.bottom)
+
+                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                    .aspectRatio(1, contentMode: .fit)
+                    .cornerRadius(12)
+
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                    .padding(.horizontal)
+                    .padding(.vertical, 6)
+                    .background(
+                        RoundedRectangle(cornerRadius: 12, style: .continuous)
+                            .fill(Color(uiColor: .systemBackground))
+                    )
+                    .padding(.top)
+
+                Group {
+                    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.")
                }
-                ZStack {
-                    CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                        .aspectRatio(1, contentMode: .fit)
-                        .border(.gray)
-                }
-                .padding(.bottom)
-                Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
-                    .padding(.bottom)
+                .font(.footnote)
+                .foregroundColor(.secondary)
+                .padding(.horizontal)
            }
            .padding()
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
        }
+        .background(Color(.systemGroupedBackground))
    }

    func processQRCode(_ resp: Result<ScanResult, ScanError>) {
@@ -55,9 +57,9 @@ struct ScanToConnectView: View {
            if let crData = parseLinkQueryData(r.string),
               checkCRDataGroup(crData) {
                dismiss()
-                AlertManager.shared.showAlert(groupLinkAlert(r.string))
+                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
            } else {
-                Task { connectViaLink(r.string, dismiss) }
+                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
            }
        case let .failure(e):
            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
--- a/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
+++ b/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
@@ -220,6 +220,37 @@ private let versionDescriptions: [VersionDescription] = [
                description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
            ),
        ]
+    ),
+    VersionDescription(
+        version: "v5.2",
+        post: URL(string: "https://simplex.chat/blog/20230722-simplex-chat-v5-2-message-delivery-receipts.html"),
+        features: [
+            FeatureDescription(
+                icon: "checkmark",
+                title: "Message delivery receipts!",
+                description: "The second tick we missed! ✅"
+            ),
+            FeatureDescription(
+                icon: "star",
+                title: "Find chats faster",
+                description: "Filter unread and favorite chats."
+            ),
+            FeatureDescription(
+                icon: "exclamationmark.arrow.triangle.2.circlepath",
+                title: "Keep your connections",
+                description: "Fix encryption after restoring backups."
+            ),
+            FeatureDescription(
+                icon: "stopwatch",
+                title: "Make one message disappear",
+                description: "Even when disabled in the conversation."
+            ),
+            FeatureDescription(
+                icon: "gift",
+                title: "A few more things",
+                description: "- more stable message delivery.\n- a bit better groups.\n- and more!"
+            ),
+        ]
    )
 ]

--- a/apps/ios/Shared/Views/TerminalView.swift
+++ b/apps/ios/Shared/Views/TerminalView.swift
@@ -22,10 +22,28 @@ struct TerminalView: View {
    @State var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
    @State private var terminalItem: TerminalItem?
    @State private var scrolled = false
+    @State private var showing = false

    var body: some View {
        if authorized {
            terminalView()
+                .onAppear {
+                    if showing { return }
+                    showing = true
+                    Task {
+                        let items = await TerminalItems.shared.items()
+                        await MainActor.run {
+                            chatModel.terminalItems = items
+                            chatModel.showingTerminal = true
+                        }
+                    }
+                }
+                .onDisappear {
+                    if terminalItem == nil {
+                        chatModel.showingTerminal = false
+                        chatModel.terminalItems = []
+                    }
+                }
        } else {
            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
            .onAppear(perform: runAuth)
@@ -118,9 +136,8 @@ struct TerminalView: View {
        let cmd = ChatCommand.string(composeState.message)
        if composeState.message.starts(with: "/sql") && (!prefPerformLA || !developerTools) {
            let resp = ChatResponse.chatCmdError(user_: nil, chatError: ChatError.error(errorType: ChatErrorType.commandError(message: "Failed reading: empty")))
-            DispatchQueue.main.async {
-                ChatModel.shared.addTerminalItem(.cmd(.now, cmd))
-                ChatModel.shared.addTerminalItem(.resp(.now, resp))
+            Task {
+                await TerminalItems.shared.addCommand(.now, cmd, resp)
            }
        } else {
            DispatchQueue.global().async {
--- a/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift
@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [2_500000, 5_000000, 7_500000, 10_000000, 15_000000, 20_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [1_500000, 3_000000, 5_000000, 7_000000, 10_000000, 15_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [5_000, 10_000, 20_000, 40_000], label: secondsLabel)
+                    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: [10_000, 20_000, 40_000, 75_000, 100_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)
@@ -153,7 +153,9 @@ struct AdvancedNetworkSettings: View {

    private func timeoutSettingPicker(_ title: LocalizedStringKey, selection: Binding<Int>, values: [Int], label: String) -> some View {
        Picker(title, selection: selection) {
-            ForEach(values, id: \.self) { value in
+            let v = selection.wrappedValue
+            let vs = values.contains(v) ? values : values + [v]
+            ForEach(vs, id: \.self) { value in
                Text("\(String(format: "%g", (Double(value) / 1000000))) \(secondsLabel)")
            }
        }
--- a/apps/ios/Shared/Views/UserSettings/IncognitoHelp.swift
+++ b/apps/ios/Shared/Views/UserSettings/IncognitoHelp.swift
@@ -18,10 +18,9 @@ struct IncognitoHelp: View {
            ScrollView {
                VStack(alignment: .leading) {
                    Group {
-                    Text("Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.")
+                    Text("Incognito mode protects your privacy by using a new random profile for each contact.")
                    Text("It allows having many anonymous connections without any shared data between them in a single chat profile.")
                    Text("When you share an incognito profile with somebody, this profile will be used for the groups they invite you to.")
-                    Text("To find the profile used for an incognito connection, tap the contact or group name on top of the chat.")
                    }
                    .padding(.bottom)
                }
--- a/apps/ios/Shared/Views/UserSettings/NotificationsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/NotificationsView.swift
@@ -11,9 +11,12 @@ import SimpleXChat

 struct NotificationsView: View {
    @EnvironmentObject var m: ChatModel
-    @State private var notificationMode: NotificationsMode?
+    @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 {
@@ -26,9 +29,7 @@ struct NotificationsView: View {
                            }
                        } footer: {
                            VStack(alignment: .leading) {
-                                if let mode = notificationMode {
-                                    Text(ntfModeDescription(mode))
-                                }
+                                Text(ntfModeDescription(notificationMode))
                            }
                            .font(.callout)
                            .padding(.top, 1)
@@ -43,7 +44,6 @@ struct NotificationsView: View {
                            return  Alert(title: Text("No device token!"))
                        }
                    }
-                    .onAppear { notificationMode = m.notificationMode }
                } label: {
                    HStack {
                        Text("Send notifications")
@@ -76,7 +76,7 @@ struct NotificationsView: View {
                    HStack {
                        Text("Show preview")
                        Spacer()
-                        Text(m.notificationPreview?.label ?? "")
+                        Text(m.notificationPreview.label)
                    }
                }
            } header: {
@@ -88,8 +88,15 @@ struct NotificationsView: View {
                        .padding(.top, 1)
                }
            }
-            .disabled(legacyDatabase)
+
+//            if developerTools {
+//                Section(String("Experimental")) {
+//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
+//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
+//                }
+//            }
        }
+        .disabled(legacyDatabase)
    }

    private func notificationAlert(_ alert: NotificationAlert, _ token: DeviceToken) -> Alert {
@@ -166,7 +173,7 @@ func ntfModeDescription(_ mode: NotificationsMode) -> LocalizedStringKey {

 struct SelectionListView<Item: SelectableItem>: View {
    var list: [Item]
-    @Binding var selection: Item?
+    @Binding var selection: Item
    var onSelection: ((Item) -> Void)?
    @State private var tapped: Item? = nil

--- a/apps/ios/Shared/Views/UserSettings/PreferencesView.swift
+++ b/apps/ios/Shared/Views/UserSettings/PreferencesView.swift
@@ -71,9 +71,10 @@ struct PreferencesView: View {
            do {
                var p = fromLocalProfile(profile)
                p.preferences = fullPreferencesToPreferences(preferences)
-                if let newProfile = try await apiUpdateProfile(profile: p) {
+                if let (newProfile, updatedContacts) = try await apiUpdateProfile(profile: p) {
                    await MainActor.run {
                        chatModel.updateCurrentUser(newProfile, preferences)
+                        updatedContacts.forEach(chatModel.updateContact)
                        currentPreferences = preferences
                    }
                }
--- a/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift
+++ b/apps/ios/Shared/Views/UserSettings/PrivacySettings.swift
@@ -10,12 +10,35 @@ import SwiftUI
 import SimpleXChat

 struct PrivacySettings: View {
+    @EnvironmentObject var m: ChatModel
    @AppStorage(DEFAULT_PRIVACY_ACCEPT_IMAGES) private var autoAcceptImages = true
    @AppStorage(DEFAULT_PRIVACY_LINK_PREVIEWS) private var useLinkPreviews = true
+    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
    @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
    @State private var currentLAMode = privacyLocalAuthModeDefault.get()
+    @State private var contactReceipts = false
+    @State private var contactReceiptsReset = false
+    @State private var contactReceiptsOverrides = 0
+    @State private var contactReceiptsDialogue = false
+    @State private var groupReceipts = false
+    @State private var groupReceiptsReset = false
+    @State private var groupReceiptsOverrides = 0
+    @State private var groupReceiptsDialogue = false
+    @State private var alert: PrivacySettingsViewAlert?
+
+    enum PrivacySettingsViewAlert: Identifiable {
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
+
+        var id: String {
+            switch self {
+            case let .error(title, _): return "error \(title)"
+            }
+        }
+    }

    var body: some View {
        VStack {
@@ -41,6 +64,9 @@ struct PrivacySettings: View {
                }

                Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                    }
                    settingsRow("photo") {
                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
                            .onChange(of: autoAcceptImages) {
@@ -50,6 +76,18 @@ struct PrivacySettings: View {
                    settingsRow("network") {
                        Toggle("Send link previews", isOn: $useLinkPreviews)
                    }
+                    settingsRow("message") {
+                        Toggle("Show last messages", isOn: $showChatPreviews)
+                    }
+                    settingsRow("rectangle.and.pencil.and.ellipsis") {
+                        Toggle("Message draft", isOn: $saveLastDraft)
+                    }
+                    .onChange(of: saveLastDraft) { saveDraft in
+                        if !saveDraft {
+                            m.draft = nil
+                            m.draftChatId = nil
+                        }
+                    }
                    settingsRow("link") {
                        Picker("SimpleX links", selection: $simplexLinkMode) {
                            ForEach(SimpleXLinkMode.values) { mode in
@@ -68,6 +106,175 @@ struct PrivacySettings: View {
                        Text("Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.")
                    }
                }
+
+                Section {
+                    settingsRow("person") {
+                        Toggle("Contacts", isOn: $contactReceipts)
+                    }
+                    settingsRow("person.2") {
+                        Toggle("Small groups (max 20)", isOn: $groupReceipts)
+                    }
+                } header: {
+                    Text("Send delivery receipts to")
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
+                        Text("They can be overridden in contact and group settings.")
+                    }
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                }
+                .confirmationDialog(contactReceiptsDialogTitle, isPresented: $contactReceiptsDialogue, titleVisibility: .visible) {
+                    Button(contactReceipts ? "Enable (keep overrides)" : "Disable (keep overrides)") {
+                        setSendReceiptsContacts(contactReceipts, clearOverrides: false)
+                    }
+                    Button(contactReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
+                        setSendReceiptsContacts(contactReceipts, clearOverrides: true)
+                    }
+                    Button("Cancel", role: .cancel) {
+                        contactReceiptsReset = true
+                        contactReceipts.toggle()
+                    }
+                }
+                .confirmationDialog(groupReceiptsDialogTitle, isPresented: $groupReceiptsDialogue, titleVisibility: .visible) {
+                    Button(groupReceipts ? "Enable (keep overrides)" : "Disable (keep overrides)") {
+                        setSendReceiptsGroups(groupReceipts, clearOverrides: false)
+                    }
+                    Button(groupReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
+                        setSendReceiptsGroups(groupReceipts, clearOverrides: true)
+                    }
+                    Button("Cancel", role: .cancel) {
+                        groupReceiptsReset = true
+                        groupReceipts.toggle()
+                    }
+                }
+            }
+        }
+        .onChange(of: contactReceipts) { _ in
+            if contactReceiptsReset {
+                contactReceiptsReset = false
+            } else {
+                setOrAskSendReceiptsContacts(contactReceipts)
+            }
+        }
+        .onChange(of: groupReceipts) { _ in
+            if groupReceiptsReset {
+                groupReceiptsReset = false
+            } else {
+                setOrAskSendReceiptsGroups(groupReceipts)
+            }
+        }
+        .onAppear {
+            if let u = m.currentUser {
+                if contactReceipts != u.sendRcptsContacts {
+                    contactReceiptsReset = true
+                    contactReceipts = u.sendRcptsContacts
+                }
+                if groupReceipts != u.sendRcptsSmallGroups {
+                    groupReceiptsReset = true
+                    groupReceipts = u.sendRcptsSmallGroups
+                }
+            }
+        }
+        .alert(item: $alert) { alert in
+            switch alert {
+            case let .error(title, error):
+                return Alert(title: Text(title), message: Text(error))
+            }
+        }
+    }
+
+    private func setOrAskSendReceiptsContacts(_ enable: Bool) {
+        contactReceiptsOverrides = m.chats.reduce(0) { count, chat in
+            let sendRcpts = chat.chatInfo.contact?.chatSettings.sendRcpts
+            return count + (sendRcpts == nil || sendRcpts == enable ? 0 : 1)
+        }
+        if contactReceiptsOverrides == 0 {
+            setSendReceiptsContacts(enable, clearOverrides: false)
+        } else {
+            contactReceiptsDialogue = true
+        }
+    }
+
+    private var contactReceiptsDialogTitle: LocalizedStringKey {
+        contactReceipts
+        ? "Sending receipts is disabled for \(contactReceiptsOverrides) contacts"
+        : "Sending receipts is enabled for \(contactReceiptsOverrides) contacts"
+    }
+
+    private func setSendReceiptsContacts(_ enable: Bool, clearOverrides: Bool) {
+        Task {
+            do {
+                if let currentUser = m.currentUser {
+                    let userMsgReceiptSettings = UserMsgReceiptSettings(enable: enable, clearOverrides: clearOverrides)
+                    try await apiSetUserContactReceipts(currentUser.userId, userMsgReceiptSettings: userMsgReceiptSettings)
+                    privacyDeliveryReceiptsSet.set(true)
+                    await MainActor.run {
+                        var updatedUser = currentUser
+                        updatedUser.sendRcptsContacts = enable
+                        m.updateUser(updatedUser)
+                        if clearOverrides {
+                            m.chats.forEach { chat in
+                                if var contact = chat.chatInfo.contact {
+                                    let sendRcpts = contact.chatSettings.sendRcpts
+                                    if sendRcpts != nil && sendRcpts != enable {
+                                        contact.chatSettings.sendRcpts = nil
+                                        m.updateContact(contact)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch let error {
+                alert = .error(title: "Error setting delivery receipts!", error: "Error: \(responseError(error))")
+            }
+        }
+    }
+
+    private func setOrAskSendReceiptsGroups(_ enable: Bool) {
+        groupReceiptsOverrides = m.chats.reduce(0) { count, chat in
+            let sendRcpts = chat.chatInfo.groupInfo?.chatSettings.sendRcpts
+            return count + (sendRcpts == nil || sendRcpts == enable ? 0 : 1)
+        }
+        if groupReceiptsOverrides == 0 {
+            setSendReceiptsGroups(enable, clearOverrides: false)
+        } else {
+            groupReceiptsDialogue = true
+        }
+    }
+
+    private var groupReceiptsDialogTitle: LocalizedStringKey {
+        groupReceipts
+        ? "Sending receipts is disabled for \(groupReceiptsOverrides) groups"
+        : "Sending receipts is enabled for \(groupReceiptsOverrides) groups"
+    }
+
+    private func setSendReceiptsGroups(_ enable: Bool, clearOverrides: Bool) {
+        Task {
+            do {
+                if let currentUser = m.currentUser {
+                    let userMsgReceiptSettings = UserMsgReceiptSettings(enable: enable, clearOverrides: clearOverrides)
+                    try await apiSetUserGroupReceipts(currentUser.userId, userMsgReceiptSettings: userMsgReceiptSettings)
+                    privacyDeliveryReceiptsSet.set(true)
+                    await MainActor.run {
+                        var updatedUser = currentUser
+                        updatedUser.sendRcptsSmallGroups = enable
+                        m.updateUser(updatedUser)
+                        if clearOverrides {
+                            m.chats.forEach { chat in
+                                if var groupInfo = chat.chatInfo.groupInfo {
+                                    let sendRcpts = groupInfo.chatSettings.sendRcpts
+                                    if sendRcpts != nil && sendRcpts != enable {
+                                        groupInfo.chatSettings.sendRcpts = nil
+                                        m.updateGroup(groupInfo)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch let error {
+                alert = .error(title: "Error setting delivery receipts!", error: "Error: \(responseError(error))")
            }
        }
    }
--- a/apps/ios/Shared/Views/UserSettings/ScanProtocolServer.swift
+++ b/apps/ios/Shared/Views/UserSettings/ScanProtocolServer.swift
@@ -21,11 +21,10 @@ struct ScanProtocolServer: View {
                .font(.largeTitle)
                .bold()
                .padding(.vertical)
-            ZStack {
-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .border(.gray)
-            }
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                .aspectRatio(1, contentMode: .fit)
+                .cornerRadius(12)
+                .padding(.top)
        }
        .padding()
        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
--- a/apps/ios/Shared/Views/UserSettings/SetDeliveryReceiptsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SetDeliveryReceiptsView.swift
@@ -0,0 +1,100 @@
+//
+//  SetDeliveryReceiptsView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 12/07/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct SetDeliveryReceiptsView: View {
+    @EnvironmentObject var m: ChatModel
+
+    var body: some View {
+        VStack(spacing: 16) {
+            Text("Delivery receipts!")
+                .font(.title)
+                .foregroundColor(.secondary)
+                .padding(.vertical)
+                .multilineTextAlignment(.center)
+
+            Spacer()
+
+            Button("Enable") {
+                Task {
+                    do {
+                        if let currentUser = m.currentUser {
+                            try await apiSetAllContactReceipts(enable: true)
+                            await MainActor.run {
+                                var updatedUser = currentUser
+                                updatedUser.sendRcptsContacts = true
+                                m.updateUser(updatedUser)
+                                m.setDeliveryReceipts = false
+                                privacyDeliveryReceiptsSet.set(true)
+                            }
+                            do {
+                                let users = try await listUsersAsync()
+                                await MainActor.run { m.users = users }
+                            } catch let error {
+                                logger.debug("listUsers error: \(responseError(error))")
+                            }
+                        }
+                    } catch let error {
+                        AlertManager.shared.showAlert(Alert(
+                            title: Text("Error enabling delivery receipts!"),
+                            message: Text("Error: \(responseError(error))")
+                        ))
+                        await MainActor.run {
+                            m.setDeliveryReceipts = false
+                        }
+                    }
+                }
+            }
+            .font(.largeTitle)
+            Group {
+                if m.users.count > 1 {
+                    Text("Sending delivery receipts will be enabled for all contacts in all visible chat profiles.")
+                } else {
+                    Text("Sending delivery receipts will be enabled for all contacts.")
+                }
+            }
+            .multilineTextAlignment(.center)
+
+            Spacer()
+
+            VStack(spacing: 8) {
+                Button {
+                    AlertManager.shared.showAlert(Alert(
+                        title: Text("Delivery receipts are disabled!"),
+                        message: Text("You can enable them later via app Privacy & Security settings."),
+                        primaryButton: .default(Text("Don't show again")) {
+                            m.setDeliveryReceipts = false
+                            privacyDeliveryReceiptsSet.set(true)
+                        },
+                        secondaryButton: .default(Text("Ok")) {
+                            m.setDeliveryReceipts = false
+                        }
+                    ))
+                } label: {
+                    HStack {
+                        Text("Don't enable")
+                        Image(systemName: "chevron.right")
+                    }
+                }
+                Text("You can enable later via Settings").font(.footnote)
+            }
+        }
+        .padding()
+        .padding(.horizontal)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .background(Color(uiColor: .systemBackground))
+    }
+}
+
+struct SetDeliveryReceiptsView_Previews: PreviewProvider {
+    static var previews: some View {
+        SetDeliveryReceiptsView()
+    }
+}
--- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift
@@ -30,7 +30,10 @@ let DEFAULT_CALL_KIT_CALLS_IN_RECENTS = "callKitCallsInRecents"
 let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
+let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
+let DEFAULT_PRIVACY_SAVE_LAST_DRAFT = "privacySaveLastDraft"
 let DEFAULT_PRIVACY_PROTECT_SCREEN = "privacyProtectScreen"
+let DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET = "privacyDeliveryReceiptsSet"
 let DEFAULT_EXPERIMENTAL_CALLS = "experimentalCalls"
 let DEFAULT_CHAT_ARCHIVE_NAME = "chatArchiveName"
 let DEFAULT_CHAT_ARCHIVE_TIME = "chatArchiveTime"
@@ -64,7 +67,10 @@ let appDefaults: [String: Any] = [
    DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
    DEFAULT_PRIVACY_LINK_PREVIEWS: true,
    DEFAULT_PRIVACY_SIMPLEX_LINK_MODE: SimpleXLinkMode.description.rawValue,
+    DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS: true,
+    DEFAULT_PRIVACY_SAVE_LAST_DRAFT: true,
    DEFAULT_PRIVACY_PROTECT_SCREEN: false,
+    DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET: false,
    DEFAULT_EXPERIMENTAL_CALLS: false,
    DEFAULT_CHAT_V3_DB_MIGRATION: V3DBMigrationState.offer.rawValue,
    DEFAULT_DEVELOPER_TOOLS: false,
@@ -114,6 +120,8 @@ let privacySimplexLinkModeDefault = EnumDefault<SimpleXLinkMode>(defaults: UserD

 let privacyLocalAuthModeDefault = EnumDefault<LAMode>(defaults: UserDefaults.standard, forKey: DEFAULT_LA_MODE, withDefault: .system)

+let privacyDeliveryReceiptsSet = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET)
+
 let onboardingStageDefault = EnumDefault<OnboardingStage>(defaults: UserDefaults.standard, forKey: DEFAULT_ONBOARDING_STAGE, withDefault: .onboardingComplete)

 let customDisappearingMessageTimeDefault = IntDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME)
@@ -127,7 +135,6 @@ struct SettingsView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var sceneDelegate: SceneDelegate
    @Binding var showSettings: Bool
-    @State private var settingsSheet: SettingsSheet?

    var body: some View {
        ZStack {
@@ -157,8 +164,6 @@ struct SettingsView: View {
                        settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
                    }

-                    incognitoRow()
-
                    NavigationLink {
                        UserAddressView(shareViaProfile: chatModel.currentUser!.addressShared)
                            .navigationTitle("SimpleX address")
@@ -294,38 +299,9 @@ struct SettingsView: View {
            }
            .navigationTitle("Your settings")
        }
-        .sheet(item: $settingsSheet) { sheet in
-            switch sheet {
-            case .incognitoInfo: IncognitoHelp()
-            }
-        }
-    }
-
-    @ViewBuilder private func incognitoRow() -> some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: chatModel.incognito ? "theatermasks.fill" : "theatermasks")
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .foregroundColor(chatModel.incognito ? Color.indigo : .secondary)
-            Toggle(isOn: $chatModel.incognito) {
-                HStack(spacing: 6) {
-                    Text("Incognito")
-                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
-                        .font(.system(size: 14))
-                }
-                .onTapGesture {
-                    settingsSheet = .incognitoInfo
-                }
-            }
-            .onChange(of: chatModel.incognito) { incognito in
-                incognitoGroupDefault.set(incognito)
-                do {
-                    try apiSetIncognito(incognito: incognito)
-                } catch {
-                    logger.error("apiSetIncognito: cannot set incognito \(responseError(error))")
-                }
-            }
-            .padding(.leading, indent)
+        .onDisappear {
+            chatModel.showingTerminal = false
+            chatModel.terminalItems = []
        }
    }
    
@@ -347,12 +323,6 @@ struct SettingsView: View {
        }
    }

-    private enum SettingsSheet: Identifiable {
-        case incognitoInfo
-
-        var id: SettingsSheet { get { self } }
-    }
-
    private enum NotificationAlert {
        case enable
        case error(LocalizedStringKey, String)
--- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
@@ -190,7 +190,7 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            QRCode(uri: userAddress.connReqContact)
+            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
--- a/apps/ios/Shared/Views/UserSettings/UserProfile.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
@@ -144,7 +144,7 @@ struct UserProfile: View {
    func saveProfile() {
        Task {
            do {
-                if let newProfile = try await apiUpdateProfile(profile: profile) {
+                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                    DispatchQueue.main.async {
                        chatModel.updateCurrentUser(newProfile)
                        profile = newProfile
--- a/Localizations/ar.xcloc/Localized
+++ b/Localizations/ar.xcloc/Localized
@@ -3630,6 +3630,51 @@ SimpleX servers cannot see your profile.</source>
        <source>\~strike~</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
+        <source>%@ servers</source>
+        <target state="translated">%@ الخوادم</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
+        <source>%@ (current)</source>
+        <target state="translated">%@ (الحالي)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ (current):" xml:space="preserve" approved="no">
+        <source>%@ (current):</source>
+        <target state="translated">%@ (الحالي):</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@:" xml:space="preserve" approved="no">
+        <source>%@:</source>
+        <target state="needs-translation">%@:</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ في %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="needs-translation"># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## السجل</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## ردًا على</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ و %@ متصل</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ar" datatype="plaintext">
--- a/Localizations/bg.xcloc/Localized
+++ b/Localizations/bg.xcloc/Localized
--- a/Localizations/cs.xcloc/Localized
+++ b/Localizations/cs.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/cs.xcloc/contents.json
+++ b/Localizations/cs.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "cs",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/de.xcloc/Localized
+++ b/Localizations/de.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/de.xcloc/contents.json
+++ b/Localizations/de.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "de",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/en.xcloc/Localized
+++ b/Localizations/en.xcloc/Localized
@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
  <file original="en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="&#10;" xml:space="preserve">
@@ -42,6 +42,21 @@
        <target>!1 colored!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve">
+        <source># %@</source>
+        <target># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve">
+        <source>## History</source>
+        <target>## History</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve">
+        <source>## In reply to</source>
+        <target>## In reply to</target>
+        <note>copied message info</note>
+      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve">
        <source>#secret#</source>
        <target>#secret#</target>
@@ -72,6 +87,16 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ and %@ connected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve">
+        <source>%1$@ at %2$@:</source>
+        <target>%1$@ at %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ is connected!</target>
@@ -97,6 +122,11 @@
        <target>%@ wants to connect!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
+        <source>%@, %@ and %lld other members connected</source>
+        <target>%@, %@ and %lld other members connected</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="%@:" xml:space="preserve">
        <source>%@:</source>
        <target>%@:</target>
@@ -297,6 +327,15 @@
        <target>, </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target>- more stable message delivery.
+- a bit better groups.
+- and more!</target>
+        <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.
@@ -373,19 +412,19 @@
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</target>
        <note>email text</note>
      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve">
+        <source>A few more things</source>
+        <target>A few more things</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="A new contact" xml:space="preserve">
        <source>A new contact</source>
        <target>A new contact</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>A random profile will be sent to the contact that you received this link from</source>
-        <target>A random profile will be sent to the contact that you received this link from</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
-        <source>A random profile will be sent to your contact</source>
-        <target>A random profile will be sent to your contact</target>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve">
+        <source>A new random profile will be shared.</source>
+        <target>A new random profile will be shared.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -441,9 +480,9 @@
        <note>accept contact request via notification
   accept incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Accept contact" xml:space="preserve">
-        <source>Accept contact</source>
-        <target>Accept contact</target>
+      <trans-unit id="Accept connection request?" xml:space="preserve">
+        <source>Accept connection request?</source>
+        <target>Accept connection request?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -454,7 +493,7 @@
      <trans-unit id="Accept incognito" xml:space="preserve">
        <source>Accept incognito</source>
        <target>Accept incognito</target>
-        <note>No comment provided by engineer.</note>
+        <note>accept contact request via notification</note>
      </trans-unit>
      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -1027,9 +1066,19 @@
        <target>Connect</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect via contact link?" xml:space="preserve">
-        <source>Connect via contact link?</source>
-        <target>Connect via contact link?</target>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Connect directly</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Connect incognito" xml:space="preserve">
+        <source>Connect incognito</source>
+        <target>Connect 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>Connect via contact link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1047,9 +1096,9 @@
        <target>Connect via link / QR code</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via one-time link?" xml:space="preserve">
-        <source>Connect via one-time link?</source>
-        <target>Connect via one-time link?</target>
+      <trans-unit id="Connect via one-time link" xml:space="preserve">
+        <source>Connect via one-time link</source>
+        <target>Connect via one-time link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1077,11 +1126,6 @@
        <target>Connection error (AUTH)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection request" xml:space="preserve">
-        <source>Connection request</source>
-        <target>Connection request</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection request sent!" xml:space="preserve">
        <source>Connection request sent!</source>
        <target>Connection request sent!</target>
@@ -1132,6 +1176,11 @@
        <target>Contact preferences</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Contacts" xml:space="preserve">
+        <source>Contacts</source>
+        <target>Contacts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Contacts can mark messages for deletion; you will be able to view them." xml:space="preserve">
        <source>Contacts can mark messages for deletion; you will be able to view them.</source>
        <target>Contacts can mark messages for deletion; you will be able to view them.</target>
@@ -1338,7 +1387,7 @@
      <trans-unit id="Decryption error" xml:space="preserve">
        <source>Decryption error</source>
        <target>Decryption error</target>
-        <note>No comment provided by engineer.</note>
+        <note>message decrypt error item</note>
      </trans-unit>
      <trans-unit id="Delete" xml:space="preserve">
        <source>Delete</source>
@@ -1525,6 +1574,21 @@
        <target>Deleted at: %@</target>
        <note>copied message info</note>
      </trans-unit>
+      <trans-unit id="Delivery" xml:space="preserve">
+        <source>Delivery</source>
+        <target>Delivery</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
+        <source>Delivery receipts are disabled!</source>
+        <target>Delivery receipts are disabled!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Delivery receipts!" xml:space="preserve">
+        <source>Delivery receipts!</source>
+        <target>Delivery receipts!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Description" xml:space="preserve">
        <source>Description</source>
        <target>Description</target>
@@ -1570,11 +1634,21 @@
        <target>Direct messages between members are prohibited in this group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Disable (keep overrides)" xml:space="preserve">
+        <source>Disable (keep overrides)</source>
+        <target>Disable (keep overrides)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
        <source>Disable SimpleX Lock</source>
        <target>Disable SimpleX Lock</target>
        <note>authentication reason</note>
      </trans-unit>
+      <trans-unit id="Disable for all" xml:space="preserve">
+        <source>Disable for all</source>
+        <target>Disable for all</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Disappearing message" xml:space="preserve">
        <source>Disappearing message</source>
        <target>Disappearing message</target>
@@ -1635,6 +1709,11 @@
        <target>Don't create address</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Don't enable" xml:space="preserve">
+        <source>Don't enable</source>
+        <target>Don't enable</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
        <source>Don't show again</source>
        <target>Don't show again</target>
@@ -1675,6 +1754,11 @@
        <target>Enable</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable (keep overrides)" xml:space="preserve">
+        <source>Enable (keep overrides)</source>
+        <target>Enable (keep overrides)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
        <source>Enable SimpleX Lock</source>
        <target>Enable SimpleX Lock</target>
@@ -1690,6 +1774,11 @@
        <target>Enable automatic message deletion?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable for all" xml:space="preserve">
+        <source>Enable for all</source>
+        <target>Enable for all</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
        <source>Enable instant notifications?</source>
        <target>Enable instant notifications?</target>
@@ -1900,6 +1989,11 @@
        <target>Error deleting user profile</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
+        <source>Error enabling delivery receipts!</source>
+        <target>Error enabling delivery receipts!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error enabling notifications" xml:space="preserve">
        <source>Error enabling notifications</source>
        <target>Error enabling notifications</target>
@@ -1980,6 +2074,11 @@
        <target>Error sending message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
+        <source>Error setting delivery receipts!</source>
+        <target>Error setting delivery receipts!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error starting chat" xml:space="preserve">
        <source>Error starting chat</source>
        <target>Error starting chat</target>
@@ -1995,6 +2094,11 @@
        <target>Error switching profile!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error synchronizing connection" xml:space="preserve">
+        <source>Error synchronizing connection</source>
+        <target>Error synchronizing connection</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
        <source>Error updating group link</source>
        <target>Error updating group link</target>
@@ -2035,6 +2139,11 @@
        <target>Error: no database file</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Even when disabled in the conversation." xml:space="preserve">
+        <source>Even when disabled in the conversation.</source>
+        <target>Even when disabled in the conversation.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Exit without saving" xml:space="preserve">
        <source>Exit without saving</source>
        <target>Exit without saving</target>
@@ -2055,9 +2164,9 @@
        <target>Exported database archive.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exporting database archive..." xml:space="preserve">
-        <source>Exporting database archive...</source>
-        <target>Exporting database archive...</target>
+      <trans-unit id="Exporting database archive…" xml:space="preserve">
+        <source>Exporting database archive…</source>
+        <target>Exporting database archive…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Failed to remove passphrase" xml:space="preserve">
@@ -2115,11 +2224,51 @@
        <target>Files and media prohibited!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Filter unread and favorite chats." xml:space="preserve">
+        <source>Filter unread and favorite chats.</source>
+        <target>Filter unread and favorite chats.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
        <source>Finally, we have them! 🚀</source>
        <target>Finally, we have them! 🚀</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Find chats faster" xml:space="preserve">
+        <source>Find chats faster</source>
+        <target>Find chats faster</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix" xml:space="preserve">
+        <source>Fix</source>
+        <target>Fix</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix connection" xml:space="preserve">
+        <source>Fix connection</source>
+        <target>Fix connection</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix connection?" xml:space="preserve">
+        <source>Fix connection?</source>
+        <target>Fix connection?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve">
+        <source>Fix encryption after restoring backups.</source>
+        <target>Fix encryption after restoring backups.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix not supported by contact" xml:space="preserve">
+        <source>Fix not supported by contact</source>
+        <target>Fix not supported by contact</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Fix not supported by group member" xml:space="preserve">
+        <source>Fix not supported by group member</source>
+        <target>Fix not supported by group member</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="For console" xml:space="preserve">
        <source>For console</source>
        <target>For console</target>
@@ -2318,7 +2467,7 @@
      <trans-unit id="History" xml:space="preserve">
        <source>History</source>
        <target>History</target>
-        <note>copied message info</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
@@ -2425,6 +2574,11 @@
        <target>Improved server configuration</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="In reply to" xml:space="preserve">
+        <source>In reply to</source>
+        <target>In reply to</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
        <target>Incognito</target>
@@ -2435,14 +2589,9 @@
        <target>Incognito mode</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
-        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
-        <target>Incognito mode is not supported here - your main profile will be sent to group members</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
-        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
-        <target>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</target>
+      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
+        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
+        <target>Incognito mode protects your privacy by using a new random profile for each contact.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2517,6 +2666,11 @@
        <target>Invalid server address!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid status" xml:space="preserve">
+        <source>Invalid status</source>
+        <target>Invalid status</target>
+        <note>item status text</note>
+      </trans-unit>
      <trans-unit id="Invitation expired!" xml:space="preserve">
        <source>Invitation expired!</source>
        <target>Invitation expired!</target>
@@ -2608,6 +2762,11 @@
        <target>Joining group</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep your connections" xml:space="preserve">
+        <source>Keep your connections</source>
+        <target>Keep your connections</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="KeyChain error" xml:space="preserve">
        <source>KeyChain error</source>
        <target>KeyChain error</target>
@@ -2698,6 +2857,11 @@
        <target>Make a private connection</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Make one message disappear" xml:space="preserve">
+        <source>Make one message disappear</source>
+        <target>Make one message disappear</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Make profile private!" xml:space="preserve">
        <source>Make profile private!</source>
        <target>Make profile private!</target>
@@ -2766,6 +2930,11 @@
      <trans-unit id="Message delivery error" xml:space="preserve">
        <source>Message delivery error</source>
        <target>Message delivery error</target>
+        <note>item status text</note>
+      </trans-unit>
+      <trans-unit id="Message delivery receipts!" xml:space="preserve">
+        <source>Message delivery receipts!</source>
+        <target>Message delivery receipts!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message draft" xml:space="preserve">
@@ -2803,9 +2972,9 @@
        <target>Messages &amp; files</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migrating database archive..." xml:space="preserve">
-        <source>Migrating database archive...</source>
-        <target>Migrating database archive...</target>
+      <trans-unit id="Migrating database archive…" xml:space="preserve">
+        <source>Migrating database archive…</source>
+        <target>Migrating database archive…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
@@ -2848,6 +3017,11 @@
        <target>More improvements are coming soon!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
+        <source>Most likely this connection is deleted.</source>
+        <target>Most likely this connection is deleted.</target>
+        <note>item status description</note>
+      </trans-unit>
      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
        <source>Most likely this contact has deleted the connection with you.</source>
        <target>Most likely this contact has deleted the connection with you.</target>
@@ -2953,6 +3127,11 @@
        <target>No contacts to add</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No delivery information" xml:space="preserve">
+        <source>No delivery information</source>
+        <target>No delivery information</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No device token!" xml:space="preserve">
        <source>No device token!</source>
        <target>No device token!</target>
@@ -2968,6 +3147,11 @@
        <target>Group not found!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No history" xml:space="preserve">
+        <source>No history</source>
+        <target>No history</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>No permission to record voice message</target>
@@ -3202,10 +3386,10 @@
        <target>Paste received link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received into the box below to connect with your contact.</source>
-        <target>Paste the link you received into the box below to connect with your contact.</target>
-        <note>No comment provided by engineer.</note>
+      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received to connect with your contact.</source>
+        <target>Paste the link you received to connect with your contact.</target>
+        <note>placeholder</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
@@ -3402,6 +3586,11 @@
        <target>Protocol timeout</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
+        <source>Protocol timeout per KB</source>
+        <target>Protocol timeout per KB</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push notifications</target>
@@ -3412,9 +3601,9 @@
        <target>Rate the app</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="React..." xml:space="preserve">
-        <source>React...</source>
-        <target>React...</target>
+      <trans-unit id="React…" xml:space="preserve">
+        <source>React…</source>
+        <target>React…</target>
        <note>chat item menu</note>
      </trans-unit>
      <trans-unit id="Read" xml:space="preserve">
@@ -3447,6 +3636,11 @@
        <target>Read more in our [GitHub repository](https://github.com/simplex-chat/simplex-chat#readme).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Receipts are disabled" xml:space="preserve">
+        <source>Receipts are disabled</source>
+        <target>Receipts are disabled</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Received at" xml:space="preserve">
        <source>Received at</source>
        <target>Received at</target>
@@ -3487,6 +3681,16 @@
        <target>Recipients see updates as you type them.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
+        <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
+        <target>Reconnect all connected servers to force message delivery. It uses additional traffic.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Reconnect servers?" xml:space="preserve">
+        <source>Reconnect servers?</source>
+        <target>Reconnect servers?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Record updated at" xml:space="preserve">
        <source>Record updated at</source>
        <target>Record updated at</target>
@@ -3507,9 +3711,9 @@
        <target>Reject</target>
        <note>reject incoming call via notification</note>
      </trans-unit>
-      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
-        <source>Reject contact (sender NOT notified)</source>
-        <target>Reject contact (sender NOT notified)</target>
+      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
+        <source>Reject (sender NOT notified)</source>
+        <target>Reject (sender NOT notified)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reject contact request" xml:space="preserve">
@@ -3547,6 +3751,21 @@
        <target>Remove passphrase from keychain?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Renegotiate" xml:space="preserve">
+        <source>Renegotiate</source>
+        <target>Renegotiate</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Renegotiate encryption" xml:space="preserve">
+        <source>Renegotiate encryption</source>
+        <target>Renegotiate encryption</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Renegotiate encryption?" xml:space="preserve">
+        <source>Renegotiate encryption?</source>
+        <target>Renegotiate encryption?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Reply</target>
@@ -3802,6 +4021,11 @@
        <target>Send a live message - it will update for the recipient(s) as you type it</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send delivery receipts to" xml:space="preserve">
+        <source>Send delivery receipts to</source>
+        <target>Send delivery receipts to</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Send direct message" xml:space="preserve">
        <source>Send direct message</source>
        <target>Send direct message</target>
@@ -3837,6 +4061,11 @@
        <target>Send questions and ideas</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send receipts" xml:space="preserve">
+        <source>Send receipts</source>
+        <target>Send receipts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
        <source>Send them from gallery or custom keyboards.</source>
        <target>Send them from gallery or custom keyboards.</target>
@@ -3852,11 +4081,41 @@
        <target>Sender may have deleted the connection request.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending delivery receipts will be enabled for all contacts in all visible chat profiles." xml:space="preserve">
+        <source>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</source>
+        <target>Sending delivery receipts will be enabled for all contacts in all visible chat profiles.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending delivery receipts will be enabled for all contacts." xml:space="preserve">
+        <source>Sending delivery receipts will be enabled for all contacts.</source>
+        <target>Sending delivery receipts will be enabled for all contacts.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending file will be stopped." xml:space="preserve">
        <source>Sending file will be stopped.</source>
        <target>Sending file will be stopped.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld contacts</source>
+        <target>Sending receipts is disabled for %lld contacts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is disabled for %lld groups</source>
+        <target>Sending receipts is disabled for %lld groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld contacts</source>
+        <target>Sending receipts is enabled for %lld contacts</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
+        <source>Sending receipts is enabled for %lld groups</source>
+        <target>Sending receipts is enabled for %lld groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sending via" xml:space="preserve">
        <source>Sending via</source>
        <target>Sending via</target>
@@ -3997,6 +4256,11 @@
        <target>Show developer options</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve">
+        <source>Show last messages</source>
+        <target>Show last messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Show preview" xml:space="preserve">
        <source>Show preview</source>
        <target>Show preview</target>
@@ -4077,6 +4341,11 @@
        <target>Skipped messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Small groups (max 20)" xml:space="preserve">
+        <source>Small groups (max 20)</source>
+        <target>Small groups (max 20)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
        <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
        <target>Some non-fatal errors occurred during import - you may see Chat console for more details.</target>
@@ -4294,6 +4563,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The created archive is available via app Settings / Database / Old database archive.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
+        <source>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</source>
+        <target>The encryption is working and the new encryption agreement is not required. It may result in connection errors!</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>The group is fully decentralized – it is visible only to the members.</target>
@@ -4329,6 +4603,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The profile is only shared with your contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
+        <source>The second tick we missed! ✅</source>
+        <target>The second tick we missed! ✅</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The sender will NOT be notified" xml:space="preserve">
        <source>The sender will NOT be notified</source>
        <target>The sender will NOT be notified</target>
@@ -4354,6 +4633,16 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>There should be at least one visible user profile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
+        <source>These settings are for your current profile **%@**.</source>
+        <target>These settings are for your current profile **%@**.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
+        <source>They can be overridden in contact and group settings.</source>
+        <target>They can be overridden in contact and group settings.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
        <source>This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.</source>
        <target>This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain.</target>
@@ -4369,9 +4658,9 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This error is permanent for this connection, please re-connect." xml:space="preserve">
-        <source>This error is permanent for this connection, please re-connect.</source>
-        <target>This error is permanent for this connection, please re-connect.</target>
+      <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>This group has over %lld members, delivery receipts are not sent.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -4394,11 +4683,6 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>To connect, your contact can scan QR code or use the link in the app.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
-        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
-        <target>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</target>
-        <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>To make a new connection</target>
@@ -4479,7 +4763,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Unexpected error: %@</target>
-        <note>No comment provided by engineer.</note>
+        <note>item status description</note>
      </trans-unit>
      <trans-unit id="Unexpected migration state" xml:space="preserve">
        <source>Unexpected migration state</source>
@@ -4618,6 +4902,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use current profile" xml:space="preserve">
+        <source>Use current profile</source>
+        <target>Use current profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use for new connections" xml:space="preserve">
        <source>Use for new connections</source>
        <target>Use for new connections</target>
@@ -4628,6 +4917,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use iOS call interface</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use new incognito profile" xml:space="preserve">
+        <source>Use new incognito profile</source>
+        <target>Use new incognito profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Use server</target>
@@ -4838,6 +5132,16 @@ To connect, please ask your contact to create another connection link and check
        <target>You can create it later</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can enable later via Settings" xml:space="preserve">
+        <source>You can enable later via Settings</source>
+        <target>You can enable later via Settings</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
+        <source>You can enable them later via app Privacy &amp; Security settings.</source>
+        <target>You can enable them later via app Privacy &amp; Security settings.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
        <source>You can hide or mute a user profile - swipe it to the right.</source>
        <target>You can hide or mute a user profile - swipe it to the right.</target>
@@ -4908,9 +5212,9 @@ To connect, please ask your contact to create another connection link and check
        <target>You have to enter passphrase every time the app starts - it is not stored on the device.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You invited your contact" xml:space="preserve">
-        <source>You invited your contact</source>
-        <target>You invited your contact</target>
+      <trans-unit id="You invited a contact" xml:space="preserve">
+        <source>You invited a contact</source>
+        <target>You invited a contact</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You joined this group" xml:space="preserve">
@@ -5038,11 +5342,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Your chat profile will be sent to group members</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
-        <source>Your chat profile will be sent to your contact</source>
-        <target>Your chat profile will be sent to your contact</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>Your chat profiles</target>
@@ -5097,6 +5396,11 @@ You can change it in Settings.</target>
        <target>Your privacy</target>
        <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>Your profile **%@** will be shared.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
        <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5104,11 +5408,6 @@ SimpleX servers cannot see your profile.</source>
 SimpleX servers cannot see your profile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
-        <source>Your profile will be sent to the contact that you received this link from</source>
-        <target>Your profile will be sent to the contact that you received this link from</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Your profile, contacts and delivered messages are stored on your device.</target>
@@ -5174,6 +5473,16 @@ SimpleX servers cannot see your profile.</target>
        <target>admin</target>
        <note>member role</note>
      </trans-unit>
+      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
+        <source>agreeing encryption for %@…</source>
+        <target>agreeing encryption for %@…</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="agreeing encryption…" xml:space="preserve">
+        <source>agreeing encryption…</source>
+        <target>agreeing encryption…</target>
+        <note>chat item text</note>
+      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
        <source>always</source>
        <target>always</target>
@@ -5234,14 +5543,14 @@ SimpleX servers cannot see your profile.</target>
        <target>changed your role to %@</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="changing address for %@..." xml:space="preserve">
-        <source>changing address for %@...</source>
-        <target>changing address for %@...</target>
+      <trans-unit id="changing address for %@…" xml:space="preserve">
+        <source>changing address for %@…</source>
+        <target>changing address for %@…</target>
        <note>chat item text</note>
      </trans-unit>
-      <trans-unit id="changing address..." xml:space="preserve">
-        <source>changing address...</source>
-        <target>changing address...</target>
+      <trans-unit id="changing address…" xml:space="preserve">
+        <source>changing address…</source>
+        <target>changing address…</target>
        <note>chat item text</note>
      </trans-unit>
      <trans-unit id="colored" xml:space="preserve">
@@ -5344,6 +5653,16 @@ SimpleX servers cannot see your profile.</target>
        <target>default (%@)</target>
        <note>pref value</note>
      </trans-unit>
+      <trans-unit id="default (no)" xml:space="preserve">
+        <source>default (no)</source>
+        <target>default (no)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="default (yes)" xml:space="preserve">
+        <source>default (yes)</source>
+        <target>default (yes)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="deleted" xml:space="preserve">
        <source>deleted</source>
        <target>deleted</target>
@@ -5364,6 +5683,11 @@ SimpleX servers cannot see your profile.</target>
        <target>direct</target>
        <note>connection level description</note>
      </trans-unit>
+      <trans-unit id="disabled" xml:space="preserve">
+        <source>disabled</source>
+        <target>disabled</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="duplicate message" xml:space="preserve">
        <source>duplicate message</source>
        <target>duplicate message</target>
@@ -5389,6 +5713,46 @@ SimpleX servers cannot see your profile.</target>
        <target>enabled for you</target>
        <note>enabled status</note>
      </trans-unit>
+      <trans-unit id="encryption agreed" xml:space="preserve">
+        <source>encryption agreed</source>
+        <target>encryption agreed</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption agreed for %@" xml:space="preserve">
+        <source>encryption agreed for %@</source>
+        <target>encryption agreed for %@</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption ok" xml:space="preserve">
+        <source>encryption ok</source>
+        <target>encryption ok</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption ok for %@" xml:space="preserve">
+        <source>encryption ok for %@</source>
+        <target>encryption ok for %@</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
+        <source>encryption re-negotiation allowed</source>
+        <target>encryption re-negotiation allowed</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
+        <source>encryption re-negotiation allowed for %@</source>
+        <target>encryption re-negotiation allowed for %@</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption re-negotiation required" xml:space="preserve">
+        <source>encryption re-negotiation required</source>
+        <target>encryption re-negotiation required</target>
+        <note>chat item text</note>
+      </trans-unit>
+      <trans-unit id="encryption re-negotiation required for %@" xml:space="preserve">
+        <source>encryption re-negotiation required for %@</source>
+        <target>encryption re-negotiation required for %@</target>
+        <note>chat item text</note>
+      </trans-unit>
      <trans-unit id="ended" xml:space="preserve">
        <source>ended</source>
        <target>ended</target>
@@ -5404,6 +5768,11 @@ SimpleX servers cannot see your profile.</target>
        <target>error</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="event happened" xml:space="preserve">
+        <source>event happened</source>
+        <target>event happened</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>group deleted</target>
@@ -5660,6 +6029,11 @@ SimpleX servers cannot see your profile.</target>
        <target>secret</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="security code changed" xml:space="preserve">
+        <source>security code changed</source>
+        <target>security code changed</target>
+        <note>chat item text</note>
+      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
        <source>starting…</source>
        <target>starting…</target>
@@ -5804,7 +6178,7 @@ SimpleX servers cannot see your profile.</target>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleName" xml:space="preserve">
@@ -5836,7 +6210,7 @@ SimpleX servers cannot see your profile.</target>
  </file>
  <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
    </header>
    <body>
      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/en.xcloc/contents.json
+++ b/Localizations/en.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "en",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/es.xcloc/Localized
+++ b/Localizations/es.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/es.xcloc/contents.json
+++ b/Localizations/es.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "es",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/fi.xcloc/Localized
+++ b/Localizations/fi.xcloc/Localized
--- a/Localizations/fr.xcloc/Localized
+++ b/Localizations/fr.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/fr.xcloc/contents.json
+++ b/Localizations/fr.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "fr",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/he.xcloc/Localized
+++ b/Localizations/he.xcloc/Localized
--- a/Localizations/it.xcloc/Localized
+++ b/Localizations/it.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/it.xcloc/contents.json
+++ b/Localizations/it.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "it",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/ja.xcloc/Localized
+++ b/Localizations/ja.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/ja.xcloc/contents.json
+++ b/Localizations/ja.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "ja",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/nl.xcloc/Localized
+++ b/Localizations/nl.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/nl.xcloc/contents.json
+++ b/Localizations/nl.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "nl",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/pl.xcloc/Localized
+++ b/Localizations/pl.xcloc/Localized
--- a/NSE/en.lproj/Localizable.strings
+++ b/NSE/en.lproj/Localizable.strings
@@ -1 +0,0 @@
-
--- a/Localizations/pl.xcloc/contents.json
+++ b/Localizations/pl.xcloc/contents.json
@@ -3,10 +3,10 @@
  "project" : "SimpleX.xcodeproj",
  "targetLocale" : "pl",
  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
+    "toolBuildNumber" : "15A5219j",
    "toolID" : "com.apple.dt.xcode",
    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
+    "toolVersion" : "15.0"
  },
  "version" : "1.0"
 }
--- a/Localizations/ru.xcloc/Localized
+++ b/Localizations/ru.xcloc/Localized
--- a/Show More
+++ b/Show More