Merge remote-tracking branch 'origin/master' into ios-profiling

Merge branch 'master' into ios-profiling
2024-12-17 17:20:21 +01:00 · 2024-03-30 15:47:29 +03:00 · 2024-03-29 19:44:17 +00:00 · 2024-03-28 20:10:35 +02:00 · 2024-03-27 17:40:14 +02:00 · 2024-03-20 11:22:48 +02:00
1056 changed files with 26572 additions and 96324 deletions
@@ -65,11 +65,6 @@ jobs:
            asset_name: simplex-chat-ubuntu-22_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-macos-aarch64
-            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
-          - os: macos-13
            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
@@ -112,36 +107,18 @@ jobs:
        if: matrix.os == 'macos-latest'
        shell: bash
        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-13'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
+          echo "ignore-project: False"                                      >> cabal.project.local
+          echo "package direct-sqlcipher"                                   >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                        >> cabal.project.local

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

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

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

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

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

      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -5,20 +5,14 @@ on:
  pull_request_target:
    types: [opened, closed, synchronize]

-permissions:
-  actions: write
-  contents: write
-  pull-requests: write
-  statuses: write
-
 jobs:
  CLAssistant:
    runs-on: ubuntu-latest
    steps:
      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
        # Beta Release
-        uses: cla-assistant/github-action@v2.3.0
+        uses: cla-assistant/github-action@v2.1.3-beta
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          # the below token should have repo scope and must be manually added by you in the repository's secret
@@ -39,4 +33,4 @@ jobs:
          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
          #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-          #use-dco-flag: true - If you are using DCO instead of CLA
+          #use-dco-flag: true - If you are using DCO instead of CLA
@@ -4,6 +4,7 @@ on:
  push:
    branches:
      - master
+      - stable
    paths:
      - website/**
      - images/**
@@ -54,7 +54,6 @@ website/translations.json
 website/src/img/images/
 website/src/images/
 website/src/js/lottie.min.js
-website/src/privacy.md
 # Generated files
 website/package/generated*

@@ -1,21 +1,16 @@
---
-layout: layouts/privacy.html
-permalink: /privacy/index.html
---
-
 # SimpleX Chat Privacy Policy and Conditions of Use

 SimpleX Chat is the first communication network based on a new protocol stack that builds on the same ideas of complete openness and decentralization as email and web, with the focus on providing security and privacy of communications, and without compromising on usability.

 SimpleX Chat communication protocol is the first protocol that has no user profile IDs of any kind, not even random numbers, cryptographic keys or hashes that identify the users. SimpleX Chat apps allow their users to send messages and files via relay server infrastructure. Relay server owners and providers do not have any access to your messages, thanks to double-ratchet end-to-end encryption algorithm (also known as Signal algorithm - do not confuse with Signal protocols or platform) and additional encryption layers, and they also have no access to your profile and contacts - as they do not provide any user accounts.

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

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

 ## Privacy Policy

-SimpleX Chat Ltd uses the best industry practices for security and encryption to provide client and server software for secure [end-to-end encrypted](/docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the relays servers, even if they are modified or compromised, via [man-in-the-middle attack](/docs/GLOSSARY.md#man-in-the-middle-attack), unlike most other communication platforms, services and networks.
+SimpleX Chat Ltd uses the best industry practices for security and encryption to provide client and server software for secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the relays servers, even if they are modified or compromised, via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack), unlike most other communication platforms, services and networks.

 SimpleX Chat software is built on top of SimpleX messaging and application protocols, based on a new message routing protocol allowing to establish private connections without having any kind of addresses or other identifiers assigned to its users - it does not use emails, phone numbers, usernames, identity keys or any other user profile identifiers to pass messages between the user applications.

@@ -25,7 +20,7 @@ While SimpleX Chat Ltd is not a communication service provider, and provide publ

 We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.

-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 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+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 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 ### Your information

@@ -39,7 +34,7 @@ You can transfer the profile to another device by creating a backup of the app d

 #### Messages and Files

-SimpleX relay servers 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 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay 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.
+SimpleX relay servers 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 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay 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, messaging relay servers temporarily store end-to-end encrypted messages – you can configure which relay servers are used to receive the messages from the new contacts, and you can manually change them for the existing contacts too.

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

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

-You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).
+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

@@ -87,7 +82,7 @@ Additional technical information can be stored on our servers, including randoml

 #### SimpleX Directory

-[SimpleX Directory](/docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the registered groups. You can connect to SimpleX Directory 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).
+[SimpleX Directory](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the registered groups. You can connect to SimpleX Directory 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

@@ -108,15 +103,13 @@ The cases when SimpleX Chat Ltd may share the data temporarily stored on the ser

 At the time of updating this document, we have never provided or have been requested the access to the preset relay servers or any information from the servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process to limit any information shared with the third parties to the minimally required by law.

-We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
-
 ### 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 software applications and preset relays infrastructure confirms your acceptance of our updated Privacy Policy.

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

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

 ## Conditions of Use of Software and Infrastructure

@@ -138,7 +131,7 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b

 **Traffic and device costs**. You are solely responsible for the traffic and device costs that you incur while using our Applications, and any associated taxes.

-**Legal usage**. You agree to use our Applications only for legal purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.
+**Legal and acceptable usage**. You agree to use our Applications only for legal and acceptable purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal or impermissible communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal or impermissible communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.

 **Damage to SimpleX Chat Ltd**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, our Infrastructure, or any other systems. For example, you must not 1) access our Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of our Infrastructure; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.

@@ -172,4 +165,4 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b

 **Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd at any time by deleting our Applications from your devices and discontinuing use of our Infrastructure. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd.

-Updated April 24, 2024
+Updated February 24, 2024
@@ -4,7 +4,7 @@
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 <a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>

-| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md), [PL](/docs/lang/pl/README.md) |
+| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |

 <img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">

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

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

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

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

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

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

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

 Huge thank you to everybody who donated to SimpleX Chat!

@@ -158,19 +158,20 @@ We are prioritizing users privacy and security - it would be impossible without

 Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.

-Your donations help us raise more funds - any amount, even the price of the cup of coffee, would make a big difference for us.
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.

 It is possible to donate via:

- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission).
- Bitcoin: bc1qd74rc032ek2knhhr3yjq2ajzc5enz3h4qwnxad
+- [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: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- BCH: bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg
- Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
 - USDT:
-  - Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
- Solana: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
- please ask if you want to donate any other coins.
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L

 Thank you,

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

 Recent and important updates:

-[Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)
-
-[Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)
-
-[Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
-
 [Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)

 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
@@ -385,10 +380,10 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Private notes.
 - ✅ Improve sending videos (including encryption of locally stored videos).
 - ✅ Post-quantum resistant key exchange in double ratchet protocol.
- ✅ Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
 - 🏗 Large groups, communities and public channels.
+- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
@@ -417,13 +412,13 @@ We have never provided or have been requested access to our servers or any infor

 We do not log IP addresses of the users and we do not perform any traffic correlation on our servers. If transport level security is critical you must use Tor or some other similar network to access messaging servers. We will be improving the client applications to reduce the opportunities for traffic correlation.

-Please read more in [Privacy Policy](./PRIVACY.md).
+Please read more in [Terms & privacy policy](./PRIVACY.md).

 ## Security contact

-Please see our [Security Policy](./docs/SECURITY.md) on how to report security vulnerabilities to us. We will coordinate the fix and disclosure.
+To report a security vulnerability, please send us email to chat@simplex.chat. We will coordinate the fix and disclosure. Please do NOT report security vulnerabilities via GitHub issues.

-Please do NOT report security vulnerabilities via GitHub issues.
+Please treat any findings of possible traffic correlation attacks allowing to correlate two different conversations to the same user, other than covered in [the threat model](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md#threat-model), as security vulnerabilities, and follow this disclosure process.

 ## License

@@ -9,18 +9,35 @@
 import Foundation
 import UIKit
 import SimpleXChat
-import SwiftUI

 class AppDelegate: NSObject, UIApplicationDelegate {
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
        logger.debug("AppDelegate: didFinishLaunchingWithOptions")
        application.registerForRemoteNotifications()
+        if #available(iOS 17.0, *) { trackKeyboard() }
        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
        removePasscodesIfReinstalled()
-        prepareForLaunch()
        return true
    }

+    @available(iOS 17.0, *)
+    private func trackKeyboard() {
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillShow(_ notification: Notification) {
+        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
+        }
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillHide(_ notification: Notification) {
+        ChatModel.shared.keyboardHeight = 0
+    }
+
    @objc func pasteboardChanged() {
        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
    }
@@ -124,10 +141,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        }
    }

-    private func prepareForLaunch() {
-        try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-    }
-
    static func keepScreenOn(_ on: Bool) {
        UIApplication.shared.isIdleTimerDisabled = on
    }
@@ -135,79 +148,13 @@ class AppDelegate: NSObject, UIApplicationDelegate {

 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
    var window: UIWindow?
-    static var windowStatic: UIWindow?
    var windowScene: UIWindowScene?

    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        UITableView.appearance().backgroundColor = .clear
        guard let windowScene = scene as? UIWindowScene else { return }
        self.windowScene = windowScene
        window = windowScene.keyWindow
-        SceneDelegate.windowStatic = windowScene.keyWindow
-        migrateAccentColorAndTheme()
-        ThemeManager.applyTheme(currentThemeDefault.get())
-        ThemeManager.adjustWindowStyle()
-    }
-
-    private func migrateAccentColorAndTheme() {
-        let defs = UserDefaults.standard
-        /// For checking migration
-//        themeOverridesDefault.set([])
-//        currentThemeDefault.set(DefaultTheme.SYSTEM_THEME_NAME)
-//        defs.set(0.5, forKey: DEFAULT_ACCENT_COLOR_RED)
-//        defs.set(0.3, forKey: DEFAULT_ACCENT_COLOR_GREEN)
-//        defs.set(0.8, forKey: DEFAULT_ACCENT_COLOR_BLUE)
-
-        let userInterfaceStyle = getUserInterfaceStyleDefault()
-        if defs.double(forKey: DEFAULT_ACCENT_COLOR_GREEN) == 0 && userInterfaceStyle == .unspecified {
-            // No migration needed or already migrated
-            return
-        }
-
-        let defaultAccentColor = Color(cgColor: CGColor(red: 0.000, green: 0.533, blue: 1.000, alpha: 1))
-        let accentColor = Color(cgColor: getUIAccentColorDefault())
-        if accentColor != defaultAccentColor {
-            let colors = ThemeColors(primary: accentColor.toReadableHex())
-            var overrides = themeOverridesDefault.get()
-            var themeIds = currentThemeIdsDefault.get()
-            switch userInterfaceStyle {
-            case .light:
-                let light = ThemeOverrides(base: DefaultTheme.LIGHT, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(light)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.LIGHT.themeName] = light.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
-            case .dark:
-                let dark = ThemeOverrides(base: DefaultTheme.DARK, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(dark)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.DARK.themeName] = dark.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.DARK.themeName)
-            case .unspecified:
-                let light = ThemeOverrides(base: DefaultTheme.LIGHT, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                let dark = ThemeOverrides(base: DefaultTheme.DARK, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(light)
-                overrides.append(dark)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.LIGHT.themeName] = light.themeId
-                themeIds[DefaultTheme.DARK.themeName] = dark.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
-            @unknown default: ()
-            }
-        } else if userInterfaceStyle != .unspecified {
-            let themeName = switch userInterfaceStyle {
-            case .light: DefaultTheme.LIGHT.themeName
-            case .dark: DefaultTheme.DARK.themeName
-            default: DefaultTheme.SYSTEM_THEME_NAME
-            }
-            ThemeManager.applyTheme(themeName)
-        }
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_RED)
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_GREEN)
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_BLUE)
-        defs.removeObject(forKey: DEFAULT_USER_INTERFACE_STYLE)
+        window?.tintColor = UIColor(cgColor: getUIAccentColorDefault())
+        window?.overrideUserInterfaceStyle = getUserInterfaceStyleDefault()
    }
 }
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_cats@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_cats@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_cats@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_flowers@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_flowers@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_flowers@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_hearts@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_hearts@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_hearts@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_kids@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_kids@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_kids@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_school@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_school@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_school@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper_travel@1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "wallpaper_travel@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "wallpaper_travel@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -14,8 +14,6 @@ struct ContentView: View {
    @ObservedObject var alertManager = AlertManager.shared
    @ObservedObject var callController = CallController.shared
    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var sceneDelegate: SceneDelegate

    var contentAccessAuthenticationExtended: Bool

@@ -36,7 +34,7 @@ struct ContentView: View {
    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil

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

    private enum ChatListActionSheet: Identifiable {
        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
@@ -53,16 +51,6 @@ struct ContentView: View {
    }

    var body: some View {
-        if #available(iOS 16.0, *) {
-            allViews()
-                .scrollContentBackground(.hidden)
-        } else {
-            // on iOS 15 scroll view background disabled in SceneDelegate
-            allViews()
-        }
-    }
-
-    @ViewBuilder func allViews() -> some View {
        ZStack {
            let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
@@ -150,17 +138,6 @@ struct ContentView: View {
                break
            }
        }
-        .onAppear {
-            reactOnDarkThemeChanges(systemInDarkThemeCurrently)
-        }
-        .onChange(of: colorScheme) { scheme in
-            // It's needed to update UI colors when iOS wants to make screenshot after going to background,
-            // so when a user changes his global theme from dark to light or back, the app will adapt to it
-            reactOnDarkThemeChanges(scheme == .dark)
-        }
-        .onChange(of: theme.name) { _ in
-            ThemeManager.adjustWindowStyle()
-        }
    }

    @ViewBuilder private func contentView() -> some View {
@@ -207,7 +184,7 @@ struct ContentView: View {
            CallDuration(call: call)
        }
        .padding(.horizontal)
-        .frame(height: callTopPadding)
+        .frame(height: callTopPadding - 10)
        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
        .onTapGesture {
            chatModel.activeCallViewIsCollapsed = false
@@ -247,8 +224,8 @@ struct ContentView: View {
        .frame(maxWidth: .infinity, maxHeight: .infinity )
        .background(
            Rectangle()
-                .fill(theme.colors.background)
-        )
+                .fill(.background)
+        ) 
    }

    private func mainView() -> some View {
@@ -179,7 +179,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        if playback {
            if AVAudioSession.sharedInstance().category != .playback {
                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: [.duckOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
            }
        } else {
            if AVAudioSession.sharedInstance().category != .soloAmbient {
@@ -43,95 +43,11 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
    items.append(item)
 }

-class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
-    private let publisher = ObservableObjectPublisher()
-    private var bag = Set<AnyCancellable>()
-    var reversedChatItems: [ChatItem] = [] {
-        willSet { publisher.send() }
-    }
-    var itemAdded = false {
-        willSet { publisher.send() }
-    }
-    
-    // Publishes directly to `objectWillChange` publisher,
-    // this will cause reversedChatItems to be rendered without throttling
-    @Published var isLoading = false
-    @Published var showLoadingProgress = false
-
-    init() {
-        publisher
-            .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
-            .sink { self.objectWillChange.send() }
-            .store(in: &bag)
-    }
-
-    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 250_000000)
-                await MainActor.run {
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            } catch {}
-        }
-        let progressTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 1500_000000)
-                await MainActor.run { showLoadingProgress = true }
-            } catch {}
-        }
-        Task {
-            if let chat = ChatModel.shared.getChat(chatId) {
-                await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
-                await MainActor.run {
-                    self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            }
-        }
-    }
-}
-
-class NetworkModel: ObservableObject {
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
-
-    static let shared = NetworkModel()
-
-    private init() { }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
-}
-
 final class ChatModel: ObservableObject {
    @Published var onboardingStage: OnboardingStage?
    @Published var setDeliveryReceipts = false
    @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
-    @Published var currentUser: User? {
-        didSet {
-            ThemeManager.applyTheme(currentThemeDefault.get())
-        }
-    }
+    @Published var currentUser: User?
    @Published var users: [UserInfo] = []
    @Published var chatInitialized = false
    @Published var chatRunning: Bool?
@@ -143,15 +59,16 @@ final class ChatModel: ObservableObject {
    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
-    @Published private(set) var chats: [Chat] = []
+    @Published var chats: [Chat] = []
    @Published var deletedChats: Set<String> = []
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
    // current chat
    @Published var chatId: String?
+    @Published var reversedChatItems: [ChatItem] = []
    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
    @Published var chatToTop: String?
    @Published var groupMembers: [GMember] = []
-    @Published var groupMembersIndexes: Dictionary<Int64, Int> = [:] // groupMemberId to index in groupMembers list
-    @Published var membersLoaded = false
    // items in the terminal view
    @Published var showingTerminal = false
    @Published var terminalItems: [TerminalItem] = []
@@ -183,8 +100,9 @@ final class ChatModel: ObservableObject {
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
    @Published var draftChatId: String?
+    // tracks keyboard height via subscription in AppDelegate
+    @Published var keyboardHeight: CGFloat = 0
    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
-    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)

    var messageDelivery: Dictionary<Int64, () -> Void> = [:]

@@ -192,8 +110,6 @@ final class ChatModel: ObservableObject {

    static let shared = ChatModel()

-    let im = ItemsModel.shared
-
    static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }

    let ntfEnableLocal = true
@@ -259,47 +175,18 @@ final class ChatModel: ObservableObject {
        }
    }

-    func populateGroupMembersIndexes() {
-        groupMembersIndexes.removeAll()
-        for (i, member) in groupMembers.enumerated() {
-            groupMembersIndexes[member.groupMemberId] = i
-        }
-    }
-
    func getGroupMember(_ groupMemberId: Int64) -> GMember? {
-        if let i = groupMembersIndexes[groupMemberId] {
-            return groupMembers[i]
-        }
-        return nil
-    }
-
-    func loadGroupMembers(_ groupInfo: GroupInfo, updateView: @escaping () -> Void = {}) async {
-        let groupMembers = await apiListMembers(groupInfo.groupId)
-        await MainActor.run {
-            if chatId == groupInfo.id {
-                self.groupMembers = groupMembers.map { GMember.init($0) }
-                self.populateGroupMembersIndexes()
-                self.membersLoaded = true
-                updateView()
-            }
-        }
+        groupMembers.first { $0.groupMemberId == groupMemberId }
    }

    private func getChatIndex(_ id: String) -> Int? {
        chats.firstIndex(where: { $0.id == id })
    }

-    func addChat(_ chat: Chat) {
-        if chatId == nil {
-            withAnimation { addChat_(chat, at: 0) }
-        } else {
-            addChat_(chat, at: 0)
+    func addChat(_ chat: Chat, at position: Int = 0) {
+        withAnimation {
+            chats.insert(chat, at: position)
        }
-        popChatCollector.throttlePopChat(chat.chatInfo.id, currentPosition: 0)
-    }
-
-    func addChat_(_ chat: Chat, at position: Int = 0) {
-        chats.insert(chat, at: position)
    }

    func updateChatInfo(_ cInfo: ChatInfo) {
@@ -357,10 +244,26 @@ final class ChatModel: ObservableObject {
        }
    }

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

 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -368,12 +271,6 @@ final class ChatModel: ObservableObject {
 //    }

    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        // mark chat non deleted
-        if case let .direct(contact) = cInfo, contact.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            updateContact(updatedContact)
-        }
        // update previews
        if let i = getChatIndex(cInfo.id) {
            chats[i].chatItems = switch cInfo {
@@ -391,9 +288,18 @@ final class ChatModel: ObservableObject {
                [cItem]
            }
            if case .rcvNew = cItem.meta.itemStatus {
-                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
+                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
+                increaseUnreadCounter(user: currentUser!)
+            }
+            if i > 0 {
+                if chatId == nil {
+                    withAnimation { popChat_(i) }
+                } else if chatId == cInfo.id  {
+                    chatToTop = cInfo.id
+                } else {
+                    popChat_(i)
+                }
            }
-            popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
        } else {
            addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
        }
@@ -408,7 +314,7 @@ final class ChatModel: ObservableObject {
        var res: Bool
        if let chat = getChat(cInfo.id) {
            if let pItem = chat.chatItems.last {
-                if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
+                if pItem.id == cItem.id || (chatId == cInfo.id && reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
                    chat.chatItems = [cItem]
                }
            } else {
@@ -419,27 +325,23 @@ final class ChatModel: ObservableObject {
            addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
            res = true
        }
-        if cItem.isDeletedContent || cItem.meta.itemDeleted != nil {
-            VoiceItemState.stopVoiceInChatView(cInfo, cItem)
-        }
        // update current chat
        return chatId == cInfo.id ? _upsertChatItem(cInfo, cItem) : res
    }

    private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
        if let i = getChatItemIndex(cItem) {
-            withConditionalAnimation {
+            withAnimation {
                _updateChatItem(at: i, with: cItem)
            }
            return false
        } else {
-            withConditionalAnimation(itemAnimation()) {
+            withAnimation(itemAnimation()) {
                var ci = cItem
                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
                    ci.meta.itemStatus = status
                }
-                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-                im.itemAdded = true
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
            }
            return true
        }
@@ -454,7 +356,7 @@ final class ChatModel: ObservableObject {

    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-            withConditionalAnimation {
+            withAnimation {
                _updateChatItem(at: i, with: cItem)
            }
        } else if let status = status {
@@ -463,17 +365,17 @@ final class ChatModel: ObservableObject {
    }

    private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+        reversedChatItems[i] = cItem
+        reversedChatItems[i].viewTimestamp = .now
    }

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

    func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
        if cItem.isRcvNew {
-            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+            decreaseUnreadCounter(cInfo)
        }
        // update previews
        if let chat = getChat(cInfo.id) {
@@ -485,24 +387,23 @@ final class ChatModel: ObservableObject {
        if chatId == cInfo.id {
            if let i = getChatItemIndex(cItem) {
                _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+                    self.reversedChatItems.remove(at: i)
                }
            }
        }
-        VoiceItemState.stopVoiceInChatView(cInfo, cItem)
    }

    func nextChatItemData<T>(_ chatItemId: Int64, previous: Bool, map: @escaping (ChatItem) -> T?) -> T? {
-        guard var i = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
+        guard var i = reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
        if previous {
-            while i < im.reversedChatItems.count - 1 {
+            while i < reversedChatItems.count - 1 {
                i += 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
            }
        } else {
            while i > 0 {
                i -= 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
            }
        }
        return nil
@@ -520,21 +421,10 @@ final class ChatModel: ObservableObject {
        }
    }

-    func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
-        guard var current = currentUser else { return }
-        current.uiThemes = uiThemes
-        let i = users.firstIndex(where: { $0.user.userId == current.userId })
-        if let i {
-            users[i].user = current
-        }
-        currentUser = current
-    }
-
    func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
        let cItem = ChatItem.liveDummy(chatInfo.chatType)
        withAnimation {
-            im.reversedChatItems.insert(cItem, at: 0)
-            im.itemAdded = true
+            reversedChatItems.insert(cItem, at: 0)
        }
        return cItem
    }
@@ -542,15 +432,15 @@ final class ChatModel: ObservableObject {
    func removeLiveDummy(animated: Bool = true) {
        if hasLiveDummy {
            if animated {
-                withAnimation { _ = im.reversedChatItems.removeFirst() }
+                withAnimation { _ = reversedChatItems.removeFirst() }
            } else {
-                _ = im.reversedChatItems.removeFirst()
+                _ = reversedChatItems.removeFirst()
            }
        }
    }

    private var hasLiveDummy: Bool {
-        im.reversedChatItems.first?.isLiveDummy == true
+        reversedChatItems.first?.isLiveDummy == true
    }

    func markChatItemsRead(_ cInfo: ChatInfo) {
@@ -567,7 +457,7 @@ final class ChatModel: ObservableObject {

    private func markCurrentChatRead(fromIndex i: Int = 0) {
        var j = i
-        while j < im.reversedChatItems.count {
+        while j < reversedChatItems.count {
            markChatItemRead_(j)
            j += 1
        }
@@ -581,7 +471,7 @@ final class ChatModel: ObservableObject {
                    var unreadBelow = 0
                    var j = i - 1
                    while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
+                        if case .rcvNew = self.reversedChatItems[j].meta.itemStatus {
                            unreadBelow += 1
                        }
                        j -= 1
@@ -616,146 +506,51 @@ final class ChatModel: ObservableObject {
        // clear current chat
        if chatId == cInfo.id {
            chatItemStatuses = [:]
-            im.reversedChatItems = []
+            reversedChatItems = []
        }
    }

-    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
-        if chatId == cInfo.id,
-           let itemIndex = getChatItemIndex(cItem),
-           im.reversedChatItems[itemIndex].isRcvNew {
-            await MainActor.run {
-                withTransaction(Transaction()) {
-                    // update current chat
-                    markChatItemRead_(itemIndex)
-                    // update preview
-                    unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
-                }
-            }
-        }
-    }
-
-    private let unreadCollector = UnreadCollector()
-
-    class UnreadCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: Int] = [:]
-
-        init() {
-            subject
-                .debounce(for: 1, scheduler: DispatchQueue.main)
-                .sink {
-                    let m = ChatModel.shared
-                    for (chatId, count) in self.unreadCounts {
-                        if let i = m.getChatIndex(chatId) {
-                            m.changeUnreadCounter(i, by: count)
-                        }
-                    }
-                    self.unreadCounts = [:]
-                }
-                .store(in: &bag)
-        }
-
-        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
-            DispatchQueue.main.async {
-                self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
-            }
-            subject.send()
-        }
-    }
-
-    let popChatCollector = PopChatCollector()
-    
-    class PopChatCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var chatsToPop: [ChatId: Date] = [:]
-        private let popTsComparator = KeyPathComparator<Chat>(\.popTs, order: .reverse)
-
-        init() {
-            subject
-                .throttle(for: 2, scheduler: DispatchQueue.main, latest: true)
-                .sink { self.popCollectedChats() }
-                .store(in: &bag)
-        }
-        
-        func throttlePopChat(_ chatId: ChatId, currentPosition: Int) {
-            let m = ChatModel.shared
-            if currentPosition > 0 && m.chatId == chatId {
-                m.chatToTop = chatId
-            }
-            if currentPosition > 0 || !chatsToPop.isEmpty {
-                chatsToPop[chatId] = Date.now
-                subject.send()
-            }
-        }
-        
-        func clear() {
-            chatsToPop = [:]
-        }
-
-        func popCollectedChats() {
-            let m = ChatModel.shared
-            var ixs: IndexSet = []
-            var chs: [Chat] = []
-            // collect chats that received updates
-            for (chatId, popTs) in self.chatsToPop {
-                // Currently opened chat is excluded, removing it from the list would navigate out of it
-                // It will be popped to top later when user exits from the list.
-                if m.chatId != chatId, let i = m.getChatIndex(chatId) {
-                    ixs.insert(i)
-                    let ch = m.chats[i]
-                    ch.popTs = popTs
-                    chs.append(ch)
-                }
-            }
-
-            let removeInsert = {
-                m.chats.remove(atOffsets: ixs)
-                // sort chats by pop timestamp in descending order
-                m.chats.insert(contentsOf: chs.sorted(using: self.popTsComparator), at: 0)
-            }
-
-            if m.chatId == nil {
-                withAnimation { removeInsert() }
-            } else {
-                removeInsert()
-            }
-
-            self.chatsToPop = [:]
+    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // update preview
+        decreaseUnreadCounter(cInfo)
+        // update current chat
+        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+            markChatItemRead_(i)
        }
    }

    private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+        let meta = reversedChatItems[i].meta
        if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            reversedChatItems[i].meta.itemStatus = .rcvRead
+            reversedChatItems[i].viewTimestamp = .now
            if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
            }
        }
    }

-    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
-        changeUnreadCounter(user: currentUser!, by: count)
+    func decreaseUnreadCounter(_ cInfo: ChatInfo) {
+        if let i = getChatIndex(cInfo.id) {
+            chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount - 1
+            decreaseUnreadCounter(user: currentUser!)
+        }
    }

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

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

    private func changeUnreadCounter(user: any UserLike, by: Int) {
        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
            users[i].unreadCount += by
        }
-        NtfManager.shared.changeNtfBadgeCount(by: by)
    }

    func totalUnreadCountForAllUsers() -> Int {
@@ -769,8 +564,8 @@ final class ChatModel: ObservableObject {
        var ns: [String] = []
        if let ciCategory = chatItem.mergeCategory,
           var i = getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count {
-                let ci = im.reversedChatItems[i]
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
                if ci.mergeCategory != ciCategory { break }
                if let m = ci.memberConnected {
                    ns.append(m.displayName)
@@ -785,7 +580,7 @@ final class ChatModel: ObservableObject {
    // returns the index of the passed item and the next item (it has smaller index)
    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
        if let i = getChatItemIndex(ci) {
-            (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
        } else {
            (nil, nil)
        }
@@ -795,10 +590,10 @@ final class ChatModel: ObservableObject {
    // and the previous visible item with another merge category
    func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
        guard var i = ciIndex else { return (nil, nil) }
-        let fst = im.reversedChatItems.count - 1
+        let fst = reversedChatItems.count - 1
        while i < fst {
            i = i + 1
-            let ci = im.reversedChatItems[i]
+            let ci = reversedChatItems[i]
            if ciCategory == nil || ciCategory != ci.mergeCategory {
                return (i - 1, ci)
            }
@@ -811,7 +606,7 @@ final class ChatModel: ObservableObject {
        var prevMember: GroupMember? = nil
        var memberIds: Set<Int64> = []
        for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
                memberIds.insert(m.groupMemberId)
            }
@@ -821,7 +616,6 @@ final class ChatModel: ObservableObject {

    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
-            // no animation here, for it not to look like it just moved when leaving the chat
            popChat_(i)
        }
    }
@@ -856,17 +650,14 @@ final class ChatModel: ObservableObject {
        }
        // update current chat
        if chatId == groupInfo.id {
-            if let i = groupMembersIndexes[member.groupMemberId] {
+            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
                withAnimation(.default) {
                    self.groupMembers[i].wrapped = member
                    self.groupMembers[i].created = Date.now
                }
                return false
            } else {
-                withAnimation {
-                    groupMembers.append(GMember(member))
-                    groupMembersIndexes[member.groupMemberId] = groupMembers.count - 1
-                }
+                withAnimation { groupMembers.append(GMember(member)) }
                return true
            }
        } else {
@@ -887,29 +678,37 @@ final class ChatModel: ObservableObject {
        var i = 0
        var totalBelow = 0
        var unreadBelow = 0
-        while i < im.reversedChatItems.count - 1 && !itemsInView.contains(im.reversedChatItems[i].viewId) {
+        while i < reversedChatItems.count - 1 && !itemsInView.contains(reversedChatItems[i].viewId) {
            totalBelow += 1
-            if im.reversedChatItems[i].isRcvNew {
+            if reversedChatItems[i].isRcvNew {
                unreadBelow += 1
            }
            i += 1
        }
-        return UnreadChatItemCounts(
-            // TODO these thresholds account for the fact that items are still "visible" while
-            // covered by compose area, they should be replaced with the actual height in pixels below the screen.
-            isNearBottom: totalBelow < 15,
-            isReallyNearBottom: totalBelow < 2,
-            unreadBelow: unreadBelow
-        )
+        return UnreadChatItemCounts(totalBelow: totalBelow, unreadBelow: unreadBelow)
    }

    func topItemInView(itemsInView: Set<String>) -> ChatItem? {
-        let maxIx = im.reversedChatItems.count - 1
+        let maxIx = reversedChatItems.count - 1
        var i = 0
-        let inView = { itemsInView.contains(self.im.reversedChatItems[$0].viewId) }
+        let inView = { itemsInView.contains(self.reversedChatItems[$0].viewId) }
        while i < maxIx && !inView(i) { i += 1 }
        while i < maxIx && inView(i) { i += 1 }
-        return im.reversedChatItems[min(i - 1, maxIx)]
+        return reversedChatItems[min(i - 1, maxIx)]
+    }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
    }
 }

@@ -923,18 +722,16 @@ struct NTFContactRequest {
    var chatId: String
 }

-struct UnreadChatItemCounts: Equatable {
-    var isNearBottom: Bool
-    var isReallyNearBottom: Bool
+struct UnreadChatItemCounts {
+    var totalBelow: Int
    var unreadBelow: Int
 }

-final class Chat: ObservableObject, Identifiable, ChatLike {
+final class Chat: ObservableObject, Identifiable {
    @Published var chatInfo: ChatInfo
    @Published var chatItems: [ChatItem]
    @Published var chatStats: ChatStats
    var created = Date.now
-    fileprivate var popTs: Date?

    init(_ cData: ChatData) {
        self.chatInfo = cData.chatInfo
@@ -7,19 +7,18 @@
 //

 import Foundation
+import SimpleXChat
 import SwiftUI
 import AVKit
-import SwiftyGif
-import LinkPresentation

-public func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
+func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
    if let file = file, file.loaded {
        return file.fileSource
    }
    return nil
 }

-public func getLoadedImage(_ file: CIFile?) -> UIImage? {
+func getLoadedImage(_ file: CIFile?) -> UIImage? {
    if let fileSource = getLoadedFileSource(file) {
        let filePath = getAppFilePath(fileSource.filePath)
        do {
@@ -38,7 +37,7 @@ public func getLoadedImage(_ file: CIFile?) -> UIImage? {
    return nil
 }

-public func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
+func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
    if let cfArgs = cfArgs {
        return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
    } else {
@@ -46,7 +45,7 @@ public func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
    }
 }

-public func getLoadedVideo(_ file: CIFile?) -> URL? {
+func getLoadedVideo(_ file: CIFile?) -> URL? {
    if let fileSource = getLoadedFileSource(file) {
        let filePath = getAppFilePath(fileSource.filePath)
        if FileManager.default.fileExists(atPath: filePath.path) {
@@ -56,13 +55,13 @@ public func getLoadedVideo(_ file: CIFile?) -> URL? {
    return nil
 }

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

-public func saveImage(_ uiImage: UIImage) -> CryptoFile? {
+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) {
@@ -72,7 +71,7 @@ public func saveImage(_ uiImage: UIImage) -> CryptoFile? {
    return nil
 }

-public func cropToSquare(_ image: UIImage) -> UIImage {
+func cropToSquare(_ image: UIImage) -> UIImage {
    let size = image.size
    let side = min(size.width, size.height)
    let newSize = CGSize(width: side, height: side)
@@ -85,7 +84,7 @@ public func cropToSquare(_ image: UIImage) -> UIImage {
    return resizeImage(image, newBounds: CGRect(origin: .zero, size: newSize), drawIn: CGRect(origin: origin, size: size), hasAlpha: imageHasAlpha(image))
 }

-public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha: Bool) -> Data? {
+func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha: Bool) -> Data? {
    var img = image
    var data = hasAlpha ? img.pngData() : img.jpegData(compressionQuality: 0.85)
    var dataSize = data?.count ?? 0
@@ -100,7 +99,7 @@ public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha
    return data
 }

-public func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) -> String? {
+func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) -> String? {
    var img = image
    let hasAlpha = imageHasAlpha(image)
    var str = compressImageStr(img, hasAlpha: hasAlpha)
@@ -116,7 +115,7 @@ public func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) -> String
    return str
 }

-public func compressImageStr(_ image: UIImage, _ compressionQuality: CGFloat = 0.85, hasAlpha: Bool) -> String? {
+func compressImageStr(_ image: UIImage, _ compressionQuality: CGFloat = 0.85, hasAlpha: Bool) -> String? {
    let ext = hasAlpha ? "png" : "jpg"
    if let data = hasAlpha ? image.pngData() : image.jpegData(compressionQuality: compressionQuality) {
        return "data:image/\(ext);base64,\(data.base64EncodedString())"
@@ -139,7 +138,7 @@ private func resizeImage(_ image: UIImage, newBounds: CGRect, drawIn: CGRect, ha
    }
 }

-public func imageHasAlpha(_ img: UIImage) -> Bool {
+func imageHasAlpha(_ img: UIImage) -> Bool {
    if let cgImage = img.cgImage {
        let colorSpace = CGColorSpaceCreateDeviceRGB()
        let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
@@ -159,35 +158,7 @@ public func imageHasAlpha(_ img: UIImage) -> Bool {
    return false
 }

-/// Reduces image size, while consuming less RAM
-///
-/// Used by ShareExtension to downsize large images
-/// before passing them to regular image processing pipeline
-/// to avoid exceeding 120MB memory
-///
-/// - Parameters:
-///   - url: Location of the image data
-///   - size: Maximum dimension (width or height)
-/// - Returns: Downsampled image or `nil`, if the image can't be located
-public func downsampleImage(at url: URL, to size: Int64) -> UIImage? {
-    autoreleasepool {
-        if let source = CGImageSourceCreateWithURL(url as CFURL, nil) {
-            CGImageSourceCreateThumbnailAtIndex(
-                    source,
-                    0,
-                    [
-                        kCGImageSourceCreateThumbnailFromImageAlways: true,
-                        kCGImageSourceShouldCacheImmediately: true,
-                        kCGImageSourceCreateThumbnailWithTransform: true,
-                        kCGImageSourceThumbnailMaxPixelSize: String(size) as CFString
-                    ] as CFDictionary
-                )
-            .map { UIImage(cgImage: $0) }
-        } else { nil }
-    }
-}
-
-public func saveFileFromURL(_ url: URL) -> CryptoFile? {
+func saveFileFromURL(_ url: URL) -> CryptoFile? {
    let encrypted = privacyEncryptLocalFilesGroupDefault.get()
    let savedFile: CryptoFile?
    if url.startAccessingSecurityScopedResource() {
@@ -213,7 +184,7 @@ public func saveFileFromURL(_ url: URL) -> CryptoFile? {
    return savedFile
 }

-public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
+func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    do {
        let encrypted = privacyEncryptLocalFilesGroupDefault.get()
        let fileName = uniqueCombine(url.lastPathComponent)
@@ -226,6 +197,7 @@ public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
            try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
            savedFile = CryptoFile.plain(fileName)
        }
+        ChatModel.shared.filesToDelete.remove(url)
        return savedFile
    } catch {
        logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
@@ -233,44 +205,7 @@ public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    }
 }

-public func saveWallpaperFile(url: URL) -> String? {
-    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", "jpg", fullPath: true))
-    do {
-        try FileManager.default.copyItem(atPath: url.path, toPath: destFile.path)
-        return destFile.lastPathComponent
-    } catch {
-        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
-public func saveWallpaperFile(image: UIImage) -> String? {
-    let hasAlpha = imageHasAlpha(image)
-    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", hasAlpha ? "png" : "jpg", fullPath: true))
-    let dataResized = resizeImageToDataSize(image, maxDataSize: 5_000_000, hasAlpha: hasAlpha)
-    do {
-        try dataResized!.write(to: destFile)
-        return destFile.lastPathComponent
-    } catch {
-        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
-public func removeWallpaperFile(fileName: String? = nil) {
-    do {
-        try FileManager.default.contentsOfDirectory(atPath: getWallpaperDirectory().path).forEach {
-            if URL(fileURLWithPath: $0).lastPathComponent == fileName { try FileManager.default.removeItem(atPath: $0) }
-        }
-    } catch {
-        logger.error("FileUtils.removeWallpaperFile error: \(error.localizedDescription)")
-    }
-    if let fileName {
-        WallpaperType.cachedImages.removeValue(forKey: fileName)
-    }
-}
-
-public func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
+func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }

@@ -302,7 +237,7 @@ private func getTimestamp() -> String {
    return df.string(from: Date())
 }

-public func dropImagePrefix(_ s: String) -> String {
+func dropImagePrefix(_ s: String) -> String {
    dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
 }

@@ -310,23 +245,8 @@ private func dropPrefix(_ s: String, _ prefix: String) -> String {
    s.hasPrefix(prefix) ? String(s.dropFirst(prefix.count)) : s
 }

-public func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
-    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
-    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
-        s.outputURL = outputUrl
-        s.outputFileType = .mp4
-        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
-        await s.export()
-        if let err = s.error {
-            logger.error("Failed to export video with error: \(err)")
-        }
-        return s.status == .completed
-    }
-    return false
-}
-
 extension AVAsset {
-    public func generatePreview() -> (UIImage, Int)? {
+    func generatePreview() -> (UIImage, Int)? {
        let generator = AVAssetImageGenerator(asset: self)
        generator.appliesPreferredTrackTransform = true
        var actualTime = CMTimeMake(value: 0, timescale: 0)
@@ -338,7 +258,7 @@ extension AVAsset {
 }

 extension UIImage {
-    public func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
+    func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
        if let cgImage = cgImage {
            let colorSpace = CGColorSpaceCreateDeviceRGB()
            let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
@@ -383,75 +303,4 @@ extension UIImage {
        }
        return self
    }
-
-    public convenience init?(base64Encoded: String?) {
-        if let base64Encoded, let data = Data(base64Encoded: dropImagePrefix(base64Encoded)) {
-            self.init(data: data)
-        } else {
-            return nil
-        }
-    }
-}
-
-public func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
-    logger.debug("getLinkMetadata: fetching URL preview")
-    LPMetadataProvider().startFetchingMetadata(for: url){ metadata, error in
-        if let e = error {
-            logger.error("Error retrieving link metadata: \(e.localizedDescription)")
-        }
-        if let metadata = metadata,
-           let imageProvider = metadata.imageProvider,
-           imageProvider.canLoadObject(ofClass: UIImage.self) {
-            imageProvider.loadObject(ofClass: UIImage.self){ object, error in
-                var linkPreview: LinkPreview? = nil
-                if let error = error {
-                    logger.error("Couldn't load image preview from link metadata with error: \(error.localizedDescription)")
-                } else {
-                    if let image = object as? UIImage,
-                       let resized = resizeImageToStrSize(image, maxDataSize: 14000),
-                       let title = metadata.title,
-                       let uri = metadata.originalURL {
-                        linkPreview = LinkPreview(uri: uri, title: title, image: resized)
-                    }
-                }
-                cb(linkPreview)
-            }
-        } else {
-            logger.error("Could not load link preview image")
-            cb(nil)
-        }
-    }
-}
-
-public func getLinkPreview(for url: URL) async -> LinkPreview? {
-    await withCheckedContinuation { cont in
-        getLinkPreview(url: url) { cont.resume(returning: $0) }
-    }
-}
-
-private let squareToCircleRatio = 0.935
-
-private let radiusFactor = (1 - squareToCircleRatio) / 50
-
-@ViewBuilder public func clipProfileImage(_ img: Image, size: CGFloat, radius: Double, blurred: Bool = false) -> some View {
-    if radius >= 50 {
-        blurredFrame(img, size, blurred).clipShape(Circle())
-    } else if radius <= 0 {
-        let sz = size * squareToCircleRatio
-        blurredFrame(img, sz, blurred).padding((size - sz) / 2)
-    } else {
-        let sz = size * (squareToCircleRatio + radius * radiusFactor)
-        blurredFrame(img, sz, blurred)
-        .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
-        .padding((size - sz) / 2)
-    }
-}
-
-@ViewBuilder private func blurredFrame(_ img: Image, _ size: CGFloat, _ blurred: Bool) -> some View {
-    let v = img.resizable().frame(width: size, height: size)
-    if blurred {
-        v.blur(radius: size / 4)
-    } else {
-        v
-    }
 }
@@ -1,73 +0,0 @@
-//
-//  NetworkObserver.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 05.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import Network
-import SimpleXChat
-
-class NetworkObserver {
-    static let shared = NetworkObserver()
-    private let queue: DispatchQueue = DispatchQueue(label: "chat.simplex.app.NetworkObserver")
-    private var prevInfo: UserNetworkInfo? = nil
-    private var monitor: NWPathMonitor?
-    private let monitorLock: DispatchQueue = DispatchQueue(label: "chat.simplex.app.monitorLock")
-
-    func restartMonitor() {
-        monitorLock.sync {
-            monitor?.cancel()
-            let mon = NWPathMonitor()
-            mon.pathUpdateHandler = { [weak self] path in
-                self?.networkPathChanged(path: path)
-            }
-            mon.start(queue: queue)
-            monitor = mon
-        }
-    }
-
-    private func networkPathChanged(path: NWPath) {
-        let info = UserNetworkInfo(
-            networkType: networkTypeFromPath(path),
-            online: path.status == .satisfied
-        )
-        if (prevInfo != info) {
-            prevInfo = info
-            setNetworkInfo(info)
-        }
-    }
-
-    private func networkTypeFromPath(_ path: NWPath) -> UserNetworkType {
-        if path.usesInterfaceType(.wiredEthernet) {
-            .ethernet
-        } else if path.usesInterfaceType(.wifi) {
-            .wifi
-        } else if path.usesInterfaceType(.cellular) {
-            .cellular
-        } else if path.usesInterfaceType(.other) {
-            .other
-        } else {
-            .none
-        }
-    }
-
-    private static var networkObserver: NetworkObserver? = nil
-
-    private func setNetworkInfo(_ info: UserNetworkInfo) {
-        logger.debug("setNetworkInfo Network changed: \(String(describing: info))")
-        DispatchQueue.main.sync {
-            ChatModel.shared.networkInfo = info
-        }
-        if !hasChatCtrl() { return }
-        self.monitorLock.sync {
-            do {
-                try apiSetNetworkInfo(info)
-            } catch let err {
-                logger.error("setNetworkInfo error: \(responseError(err))")
-            }
-        }
-    }
-}
@@ -57,9 +57,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                chatModel.ntfCallInvitationAction = (chatId, ntfAction)
            }
        } else {
-            if let chatId = content.targetContentIdentifier {
-                ItemsModel.shared.loadOpenChat(chatId)
-            }
+            chatModel.chatId = content.targetContentIdentifier
        }
        handler()
    }
@@ -240,8 +238,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        ntfBadgeCountGroupDefault.set(count)
    }

-    func changeNtfBadgeCount(by count: Int = 1) {
-        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber + count))
+    func decNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber - count))
+    }
+
+    func incNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(UIApplication.shared.applicationIconBadgeNumber + count)
    }

    private func addNotification(_ content: UNMutableNotificationContent) {
@@ -92,29 +92,25 @@ private func withBGTask<T>(bgDelay: Double? = nil, f: @escaping () -> T) -> T {
    return r
 }

-func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) -> ChatResponse {
-    if log {
-        logger.debug("chatSendCmd \(cmd.cmdType)")
-    }
+func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) -> ChatResponse {
+    logger.debug("chatSendCmd \(cmd.cmdType)")
    let start = Date.now
    let resp = bgTask
                ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd, ctrl) }
                : sendSimpleXCmd(cmd, ctrl)
-    if log {
-        logger.debug("chatSendCmd \(cmd.cmdType): \(resp.responseType)")
-        if case let .response(_, json) = resp {
-            logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
-        }
-        Task {
-            await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
-        }
+    logger.debug("chatSendCmd \(cmd.cmdType): \(resp.responseType)")
+    if case let .response(_, json) = resp {
+        logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
+    }
+    Task {
+        await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
    }
    return resp
 }

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

@@ -137,8 +133,8 @@ func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
    }
 }

-func apiCreateActiveUser(_ p: Profile?, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p, pastTimestamp: pastTimestamp), ctrl)
+func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
+    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp), ctrl)
    if case let .activeUser(user) = r { return user }
    throw r
 }
@@ -217,7 +213,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
 }

 func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true, enableSndFiles: true), ctrl)
+    let r = chatSendCmdSync(.startChat(mainApp: true), ctrl)
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -225,15 +221,6 @@ func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
    }
 }

-func apiCheckChatRunning() throws -> Bool {
-    let r = chatSendCmdSync(.checkChatRunning)
-    switch r {
-    case .chatRunning: return true
-    case .chatStopped: return false
-    default: throw r
-    }
-}
-
 func apiStopChat() async throws {
    let r = await chatSendCmd(.apiStopChat)
    switch r {
@@ -255,8 +242,14 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
    logger.error("apiSuspendChat error: \(String(describing: r))")
 }

-func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl)
+func apiSetTempFolder(tempFolder: String, ctrl: chat_ctrl? = nil) throws {
+    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder), ctrl)
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func apiSetFilesFolder(filesFolder: String, ctrl: chat_ctrl? = nil) throws {
+    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder), ctrl)
    if case .cmdOk = r { return }
    throw r
 }
@@ -279,12 +272,22 @@ func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
    throw r
 }

-func apiExportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
-    let r = await chatSendCmd(.apiExportArchive(config: config))
-    if case let .archiveExported(archiveErrors) = r { return archiveErrors }
+func apiSetPQEncryption(_ enable: Bool) throws {
+    let r = chatSendCmdSync(.apiSetPQEncryption(enable: enable))
+    if case .cmdOk = r { return }
    throw r
 }

+func apiSetContactPQ(_ contactId: Int64, _ enable: Bool) async throws -> Contact {
+    let r = await chatSendCmd(.apiSetContactPQ(contactId: contactId, enable: enable))
+    if case let .contactPQAllowed(_, contact, _) = r { return contact }
+    throw r
+}
+
+func apiExportArchive(config: ArchiveConfig) async throws {
+    try await sendCommandOkResp(.apiExportArchive(config: config))
+}
+
 func apiImportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
    let r = await chatSendCmd(.apiImportArchive(config: config))
    if case let .archiveImported(archiveErrors) = r { return archiveErrors }
@@ -318,10 +321,8 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
    throw r
 }

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

-func loadChat(chat: Chat, search: String = "", clearItems: Bool = true) async {
+func loadChat(chat: Chat, search: String = "") {
    do {
        let cInfo = chat.chatInfo
        let m = ChatModel.shared
-        let im = ItemsModel.shared
        m.chatItemStatuses = [:]
-        if clearItems {
-            await MainActor.run { im.reversedChatItems = [] }
-        }
-        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        await MainActor.run {
-            im.reversedChatItems = chat.chatItems.reversed()
-            m.updateChatInfo(chat.chatInfo)
-        }
+        m.reversedChatItems = []
+        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        m.updateChatInfo(chat.chatInfo)
+        m.reversedChatItems = chat.chatItems.reversed()
    } catch let error {
        logger.error("loadChat error: \(responseError(error))")
    }
@@ -357,20 +353,11 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
-    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
-    return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
-}
-
 func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
-    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
-    return await processSendMessageCmd(toChatType: type, cmd: cmd)
-}
-
-private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) 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 toChatType == .direct {
+    if type == .direct {
        var cItem: ChatItem? = nil
        let endTask = beginBGTask({
            if let cItem = cItem {
@@ -410,10 +397,10 @@ func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent)
 }

 private func sendMessageErrorAlert(_ r: ChatResponse) {
-    logger.error("send message error: \(String(describing: r))")
+    logger.error("apiSendMessage error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
        title: "Error sending message",
-        message: "Error: \(responseError(r))"
+        message: "Error: \(String(describing: r))"
    )
 }

@@ -421,7 +408,7 @@ private func createChatItemErrorAlert(_ r: ChatResponse) {
    logger.error("apiCreateChatItem error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
        title: "Error creating message",
-        message: "Error: \(responseError(r))"
+        message: "Error: \(String(describing: r))"
    )
 }

@@ -437,15 +424,15 @@ func apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, re
    throw r
 }

-func apiDeleteChatItems(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemIds: itemIds, mode: mode), bgDelay: msgDelay)
-    if case let .chatItemsDeleted(_, items, _) = r { return items }
+func apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode) async throws -> (ChatItem, ChatItem?) {
+    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemId: itemId, mode: mode), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
    throw r
 }

-func apiDeleteMemberChatItems(groupId: Int64, itemIds: [Int64]) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, itemIds: itemIds), bgDelay: msgDelay)
-    if case let .chatItemsDeleted(_, items, _) = r { return items }
+func apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64) async throws -> (ChatItem, ChatItem?) {
+    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, groupMemberId: groupMemberId, itemId: itemId), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
    throw r
 }

@@ -547,21 +534,10 @@ func setNetworkConfig(_ cfg: NetCfg, ctrl: chat_ctrl? = nil) throws {
    throw r
 }

-func apiSetNetworkInfo(_ networkInfo: UserNetworkInfo) throws {
-    let r = chatSendCmdSync(.apiSetNetworkInfo(networkInfo: networkInfo))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func reconnectAllServers() async throws {
    try await sendCommandOkResp(.reconnectAllServers)
 }

-func reconnectServer(smpServer: String) async throws {
-    let userId = try currentUserId("reconnectServer")
-    try await sendCommandOkResp(.reconnectServer(userId: userId, smpServer: smpServer))
-}
-
 func apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings) async throws {
    try await sendCommandOkResp(.apiSetChatSettings(type: type, id: id, chatSettings: chatSettings))
 }
@@ -582,18 +558,6 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (Gro
    throw r
 }

-func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
-    let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
-    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
-}
-
-func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
-    let r = await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
-    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
-    throw r
-}
-
 func apiSwitchContact(contactId: Int64) throws -> ConnectionStats {
    let r = chatSendCmdSync(.apiSwitchContact(contactId: contactId))
    if case let .contactSwitchStarted(_, _, connectionStats) = r { return connectionStats }
@@ -705,7 +669,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
        return ((.contact, connection), nil)
    case let .contactAlreadyExists(_, contact):
        if let c = m.getContactChat(contact.contactId) {
-            ItemsModel.shared.loadOpenChat(c.id)
+            await MainActor.run { m.chatId = c.id }
        }
        let alert = contactAlreadyExistsAlert(contact)
        return (nil, alert)
@@ -715,7 +679,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
            message: "Please check that you used the correct link or ask your contact to send you another one."
        )
        return (nil, alert)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))):
+    case .chatCmdError(_, .errorAgent(.SMP(.AUTH))):
        let alert = mkAlert(
            title: "Connection error (AUTH)",
            message: "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection."
@@ -748,7 +712,7 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
    } else {
        return mkAlert(
            title: "Connection error",
-            message: "Error: \(responseError(r))"
+            message: "Error: \(String(describing: r))"
        )
    }
 }
@@ -765,38 +729,22 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
    return (nil, alert)
 }

-func apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws {
+func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
    let chatId = type.rawValue + id.description
    DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
    defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
    if case .contactConnection = type, case .contactConnectionDeleted = r { return }
    if case .group = type, case .groupDeletedUser = r { return }
    throw r
 }

-func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws -> Contact {
-    let type: ChatType = .direct
-    let chatId = type.rawValue + id.description
-    if case .full = chatDeleteMode {
-        DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
-    }
-    defer {
-        if case .full = chatDeleteMode {
-            DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) }
-        }
-    }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
-    if case let .contactDeleted(_, contact) = r { return contact }
-    throw r
-}
-
-func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
+func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
    do {
        let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
-        await MainActor.run { ChatModel.shared.removeChat(cInfo.id) }
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
+        DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
    } catch let error {
        logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
        AlertManager.shared.showAlertMsg(
@@ -806,39 +754,6 @@ func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: tru
    }
 }

-func deleteContactChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async -> Alert? {
-    do {
-        let cInfo = chat.chatInfo
-        let ct = try await apiDeleteContact(id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
-        await MainActor.run {
-            switch chatDeleteMode {
-            case .full:
-                ChatModel.shared.removeChat(cInfo.id)
-            case .entity:
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: chat.chatItems
-                ))
-            case .messages:
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: []
-                ))
-            }
-        }
-    } catch let error {
-        logger.error("deleteContactChat apiDeleteContact error: \(responseError(error))")
-        return mkAlert(
-            title: "Error deleting chat!",
-            message: "Error: \(responseError(error))"
-        )
-    }
-    return nil
-}
-
-
 func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
    let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
    if case let .chatCleared(_, updatedChatInfo) = r { return updatedChatInfo }
@@ -901,21 +816,6 @@ func apiSetConnectionAlias(connId: Int64, localAlias: String) async throws -> Pe
    throw r
 }

-func apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?) async -> Bool {
-    let r = await chatSendCmd(.apiSetUserUIThemes(userId: userId, themes: themes))
-    if case .cmdOk = r { return true }
-    logger.error("apiSetUserUIThemes bad response: \(String(describing: r))")
-    return false
-}
-
-func apiSetChatUIThemes(chatId: ChatId, themes: ThemeModeOverrides?) async -> Bool {
-    let r = await chatSendCmd(.apiSetChatUIThemes(chatId: chatId, themes: themes))
-    if case .cmdOk = r { return true }
-    logger.error("apiSetChatUIThemes bad response: \(String(describing: r))")
-    return false
-}
-
-
 func apiCreateUserAddress() async throws -> String {
    let userId = try currentUserId("apiCreateUserAddress")
    let r = await chatSendCmd(.apiCreateMyAddress(userId: userId))
@@ -963,7 +863,7 @@ func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Cont
    let am = AlertManager.shared

    if case let .acceptingContactRequest(_, contact) = r { return contact }
-    if case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))) = r {
+    if case .chatCmdError(_, .errorAgent(.SMP(.AUTH))) = r {
        am.showAlertMsg(
            title: "Connection error (AUTH)",
            message: "Sender may have deleted the connection request."
@@ -974,7 +874,7 @@ func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Cont
        logger.error("apiAcceptContactRequest error: \(String(describing: r))")
        am.showAlertMsg(
            title: "Error accepting contact request",
-            message: "Error: \(responseError(r))"
+            message: "Error: \(String(describing: r))"
        )
    }
    return nil
@@ -1000,7 +900,7 @@ func uploadStandaloneFile(user: any UserLike, file: CryptoFile, ctrl: chat_ctrl?
        return (fileTransferMeta, nil)
    } else {
        logger.error("uploadStandaloneFile error: \(String(describing: r))")
-        return (nil, responseError(r))
+        return (nil, String(describing: r))
    }
 }

@@ -1010,7 +910,7 @@ func downloadStandaloneFile(user: any UserLike, url: String, file: CryptoFile, c
        return (rcvFileTransfer, nil)
    } else {
        logger.error("downloadStandaloneFile error: \(String(describing: r))")
-        return (nil, responseError(r))
+        return (nil, String(describing: r))
    }
 }

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

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

-func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
+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 {
@@ -1049,50 +944,19 @@ func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, in
        }
    } else if let networkErrorAlert = networkErrorAlert(r) {
        logger.error("apiReceiveFile network error: \(String(describing: r))")
-        if !auto {
-            am.showAlert(networkErrorAlert)
-        }
+        am.showAlert(networkErrorAlert)
    } else {
        switch chatError(r) {
        case .fileCancelled:
            logger.debug("apiReceiveFile ignoring fileCancelled error")
        case .fileAlreadyReceiving:
            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
-        case let .fileNotApproved(fileId, unknownServers):
-            logger.debug("apiReceiveFile fileNotApproved error")
-            if !auto {
-                let srvs = unknownServers.map { s in
-                    if let srv = parseServerAddress(s), !srv.hostnames.isEmpty {
-                        srv.hostnames[0]
-                    } else {
-                        serverHost(s)
-                    }
-                }
-                am.showAlert(Alert(
-                    title: Text("Unknown servers!"),
-                    message: Text("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs.sorted().joined(separator: ", "))."),
-                    primaryButton: .default(
-                        Text("Download"),
-                        action: {
-                            Task {
-                                logger.debug("apiReceiveFile fileNotApproved alert - in Task")
-                                if let user = ChatModel.shared.currentUser {
-                                    await receiveFile(user: user, fileId: fileId, userApprovedRelays: true)
-                                }
-                            }
-                        }
-                    ),
-                    secondaryButton: .cancel()
-                ))
-            }
        default:
            logger.error("apiReceiveFile error: \(String(describing: r))")
-            if !auto {
-                am.showAlertMsg(
-                    title: "Error receiving file",
-                    message: "Error: \(responseError(r))"
-                )
-            }
+            am.showAlertMsg(
+                title: "Error receiving file",
+                message: "Error: \(String(describing: r))"
+            )
        }
    }
    return nil
@@ -1157,9 +1021,18 @@ func deleteRemoteCtrl(_ rcId: Int64) async throws {
 }

 func networkErrorAlert(_ r: ChatResponse) -> Alert? {
-    if let alert = getNetworkErrorAlert(r) {
-        return mkAlert(title: alert.title, message: alert.message)
-    } else {
+    switch r {
+    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
+        return mkAlert(
+            title: "Connection timeout",
+            message: "Please check your network connection with \(serverHostname(addr)) and try again."
+        )
+    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .NETWORK))):
+        return mkAlert(
+            title: "Connection error",
+            message: "Please check your network connection with \(serverHostname(addr)) and try again."
+        )
+    default:
        return nil
    }
 }
@@ -1167,17 +1040,7 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
 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: [])
-        await MainActor.run {
-            ChatModel.shared.replaceChat(contactRequest.id, chat)
-            NetworkModel.shared.setContactNetworkStatus(contact, .connected)
-        }
-        if contact.sndReady {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true) {
-                    ItemsModel.shared.loadOpenChat(chat.id)
-                }
-            }
-        }
+        DispatchQueue.main.async { ChatModel.shared.replaceChat(contactRequest.id, chat) }
    }
 }

@@ -1218,18 +1081,12 @@ func apiEndCall(_ contact: Contact) async throws {
    try await sendCommandOkResp(.apiEndCall(contact: contact))
 }

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

-func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
-    let r = await chatSendCmd(.apiGetCallInvitations)
-    if case let .callInvitations(invs) = r { return invs }
-    throw r
-}
-
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
    if let callStatus = WebRTCCallStatus.init(rawValue: status) {
        try await sendCommandOkResp(.apiCallStatus(contact: contact, callStatus: callStatus))
@@ -1279,7 +1136,7 @@ func apiMarkChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
    do {
        logger.debug("apiMarkChatItemRead: \(cItem.id)")
        try await apiChatRead(type: cInfo.chatType, id: cInfo.apiId, itemRange: (cItem.id, cItem.id))
-        await ChatModel.shared.markChatItemRead(cInfo, cItem)
+        await MainActor.run { ChatModel.shared.markChatItemRead(cInfo, cItem) }
    } catch {
        logger.error("apiMarkChatItemRead apiChatRead error: \(responseError(error))")
    }
@@ -1320,7 +1177,7 @@ func apiJoinGroup(_ groupId: Int64) async throws -> JoinGroupResult {
    let r = await chatSendCmd(.apiJoinGroup(groupId: groupId))
    switch r {
    case let .userAcceptedGroupSent(_, groupInfo, _): return .joined(groupInfo: groupInfo)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .AUTH))): return .invitationRemoved
+    case .chatCmdError(_, .errorAgent(.SMP(.AUTH))): return .invitationRemoved
    case .chatCmdError(_, .errorStore(.groupNotFound)): return .groupNotFound
    default: throw r
    }
@@ -1369,7 +1226,7 @@ func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
    return ChatModel.shared.chats
        .compactMap{ $0.chatInfo.contact }
-        .filter{ c in c.sendMsgEnabled && !c.nextSendGrpInv && !memberContactIds.contains(c.apiId) }
+        .filter{ c in c.ready && c.active && !memberContactIds.contains(c.apiId) }
        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }

@@ -1426,26 +1283,6 @@ func apiGetVersion() throws -> CoreVersionInfo {
    throw r
 }

-func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
-    let userId = try currentUserId("getAgentSubsTotal")
-    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
-    if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
-    logger.error("getAgentSubsTotal error: \(String(describing: r))")
-    throw r
-}
-
-func getAgentServersSummary() throws -> PresentedServersSummary {
-    let userId = try currentUserId("getAgentServersSummary")
-    let r = chatSendCmdSync(.getAgentServersSummary(userId: userId), log: false)
-    if case let .agentServersSummary(_, serversSummary) = r { return serversSummary }
-    logger.error("getAgentServersSummary error: \(String(describing: r))")
-    throw r
-}
-
-func resetAgentServersStats() async throws {
-    try await sendCommandOkResp(.resetAgentServersStats)
-}
-
 private func currentUserId(_ funcName: String) throws -> Int64 {
    if let userId = ChatModel.shared.currentUser?.userId {
        return userId
@@ -1460,13 +1297,14 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
    defer { m.ctrlInitInProgress = false }
    (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey, confirmMigrations: confirmMigrations)
    if  m.chatDbStatus != .ok { return }
-    NetworkObserver.shared.restartMonitor()
    // If we migrated successfully means previous re-encryption process on database level finished successfully too
    if encryptionStartedDefault.get() {
        encryptionStartedDefault.set(false)
    }
-    try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
+    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
+    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
+    try apiSetPQEncryption(pqExperimentalEnabledDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
    if m.currentUser == nil {
@@ -1517,16 +1355,15 @@ func startChat(refreshInvitations: Bool = true) throws {
    logger.debug("startChat")
    let m = ChatModel.shared
    try setNetworkConfig(getNetCfg())
-    let chatRunning = try apiCheckChatRunning()
+    let justStarted = try apiStartChat()
    m.users = try listUsers()
-    if !chatRunning {
+    if justStarted {
        try getUserChatData()
        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
        if (refreshInvitations) {
-            Task { try await refreshCallInvitations() }
+            try refreshCallInvitations()
        }
        (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
-        _ = try apiStartChat()
        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
        // when it is called before startChat
        if let token = m.deviceToken {
@@ -1551,7 +1388,8 @@ func startChatWithTemporaryDatabase(ctrl: chat_ctrl) throws -> User? {
    logger.debug("startChatWithTemporaryDatabase")
    let migrationActiveUser = try? apiGetActiveUser(ctrl: ctrl) ?? apiCreateActiveUser(Profile(displayName: "Temp", fullName: ""), ctrl: ctrl)
    try setNetworkConfig(getNetCfg(), ctrl: ctrl)
-    try apiSetAppFilePaths(filesFolder: getMigrationTempFilesDirectory().path, tempFolder: getMigrationTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path, ctrl: ctrl)
+    try apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
+    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
    _ = try apiStartChat(ctrl: ctrl)
    return migrationActiveUser
 }
@@ -1597,7 +1435,7 @@ func getUserChatData() throws {
    m.userAddress = try apiGetUserAddress()
    m.chatItemTTL = try getChatItemTTL()
    let chats = try apiGetChats()
-    m.updateChats(chats)
+    m.chats = chats.map { Chat.init($0) }
 }

 private func getUserChatDataAsync() async throws {
@@ -1609,12 +1447,12 @@ private func getUserChatDataAsync() async throws {
        await MainActor.run {
            m.userAddress = userAddress
            m.chatItemTTL = chatItemTTL
-            m.updateChats(chats)
+            m.chats = chats.map { Chat.init($0) }
        }
    } else {
        await MainActor.run {
            m.userAddress = nil
-            m.updateChats([])
+            m.chats = []
        }
    }
 }
@@ -1624,8 +1462,6 @@ class ChatReceiver {
    private var receiveMessages = true
    private var _lastMsgTime = Date.now

-    var messagesChannel: ((ChatResponse) -> Void)? = nil
-
    static let shared = ChatReceiver()

    var lastMsgTime: Date { get { _lastMsgTime } }
@@ -1643,9 +1479,6 @@ class ChatReceiver {
            if let msg = await chatRecvMsg() {
                self._lastMsgTime = .now
                await processReceivedMsg(msg)
-                if let messagesChannel {
-                    messagesChannel(msg)
-                }
            }
            _ = try? await Task.sleep(nanoseconds: 7_500_000)
        }
@@ -1664,7 +1497,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await TerminalItems.shared.add(.resp(.now, res))
    }
    let m = ChatModel.shared
-    let n = NetworkModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
    case let .contactDeletedByContact(user, contact):
@@ -1687,7 +1519,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
            NtfManager.shared.notifyContactConnected(user, contact)
        }
        await MainActor.run {
-            n.setContactNetworkStatus(contact, .connected)
+            m.setContactNetworkStatus(contact, .connected)
        }
    case let .contactConnecting(user, contact):
        if active(user) && contact.directOrUsed {
@@ -1699,19 +1531,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                }
            }
        }
-    case let .contactSndReady(user, contact):
-        if active(user) && contact.directOrUsed {
-            await MainActor.run {
-                m.updateContact(contact)
-                if let conn = contact.activeConn {
-                    m.dismissConnReqView(conn.id)
-                    m.removeChat(conn.id)
-                }
-            }
-        }
-        await MainActor.run {
-            n.setContactNetworkStatus(contact, .connected)
-        }
    case let .receivedContactRequest(user, contactRequest):
        if active(user) {
            let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
@@ -1744,7 +1563,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && m.hasChat(mergedContact.id) {
            await MainActor.run {
                if m.chatId == mergedContact.id {
-                    ItemsModel.shared.loadOpenChat(mergedContact.id)
+                    m.chatId = intoContact.id
                }
                m.removeChat(mergedContact.id)
            }
@@ -1752,27 +1571,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
    case let .networkStatus(status, connections):
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = n.networkStatuses
+            var ns = m.networkStatuses
            // slow loop is on the background thread
            for cId in connections {
                ns[cId] = status
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                n.networkStatuses = ns
+                m.networkStatuses = ns
            }
        }
    case let .networkStatuses(_, statuses): ()
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = n.networkStatuses
+            var ns = m.networkStatuses
            // slow loop is on the background thread
            for s in statuses {
                ns[s.agentConnId] = s.networkStatus
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                n.networkStatuses = ns
+                m.networkStatuses = ns
            }
        }
    case let .newChatItem(user, aChatItem):
@@ -1815,25 +1634,21 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
            }
        }
-    case let .chatItemsDeleted(user, items, _):
+    case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
        if !active(user) {
-            for item in items {
-                if item.toChatItem == nil && item.deletedChatItem.chatItem.isRcvNew && item.deletedChatItem.chatInfo.ntfsEnabled {
-                    await MainActor.run {
-                        m.decreaseUnreadCounter(user: user)
-                    }
+            if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+                await MainActor.run {
+                    m.decreaseUnreadCounter(user: user)
                }
            }
            return
        }

        await MainActor.run {
-            for item in items {
-                if let toChatItem = item.toChatItem {
-                    _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
-                } else {
-                    m.removeChatItem(item.deletedChatItem.chatInfo, item.deletedChatItem.chatItem)
-                }
+            if let toChatItem = toChatItem {
+                _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
+            } else {
+                m.removeChatItem(deletedChatItem.chatInfo, deletedChatItem.chatItem)
            }
        }
    case let .receivedGroupInvitation(user, groupInfo, _, _):
@@ -1913,7 +1728,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
        if let contact = memberContact {
            await MainActor.run {
-                n.setContactNetworkStatus(contact, .connected)
+                m.setContactNetworkStatus(contact, .connected)
            }
        }
    case let .groupUpdated(user, toGroup):
@@ -1955,15 +1770,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if let aChatItem = aChatItem {
            await chatItemSimpleUpdate(user, aChatItem)
        }
-    case let .rcvFileError(user, aChatItem, _, _):
+    case let .rcvFileError(user, aChatItem, _):
        if let aChatItem = aChatItem {
            await chatItemSimpleUpdate(user, aChatItem)
            Task { cleanupFile(aChatItem) }
        }
-    case let .rcvFileWarning(user, aChatItem, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
    case let .sndFileStart(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
    case let .sndFileComplete(user, aChatItem, _):
@@ -1980,15 +1791,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case let .sndFileCompleteXFTP(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
-    case let .sndFileError(user, aChatItem, _, _):
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileError(user, aChatItem, _):
        if let aChatItem = aChatItem {
            await chatItemSimpleUpdate(user, aChatItem)
            Task { cleanupFile(aChatItem) }
        }
-    case let .sndFileWarning(user, aChatItem, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
    case let .callInvitation(invitation):
        await MainActor.run {
            m.callInvitations[invitation.contact.id] = invitation
@@ -2034,35 +1842,21 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case .chatSuspended:
        chatSuspended()
-    case let .contactSwitch(user, contact, switchProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnectionStats(contact, switchProgress.connectionStats)
-            }
+    case let .contactSwitch(_, contact, switchProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
        }
-    case let .groupMemberSwitch(user, groupInfo, member, switchProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
-            }
+    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
        }
-    case let .contactRatchetSync(user, contact, ratchetSyncProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
-            }
+    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
        }
-    case let .groupMemberRatchetSync(user, groupInfo, member, ratchetSyncProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
-            }
-        }
-    case let .contactDisabled(user, contact):
-        if active(user) {
-            await MainActor.run {
-                m.updateContact(contact)
-            }
+    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
        }
    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
        await MainActor.run {
@@ -2086,30 +1880,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
        }
-    case let .remoteCtrlStopped(_, rcStopReason):
+    case .remoteCtrlStopped:
        // This delay is needed to cancel the session that fails on network failure,
        // e.g. when user did not grant permission to access local network yet.
        if let sess = m.remoteCtrlSession {
            await MainActor.run {
                m.remoteCtrlSession = nil
-                dismissAllSheets() {
-                    switch rcStopReason {
-                    case .disconnected:
-                        ()
-                    case .connectionFailed(.errorAgent(.RCP(.identity))):
-                        AlertManager.shared.showAlertMsg(
-                            title: "Connection with desktop stopped",
-                            message: "This link was used with another mobile device, please create a new link on the desktop."
-                        )
-                    default:
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("Connection with desktop stopped"),
-                            message: Text("Please check that mobile and desktop are connected to the same local network, and that desktop firewall allows the connection.\nPlease share any other issues with the developers."),
-                            primaryButton: .default(Text("Ok")),
-                            secondaryButton: .default(Text("Copy error")) { UIPasteboard.general.string = String(describing: rcStopReason) }
-                        ))
-                    }
-                }
            }
            if case .connected = sess.sessionState {
                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
@@ -2138,13 +1914,12 @@ func processReceivedMsg(_ res: ChatResponse) async {

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

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

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

 func activateCall(_ callInvitation: RcvCallInvitation) {
+    if !callInvitation.user.showNotifications { return }
    let m = ChatModel.shared
-    logger.debug("reportNewIncomingCall activeCallUUID \(String(describing: m.activeCall?.callUUID)) invitationUUID \(String(describing: callInvitation.callUUID))")
-    if !callInvitation.user.showNotifications || m.activeCall?.callUUID == callInvitation.callUUID { return }
    CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
        if let error = error {
            DispatchQueue.main.async {
-                m.callInvitations[callInvitation.contact.id]?.callUUID = nil
+                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
            }
            logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
        } else {
@@ -36,18 +36,6 @@ private func _suspendChat(timeout: Int) {
    }
 }

-let seSubscriber = seMessageSubscriber {
-    switch $0 {
-    case let .state(state):
-        switch state {
-        case .inactive:
-            if AppChatState.shared.value.inactive { activateChat() }
-        case .sendingMessage:
-            if AppChatState.shared.value.canSuspend { suspendChat() }
-        }
-    }
-}
-
 func suspendChat() {
    suspendLockQueue.sync {
        _suspendChat(timeout: appSuspendTimeout)
@@ -22,7 +22,11 @@ struct SimpleXApp: App {

    init() {
        DispatchQueue.global(qos: .background).sync {
-            haskell_init()
+            // we have to use debug profile file name without extension here because .hp extension is added by profiler
+            haskell_init(
+                getAppEventLogPath().path,
+                getAppDebugProfilePrefixPath().path
+            )
 //            hs_init(0, nil)
        }
        UserDefaults.standard.register(defaults: appDefaults)
@@ -39,7 +43,6 @@ struct SimpleXApp: App {
            // so that it's computed by the time view renders, and not on event after rendering
            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
                .environmentObject(chatModel)
-                .environmentObject(AppTheme.shared)
                .onOpenURL { url in
                    logger.debug("ContentView.onOpenURL: \(url)")
                    chatModel.appOpenUrl = url
@@ -58,7 +61,6 @@ struct SimpleXApp: App {
                }
                .onChange(of: scenePhase) { phase in
                    logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-                    AppSheetState.shared.scenePhaseActive = phase == .active
                    switch (phase) {
                    case .background:
                        // --- authentication
@@ -83,11 +85,9 @@ struct SimpleXApp: App {
                        if appState != .stopped {
                            startChatAndActivate {
                                if appState.inactive && chatModel.chatRunning == true {
-                                    Task {
-                                        await updateChats()
-                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                            await updateCallInvitations()
-                                        }
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
                                    }
                                }
                            }
@@ -132,16 +132,16 @@ struct SimpleXApp: App {
        }
    }

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

-    private func updateCallInvitations() async {
+    private func updateCallInvitations() {
        do {
-            try await refreshCallInvitations()
+            try refreshCallInvitations()
        } catch let error {
            logger.error("apiGetCallInvitations: cannot update call invitations \(responseError(error))")
        }
@@ -1,199 +0,0 @@
-//
-//  Theme.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 14.06.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-
-var CurrentColors: ThemeManager.ActiveTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-
-var MenuTextColor: Color { if isInDarkTheme() { AppTheme.shared.colors.onBackground.opacity(0.8) } else { Color.black } }
-var NoteFolderIconColor: Color { AppTheme.shared.appColors.primaryVariant2 }
-
-func isInDarkTheme() -> Bool { !CurrentColors.colors.isLight }
-
-class AppTheme: ObservableObject, Equatable {
-    static let shared = AppTheme(name: CurrentColors.name, base: CurrentColors.base, colors: CurrentColors.colors, appColors: CurrentColors.appColors, wallpaper: CurrentColors.wallpaper)
-
-    var name: String
-    var base: DefaultTheme
-    @ObservedObject var colors: Colors
-    @ObservedObject var appColors: AppColors
-    @ObservedObject var wallpaper: AppWallpaper
-
-    init(name: String, base: DefaultTheme, colors: Colors, appColors: AppColors, wallpaper: AppWallpaper) {
-        self.name = name
-        self.base = base
-        self.colors = colors
-        self.appColors = appColors
-        self.wallpaper = wallpaper
-    }
-
-    static func == (lhs: AppTheme, rhs: AppTheme) -> Bool {
-        lhs.name == rhs.name &&
-        lhs.colors == rhs.colors &&
-        lhs.appColors == rhs.appColors &&
-        lhs.wallpaper == rhs.wallpaper
-    }
-
-    func updateFromCurrentColors() {
-        objectWillChange.send()
-        name = CurrentColors.name
-        base = CurrentColors.base
-        colors.updateColorsFrom(CurrentColors.colors)
-        appColors.updateColorsFrom(CurrentColors.appColors)
-        wallpaper.updateWallpaperFrom(CurrentColors.wallpaper)
-    }
-}
-
-struct ThemedBackground: ViewModifier {
-    @EnvironmentObject var theme: AppTheme
-    var grouped: Bool = false
-
-    func body(content: Content) -> some View {
-        content
-            .background(
-                theme.base == DefaultTheme.SIMPLEX
-                ? LinearGradient(
-                    colors: [
-                        grouped
-                        ? theme.colors.background.lighter(0.4).asGroupedBackground(theme.base.mode)
-                        : theme.colors.background.lighter(0.4),
-                        grouped
-                        ? theme.colors.background.darker(0.4).asGroupedBackground(theme.base.mode)
-                        : theme.colors.background.darker(0.4)
-                    ],
-                    startPoint: .topLeading,
-                    endPoint: .bottomTrailing
-                )
-                : LinearGradient(
-                    colors: [],
-                    startPoint: .topLeading,
-                    endPoint: .bottomTrailing
-                )
-            )
-            .background(
-                theme.base == DefaultTheme.SIMPLEX
-                ? Color.clear
-                : grouped
-                ? theme.colors.background.asGroupedBackground(theme.base.mode)
-                : theme.colors.background
-            )
-    }
-}
-
-var systemInDarkThemeCurrently: Bool {
-    return UITraitCollection.current.userInterfaceStyle == .dark
-}
-
-func reactOnDarkThemeChanges(_ inDarkNow: Bool) {
-    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == inDarkNow {
-        // Change active colors from light to dark and back based on system theme
-        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
-    }
-}
-
-extension ThemeWallpaper {
-    public func importFromString() -> ThemeWallpaper {
-        if preset == nil, let image {
-            // Need to save image from string and to save its path
-            if let parsed = UIImage(base64Encoded: image),
-               let filename = saveWallpaperFile(image: parsed) {
-                var copy = self
-                copy.image = nil
-                copy.imageFile = filename
-                return copy
-            } else {
-                return ThemeWallpaper()
-            }
-        } else {
-            return self
-        }
-    }
-
-    func withFilledWallpaperBase64() -> ThemeWallpaper {
-        let aw = toAppWallpaper()
-        let type = aw.type
-        let preset: String? = if case let WallpaperType.preset(filename, _) = type { filename } else { nil }
-        let scale: Float? = if case let WallpaperType.preset(_, scale) = type { scale } else { if case let WallpaperType.image(_, scale, _) = type { scale } else { 1.0 } }
-        let scaleType: WallpaperScaleType? = if case let WallpaperType.image(_, _, scaleType) = type { scaleType } else { nil }
-        let image: String? = if case WallpaperType.image = type, let image = type.uiImage { resizeImageToStrSize(image, maxDataSize: 5_000_000) } else { nil }
-        return ThemeWallpaper (
-            preset: preset,
-            scale: scale,
-            scaleType: scaleType,
-            background: aw.background?.toReadableHex(),
-            tint: aw.tint?.toReadableHex(),
-            image: image,
-            imageFile: nil
-        )
-    }
-}
-
-extension ThemeModeOverride {
-    func removeSameColors(_ base: DefaultTheme, colorsToCompare tc: ThemeColors) -> ThemeModeOverride {
-        let wallpaperType = WallpaperType.from(wallpaper) ?? WallpaperType.empty
-        let w: ThemeWallpaper
-        switch wallpaperType {
-        case let WallpaperType.preset(filename, scale):
-            let p = PresetWallpaper.from(filename)
-            w = ThemeWallpaper(
-                preset: filename,
-                scale: scale ?? wallpaper?.scale,
-                scaleType: nil,
-                background: p?.background[base]?.toReadableHex(),
-                tint: p?.tint[base]?.toReadableHex(),
-                image: nil,
-                imageFile: nil
-            )
-        case WallpaperType.image:
-            w = ThemeWallpaper(
-                preset: nil,
-                scale: nil,
-                scaleType: WallpaperScaleType.fill,
-                background: Color.clear.toReadableHex(),
-                tint: Color.clear.toReadableHex(),
-                image: nil,
-                imageFile: nil
-            )
-        default:
-            w = ThemeWallpaper()
-        }
-        let wallpaper: ThemeWallpaper? = if let wallpaper {
-            ThemeWallpaper(
-                preset: wallpaper.preset,
-                scale: wallpaper.scale != w.scale ? wallpaper.scale : nil,
-                scaleType: wallpaper.scaleType != w.scaleType ? wallpaper.scaleType : nil,
-                background: wallpaper.background != w.background ? wallpaper.background : nil,
-                tint: wallpaper.tint != w.tint ? wallpaper.tint : nil,
-                image: wallpaper.image,
-                imageFile: wallpaper.imageFile
-            )
-        } else {
-            nil
-        }
-        return ThemeModeOverride(
-            mode: self.mode,
-            colors: ThemeColors(
-                primary: colors.primary != tc.primary ? colors.primary : nil,
-                primaryVariant: colors.primaryVariant != tc.primaryVariant ? colors.primaryVariant : nil,
-                secondary: colors.secondary != tc.secondary ? colors.secondary : nil,
-                secondaryVariant: colors.secondaryVariant != tc.secondaryVariant ? colors.secondaryVariant : nil,
-                background: colors.background != tc.background ? colors.background : nil,
-                surface: colors.surface != tc.surface ? colors.surface : nil,
-                title: colors.title != tc.title ? colors.title : nil,
-                primaryVariant2: colors.primaryVariant2 != tc.primaryVariant2 ? colors.primary : nil,
-                sentMessage: colors.sentMessage != tc.sentMessage ? colors.sentMessage : nil,
-                sentQuote: colors.sentQuote != tc.sentQuote ? colors.sentQuote : nil,
-                receivedMessage: colors.receivedMessage != tc.receivedMessage ? colors.receivedMessage : nil,
-                receivedQuote: colors.receivedQuote != tc.receivedQuote ? colors.receivedQuote : nil
-            ),
-            wallpaper: wallpaper
-        )
-    }
-}
@@ -1,303 +0,0 @@
-//
-//  ThemeManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 03.06.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-
-class ThemeManager {
-    struct ActiveTheme: Equatable {
-        let name: String
-        let base: DefaultTheme
-        let colors: Colors
-        let appColors: AppColors
-        var wallpaper: AppWallpaper = AppWallpaper(background: nil, tint: nil, type: .empty)
-
-        func toAppTheme() -> AppTheme {
-            AppTheme(name: name, base: base, colors: colors, appColors: appColors, wallpaper: wallpaper)
-        }
-    }
-
-    private static func systemDarkThemeColors() -> (Colors, DefaultTheme) {
-        switch systemDarkThemeDefault.get() {
-        case DefaultTheme.DARK.themeName: (DarkColorPalette, DefaultTheme.DARK)
-        case DefaultTheme.SIMPLEX.themeName: (SimplexColorPalette, DefaultTheme.SIMPLEX)
-        case DefaultTheme.BLACK.themeName: (BlackColorPalette, DefaultTheme.BLACK)
-        default: (SimplexColorPalette, DefaultTheme.SIMPLEX)
-        }
-    }
-
-    private static func nonSystemThemeName() -> String {
-        let themeName = currentThemeDefault.get()
-        return if themeName != DefaultTheme.SYSTEM_THEME_NAME {
-            themeName
-        } else {
-            systemInDarkThemeCurrently ? systemDarkThemeDefault.get() : DefaultTheme.LIGHT.themeName
-        }
-    }
-
-    static func defaultActiveTheme(_ appSettingsTheme: [ThemeOverrides]) -> ThemeOverrides? {
-        let nonSystemThemeName = nonSystemThemeName()
-        let defaultThemeId = currentThemeIdsDefault.get()[nonSystemThemeName]
-        return appSettingsTheme.getTheme(defaultThemeId)
-    }
-
-    static func defaultActiveTheme(_ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ThemeModeOverride {
-        let perUserTheme = !CurrentColors.colors.isLight ? perUserTheme?.dark : perUserTheme?.light
-        if let perUserTheme {
-            return perUserTheme
-        }
-        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper ?? ThemeWallpaper.from(PresetWallpaper.school.toType(CurrentColors.base), nil, nil))
-    }
-
-    static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {
-        let themeName = currentThemeDefault.get()
-        let nonSystemThemeName = nonSystemThemeName()
-        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-
-        let baseTheme = switch nonSystemThemeName {
-        case DefaultTheme.LIGHT.themeName: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
-        case DefaultTheme.DARK.themeName: ActiveTheme(name: DefaultTheme.DARK.themeName, base: DefaultTheme.DARK, colors: DarkColorPalette.clone(), appColors: DarkColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.DARK)))
-        case DefaultTheme.SIMPLEX.themeName: ActiveTheme(name: DefaultTheme.SIMPLEX.themeName, base: DefaultTheme.SIMPLEX, colors: SimplexColorPalette.clone(), appColors: SimplexColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.SIMPLEX)))
-        case DefaultTheme.BLACK.themeName: ActiveTheme(name: DefaultTheme.BLACK.themeName, base: DefaultTheme.BLACK, colors: BlackColorPalette.clone(), appColors: BlackColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.BLACK)))
-        default: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
-        }
-
-        let perUserTheme = baseTheme.colors.isLight ? perUserTheme?.light : perUserTheme?.dark
-        let theme = appSettingsTheme.sameTheme(themeOverridesForType ?? perChatTheme?.type ?? perUserTheme?.type ?? defaultTheme?.wallpaper?.toAppWallpaper().type, nonSystemThemeName) ?? defaultTheme
-
-        if theme == nil && perUserTheme == nil && perChatTheme == nil && themeOverridesForType == nil {
-            return ActiveTheme(name: themeName, base: baseTheme.base, colors: baseTheme.colors, appColors: baseTheme.appColors, wallpaper: baseTheme.wallpaper)
-        }
-        let presetWallpaperTheme: ThemeColors? = if let themeOverridesForType, case let WallpaperType.preset(filename, _) = themeOverridesForType {
-            PresetWallpaper.from(filename)?.colors[baseTheme.base]
-        } else if let wallpaper = perChatTheme?.wallpaper {
-            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        } else if let wallpaper = perUserTheme?.wallpaper {
-            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        } else {
-            if let preset = theme?.wallpaper?.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        }
-
-        let themeOrEmpty = theme ?? ThemeOverrides(base: baseTheme.base)
-        let colors = themeOrEmpty.toColors(themeOrEmpty.base, perChatTheme?.colors, perUserTheme?.colors, presetWallpaperTheme)
-        return ActiveTheme(
-            name: themeName,
-            base: baseTheme.base,
-            colors: colors,
-            appColors: themeOrEmpty.toAppColors(themeOrEmpty.base, perChatTheme?.colors, perChatTheme?.type, perUserTheme?.colors, perUserTheme?.type, presetWallpaperTheme),
-            wallpaper: themeOrEmpty.toAppWallpaper(themeOverridesForType, perChatTheme, perUserTheme, colors.background)
-        )
-    }
-
-    static func currentThemeOverridesForExport(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?) -> ThemeOverrides {
-        let current = currentColors(themeOverridesForType, perChatTheme, perUserTheme, themeOverridesDefault.get())
-        let wType = current.wallpaper.type
-        let wBackground = current.wallpaper.background
-        let wTint = current.wallpaper.tint
-        let w: ThemeWallpaper? = if case WallpaperType.empty = wType {
-            nil
-        } else {
-            ThemeWallpaper.from(wType, wBackground?.toReadableHex(), wTint?.toReadableHex()).withFilledWallpaperBase64()
-        }
-        return ThemeOverrides(
-            themeId: "",
-            base: current.base,
-            colors: ThemeColors.from(current.colors, current.appColors),
-            wallpaper: w
-        )
-    }
-
-    static func applyTheme(_ theme: String) {
-        currentThemeDefault.set(theme)
-        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-        AppTheme.shared.updateFromCurrentColors()
-        let tint = UIColor(CurrentColors.colors.primary)
-        if SceneDelegate.windowStatic?.tintColor != tint {
-            SceneDelegate.windowStatic?.tintColor = tint
-        }
-//        applyNavigationBarColors(CurrentColors.toAppTheme())
-    }
-
-    static func adjustWindowStyle() {
-        let style = switch currentThemeDefault.get() {
-        case DefaultTheme.LIGHT.themeName: UIUserInterfaceStyle.light
-        case DefaultTheme.SYSTEM_THEME_NAME: UIUserInterfaceStyle.unspecified
-        default: UIUserInterfaceStyle.dark
-        }
-        if SceneDelegate.windowStatic?.overrideUserInterfaceStyle != style {
-            SceneDelegate.windowStatic?.overrideUserInterfaceStyle = style
-        }
-    }
-
-//    static func applyNavigationBarColors(_ theme: AppTheme) {
-//        let baseColors = switch theme.base {
-//        case DefaultTheme.LIGHT: LightColorPaletteApp
-//        case DefaultTheme.DARK: DarkColorPaletteApp
-//        case DefaultTheme.SIMPLEX: SimplexColorPaletteApp
-//        case DefaultTheme.BLACK: BlackColorPaletteApp
-//        }
-//        let isDefaultColor = baseColors.title == theme.appColors.title
-//
-//        let title = UIColor(theme.appColors.title)
-//        if !isDefaultColor && UINavigationBar.appearance().titleTextAttributes?.first as? UIColor != title {
-//            UINavigationBar.appearance().titleTextAttributes = [.foregroundColor: title]
-//            UINavigationBar.appearance().largeTitleTextAttributes = [.foregroundColor: title]
-//        } else {
-//            UINavigationBar.appearance().titleTextAttributes = nil
-//            UINavigationBar.appearance().largeTitleTextAttributes = nil
-//        }
-//    }
-
-    static func changeDarkTheme(_ theme: String) {
-        systemDarkThemeDefault.set(theme)
-        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-        AppTheme.shared.updateFromCurrentColors()
-    }
-
-    static func saveAndApplyThemeColor(_ baseTheme: DefaultTheme, _ name: ThemeColor, _ color: Color? = nil, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let nonSystemThemeName = baseTheme.themeName
-        let pref = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        let themeId = currentThemeIdsDefault.get()[nonSystemThemeName]
-        let prevValue = overrides.getTheme(themeId) ?? ThemeOverrides(base: baseTheme)
-        pref.set(overrides.replace(prevValue.withUpdatedColor(name, color?.toReadableHex())))
-        var themeIds = currentThemeIdsDefault.get()
-        themeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(themeIds)
-        applyTheme(currentThemeDefault.get())
-    }
-
-    static func applyThemeColor(name: ThemeColor, color: Color? = nil, pref: Binding<ThemeModeOverride>) {
-        pref.wrappedValue = pref.wrappedValue.withUpdatedColor(name, color?.toReadableHex())
-    }
-
-    static func saveAndApplyWallpaper(_ baseTheme: DefaultTheme, _ type: WallpaperType?, _ pref: CodableDefault<[ThemeOverrides]>?) {
-        let nonSystemThemeName = baseTheme.themeName
-        let pref = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        let theme = overrides.sameTheme(type, baseTheme.themeName)
-        var prevValue = theme ?? ThemeOverrides(base: baseTheme)
-        prevValue.wallpaper = if let type {
-            if case WallpaperType.empty = type {
-                nil as ThemeWallpaper?
-            } else {
-                ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
-            }
-        } else {
-            nil
-        }
-        pref.set(overrides.replace(prevValue))
-        var themeIds = currentThemeIdsDefault.get()
-        themeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(themeIds)
-        applyTheme(nonSystemThemeName)
-    }
-
-    static func copyFromSameThemeOverrides(_ type: WallpaperType?, _ lowerLevelOverride: ThemeModeOverride?, _ pref: Binding<ThemeModeOverride>) -> Bool {
-        let overrides = themeOverridesDefault.get()
-        let sameWallpaper: ThemeWallpaper? = if let wallpaper = lowerLevelOverride?.wallpaper, lowerLevelOverride?.type?.sameType(type) == true {
-            wallpaper
-        } else {
-            overrides.sameTheme(type, CurrentColors.base.themeName)?.wallpaper
-        }
-        guard let sameWallpaper else {
-            if let type {
-                var w: ThemeWallpaper = ThemeWallpaper.from(type, nil, nil)
-                w.scale = nil
-                w.scaleType = nil
-                w.background = nil
-                w.tint = nil
-                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: w)
-            } else {
-                // Make an empty wallpaper to override any top level ones
-                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: ThemeWallpaper())
-            }
-            return true
-        }
-        var type = sameWallpaper.toAppWallpaper().type
-        if case let WallpaperType.image(filename, scale, scaleType) = type, sameWallpaper.imageFile == filename {
-            // same image file. Needs to be copied first in order to be able to remove the file once it's not needed anymore without affecting main theme override
-            if let filename = saveWallpaperFile(url: getWallpaperFilePath(filename)) {
-                type = WallpaperType.image(filename, scale, scaleType)
-            } else {
-                logger.error("Error while copying wallpaper from global overrides to chat overrides")
-                return false
-            }
-        }
-        var prevValue = pref.wrappedValue
-        var w = ThemeWallpaper.from(type, nil, nil)
-        w.scale = nil
-        w.scaleType = nil
-        w.background = nil
-        w.tint = nil
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper = w
-        pref.wrappedValue = prevValue
-        return true
-    }
-
-    static func applyWallpaper(_ type: WallpaperType?, _ pref: Binding<ThemeModeOverride>) {
-        var prevValue = pref.wrappedValue
-        prevValue.wallpaper = if let type {
-            ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
-        } else {
-            nil
-        }
-        pref.wrappedValue = prevValue
-    }
-
-    static func saveAndApplyThemeOverrides(_ theme: ThemeOverrides, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let wallpaper = theme.wallpaper?.importFromString()
-        let nonSystemThemeName = theme.base.themeName
-        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        var prevValue = overrides.getTheme(nil, wallpaper?.toAppWallpaper().type, theme.base) ?? ThemeOverrides(base: theme.base)
-        if let imageFile = prevValue.wallpaper?.imageFile {
-            try? FileManager.default.removeItem(at: getWallpaperFilePath(imageFile))
-        }
-        prevValue.base = theme.base
-        prevValue.colors = theme.colors
-        prevValue.wallpaper = wallpaper
-        pref.set(overrides.replace(prevValue))
-        currentThemeDefault.set(nonSystemThemeName)
-        var currentThemeIds = currentThemeIdsDefault.get()
-        currentThemeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(currentThemeIds)
-        applyTheme(nonSystemThemeName)
-    }
-
-    static func resetAllThemeColors(_ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let nonSystemThemeName = nonSystemThemeName()
-        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        guard let themeId = currentThemeIdsDefault.get()[nonSystemThemeName],
-              var prevValue = overrides.getTheme(themeId)
-        else { return }
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper?.background = nil
-        prevValue.wallpaper?.tint = nil
-        pref.set(overrides.replace(prevValue))
-        applyTheme(currentThemeDefault.get())
-    }
-
-    static func resetAllThemeColors(_ pref: Binding<ThemeModeOverride>) {
-        var prevValue = pref.wrappedValue
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper?.background = nil
-        prevValue.wallpaper?.tint = nil
-        pref.wrappedValue = prevValue
-    }
-
-    static func removeTheme(_ themeId: String?) {
-        var themes = themeOverridesDefault.get().map { $0 }
-        themes.removeAll(where: { $0.themeId == themeId })
-        themeOverridesDefault.set(themes)
-    }
-}
@@ -9,7 +9,6 @@
 import SwiftUI
 import WebKit
 import SimpleXChat
-import AVFoundation

 struct ActiveCallView: View {
    @EnvironmentObject var m: ChatModel
@@ -22,7 +21,6 @@ struct ActiveCallView: View {
    @Binding var canConnectCall: Bool
    @State var prevColorScheme: ColorScheme = .dark
    @State var pipShown = false
-    @State var wasConnected = false

    var body: some View {
        ZStack(alignment: .topLeading) {
@@ -71,11 +69,6 @@ struct ActiveCallView: View {
            Task { await m.callCommand.setClient(nil) }
            AppDelegate.keepScreenOn(false)
            client?.endCall()
-            CallSoundsPlayer.shared.stop()
-            try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)
-            if (wasConnected) {
-                CallSoundsPlayer.shared.vibrate(long: true)
-            }
        }
        .background(m.activeCallViewIsCollapsed ? .clear : .black)
        // Quite a big delay when opening/closing the view when a scheme changes (globally) this way. It's not needed when CallKit is used since status bar is green with white text on it
@@ -110,11 +103,6 @@ struct ActiveCallView: View {
                        call.callState = .invitationSent
                        call.localCapabilities = capabilities
                    }
-                    if call.supportsVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
-                        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    }
-                    CallSoundsPlayer.shared.startConnectingCallSound()
-                    activeCallWaitDeliveryReceipt()
                }
            case let .offer(offer, iceCandidates, capabilities):
                Task {
@@ -138,7 +126,6 @@ struct ActiveCallView: View {
                    }
                    await MainActor.run {
                        call.callState = .negotiated
-                        CallSoundsPlayer.shared.stop()
                    }
                }
            case let .ice(iceCandidates):
@@ -157,10 +144,6 @@ struct ActiveCallView: View {
                    : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                    call.callState = .connected
                    call.connectedAt = .now
-                    if !wasConnected {
-                        CallSoundsPlayer.shared.vibrate(long: false)
-                        wasConnected = true
-                    }
                }
                if state.connectionState == "closed" {
                    closeCallView(client)
@@ -178,14 +161,10 @@ struct ActiveCallView: View {
                call.callState = .connected
                call.connectionInfo = connectionInfo
                call.connectedAt = .now
-                if !wasConnected {
-                    CallSoundsPlayer.shared.vibrate(long: false)
-                    wasConnected = true
-                }
            case .ended:
                closeCallView(client)
                call.callState = .ended
-                if let uuid = call.callUUID {
+                if let uuid = call.callkitUUID {
                    CallController.shared.endCall(callUUID: uuid)
                }
            case .ok:
@@ -208,22 +187,6 @@ struct ActiveCallView: View {
        }
    }

-    private func activeCallWaitDeliveryReceipt() {
-        ChatReceiver.shared.messagesChannel = { msg in
-            guard let call = ChatModel.shared.activeCall, call.callState == .invitationSent else {
-                ChatReceiver.shared.messagesChannel = nil
-                return
-            }
-            if case let .chatItemStatusUpdated(_, msg) = msg,
-               msg.chatInfo.id == call.contact.id,
-               case .sndCall = msg.chatItem.content,
-               case .sndRcvd = msg.chatItem.meta.itemStatus {
-                CallSoundsPlayer.shared.startInCallSound()
-                ChatReceiver.shared.messagesChannel = nil
-            }
-        }
-    }
-
    private func closeCallView(_ client: WebRTCClient) {
        if m.activeCall != nil {
            m.showCallView = false
@@ -235,7 +198,6 @@ struct ActiveCallOverlay: View {
    @EnvironmentObject var chatModel: ChatModel
    @ObservedObject var call: Call
    var client: WebRTCClient
-    @ObservedObject private var deviceManager = CallAudioDeviceManager.shared

    var body: some View {
        VStack {
@@ -251,16 +213,7 @@ struct ActiveCallOverlay: View {
                HStack {
                    toggleAudioButton()
                    Spacer()
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(width: 40, height: 40)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 40, maxHeight: 40)
-                    } else {
-                        Color.clear.frame(width: 40, height: 40)
-                    }
+                    Color.clear.frame(width: 40, height: 40)
                    Spacer()
                    endCallButton()
                    Spacer()
@@ -286,7 +239,9 @@ struct ActiveCallOverlay: View {
                            .foregroundColor(.white.opacity(0.8))
                    }
                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image, size: 192)
+                        ProfileImage(imageStr: call.contact.profile.image)
+                            .scaledToFit()
+                            .frame(width: 192, height: 192)
                        audioCallInfoView(call)
                    }
                    .foregroundColor(.white)
@@ -301,33 +256,14 @@ struct ActiveCallOverlay: View {
                    toggleAudioButton()
                        .frame(maxWidth: .infinity, alignment: .leading)
                    endCallButton()
-                    // Check if the only input is microphone. And in this case show toggle button, 
-                    // If there are more inputs, it probably means something like bluetooth headphones are available
-                    // and in this case show iOS button for choosing different output.
-                    // There is no way to get available outputs, only inputs
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 50, maxHeight: 40)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else {
-                        Color.clear.frame(width: 50, height: 40)
-                    }
+                    toggleSpeakerButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                }
                .padding(.bottom, 60)
                .padding(.horizontal, 48)
            }
        }
        .frame(maxWidth: .infinity)
-        .onAppear {
-            deviceManager.start()
-        }
-        .onDisappear {
-            deviceManager.stop()
-        }
    }

    private func audioCallInfoView(_ call: Call) -> some View {
@@ -382,7 +318,7 @@ struct ActiveCallOverlay: View {
    private func endCallButton() -> some View {
        let cc = CallController.shared
        return callButton("phone.down.fill", width: 60, height: 60) {
-            if let uuid = call.callUUID {
+            if let uuid = call.callkitUUID {
                cc.endCall(callUUID: uuid)
            } else {
                cc.endCall(call: call) {}
@@ -405,17 +341,12 @@ struct ActiveCallOverlay: View {
    private func toggleSpeakerButton() -> some View {
        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
            Task {
-                let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
+                client.setSpeakerEnabledAndConfigureSession(!call.speakerEnabled)
                DispatchQueue.main.async {
-                    call.speakerEnabled = !speakerEnabled
+                    call.speakerEnabled = !call.speakerEnabled
                }
            }
        }
-        .onAppear {
-            deviceManager.call = call
-            //call.speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-        }
    }

    private func toggleVideoButton() -> some View {
@@ -462,9 +393,9 @@ struct ActiveCallOverlay: View {
 struct ActiveCallOverlay_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                .background(.black)
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                .background(.black)
        }
    }
@@ -1,25 +0,0 @@
-//
-//  MPVolumeView.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 24.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import UIKit
-import AVKit
-
-struct AudioDevicePicker: UIViewRepresentable {
-    func makeUIView(context: Context) -> some UIView {
-        let v = AVRoutePickerView(frame: .zero)
-        v.activeTintColor = .white
-        v.tintColor = .white
-        return v
-    }
-
-    func updateUIView(_ uiView: UIViewType, context: Context) {
-
-    }
-}
@@ -1,67 +0,0 @@
-//
-//  CallAudioDeviceManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-import AVKit
-import WebRTC
-
-class CallAudioDeviceManager: ObservableObject {
-    static let shared = CallAudioDeviceManager()
-    let audioSession: AVAudioSession
-    let nc = NotificationCenter.default
-
-    var call: Call?
-    var timer: Timer? = nil
-
-    // Actually, only one output
-    @Published var outputs: [AVAudioSessionPortDescription]
-    @Published var currentDevice: AVAudioSessionPortDescription? = nil
-    // All devices that can record audio (the ones that can play audio are not included)
-    @Published var availableInputs: [AVAudioSessionPortDescription] = []
-
-
-    init(_ audioSession: AVAudioSession? = nil) {
-        self.audioSession = audioSession ?? RTCAudioSession.sharedInstance().session
-        self.outputs = self.audioSession.currentRoute.outputs
-        self.availableInputs = self.audioSession.availableInputs ?? []
-    }
-
-    func reloadDevices() {
-        outputs = audioSession.currentRoute.outputs
-        currentDevice = audioSession.currentRoute.outputs.first
-        availableInputs = audioSession.availableInputs ?? []
-        call?.speakerEnabled = currentDevice?.portType == .builtInSpeaker
-
-
-        // Workaround situation:
-        // have bluetooth device connected, choosing speaker, disconnecting bluetooth device. In this case iOS will not post notification, so do it manually
-        timer?.invalidate()
-        if availableInputs.contains(where: { $0.portType != .builtInReceiver && $0.portType != .builtInSpeaker }) {
-            timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { t in
-                self.reloadDevices()
-            }
-        }
-    }
-
-    @objc func audioCallback(notification: Notification) {
-        reloadDevices()
-
-        logger.debug("Changes in devices, current audio devices: \(String(describing: self.availableInputs.map({ $0.portType.rawValue }))), output: \(String(describing: self.currentDevice?.portType.rawValue))")
-    }
-
-    func start() {
-        nc.addObserver(self, selector: #selector(audioCallback), name: AVAudioSession.routeChangeNotification, object: nil)
-    }
-
-    func stop() {
-        nc.removeObserver(self, name: AVAudioSession.routeChangeNotification, object: nil)
-        timer?.invalidate()
-    }
-}
@@ -51,7 +51,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
        logger.debug("CallController.provider CXStartCallAction")
-        if callManager.startOutgoingCall(callUUID: action.callUUID.uuidString.lowercased()) {
+        if callManager.startOutgoingCall(callUUID: action.callUUID) {
            action.fulfill()
            provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
        } else {
@@ -61,30 +61,12 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
        logger.debug("CallController.provider CXAnswerCallAction")
-        Task {
-            let chatIsReady = await waitUntilChatStarted(timeoutMs: 30_000, stepMs: 500)
-            logger.debug("CallController chat started \(chatIsReady) \(ChatModel.shared.chatInitialized) \(ChatModel.shared.chatRunning == true) \(String(describing: AppChatState.shared.value))")
-            if !chatIsReady {
-                action.fail()
-                return
-            }
-            if !ChatModel.shared.callInvitations.values.contains(where: { inv in inv.callUUID == action.callUUID.uuidString.lowercased() }) {
-                try? await justRefreshCallInvitations()
-                logger.debug("CallController: updated call invitations chat")
-            }
-            await MainActor.run {
-                logger.debug("CallController.provider will answer on call")
-
-                if callManager.answerIncomingCall(callUUID: action.callUUID.uuidString.lowercased()) {
-                    logger.debug("CallController.provider answered on call")
-                    // WebRTC call should be in connected state to fulfill.
-                    // Otherwise no audio and mic working on lockscreen
-                    fulfillOnConnect = action
-                } else {
-                    logger.debug("CallController.provider will fail the call")
-                    action.fail()
-                }
-            }
+        if callManager.answerIncomingCall(callUUID: action.callUUID) {
+            // WebRTC call should be in connected state to fulfill.
+            // Otherwise no audio and mic working on lockscreen
+            fulfillOnConnect = action
+        } else {
+            action.fail()
        }
    }

@@ -93,7 +75,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        // Should be nil here if connection was in connected state
        fulfillOnConnect?.fail()
        fulfillOnConnect = nil
-        callManager.endCall(callUUID: action.callUUID.uuidString.lowercased()) { ok in
+        callManager.endCall(callUUID: action.callUUID) { ok in
            if ok {
                action.fulfill()
            } else {
@@ -104,7 +86,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    }

    func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID.uuidString.lowercased()) {
+        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID) {
            action.fulfill()
        } else {
            action.fail()
@@ -121,23 +103,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
        RTCAudioSession.sharedInstance().isAudioEnabled = true
        do {
-            let supportsVideo = ChatModel.shared.activeCall?.supportsVideo == true
-            if supportsVideo {
-                try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            } else {
-                try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            }
-            // Without any delay sound is not playing from speaker or external device in incoming call
-            Task {
-                for i in 0 ... 3 {
-                    try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
-                    if let preferred = audioSession.preferredInputDevice() {
-                        await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if supportsVideo {
-                        await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
-                    }
-                }
-            }
+            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
            logger.debug("audioSession category set")
            try audioSession.setActive(true)
            logger.debug("audioSession activated")
@@ -174,19 +140,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        }
    }

-    private func waitUntilChatStarted(timeoutMs: UInt64, stepMs: UInt64) async -> Bool {
-        logger.debug("CallController waiting until chat started")
-        var t: UInt64 = 0
-        repeat {
-            if ChatModel.shared.chatInitialized, ChatModel.shared.chatRunning == true, case .active = AppChatState.shared.value {
-                return true
-            }
-            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
-            t += stepMs
-        } while t < timeoutMs
-        return false
-    }
-
    @objc(pushRegistry:didUpdatePushCredentials:forType:)
    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
@@ -202,19 +155,32 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
            self.reportExpiredCall(payload: payload, completion)
            return
        }
+        if (!ChatModel.shared.chatInitialized) {
+            logger.debug("CallController: initializing chat")
+            do {
+                try initializeChat(start: true, refreshInvitations: false)
+            } catch let error {
+                logger.error("CallController: initializing chat error: \(error)")
+                self.reportExpiredCall(payload: payload, completion)
+                return
+            }
+        }
+        logger.debug("CallController: initialized chat")
+        startChatForCall()
+        logger.debug("CallController: started chat")
+        self.shouldSuspendChat = true
+        // There are no invitations in the model, as it was processed by NSE
+        _ = try? justRefreshCallInvitations()
+        logger.debug("CallController: updated call invitations chat")
+        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
        // Extract the call information from the push notification payload
        let m = ChatModel.shared
        if let contactId = payload.dictionaryPayload["contactId"] as? String,
-           let displayName = payload.dictionaryPayload["displayName"] as? String,
-           let callUUID = payload.dictionaryPayload["callUUID"] as? String,
-           let uuid = UUID(uuidString: callUUID),
-           let callTsInterval = payload.dictionaryPayload["callTs"] as? TimeInterval,
-           let mediaStr = payload.dictionaryPayload["media"] as? String,
-           let media = CallMediaType(rawValue: mediaStr) {
-            let update = self.cxCallUpdate(contactId, displayName, media)
-            let callTs = Date(timeIntervalSince1970: callTsInterval)
-            if callTs.timeIntervalSinceNow >= -180 {
+           let invitation = m.callInvitations[contactId] {
+            let update = self.cxCallUpdate(invitation: invitation)
+            if let uuid = invitation.callkitUUID {
                logger.debug("CallController: report pushkit call via CallKit")
+                let update = self.cxCallUpdate(invitation: invitation)
                self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
                    if error != nil {
                        m.callInvitations.removeValue(forKey: contactId)
@@ -223,31 +189,11 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                    completion()
                }
            } else {
-                logger.debug("CallController will expire call 1")
                self.reportExpiredCall(update: update, completion)
            }
        } else {
-            logger.debug("CallController will expire call 2")
            self.reportExpiredCall(payload: payload, completion)
        }
-
-        //DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
-        if (!ChatModel.shared.chatInitialized) {
-            logger.debug("CallController: initializing chat")
-            do {
-                try initializeChat(start: true, refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                if let call = ChatModel.shared.activeCall {
-                    self.endCall(call: call, completed: completion)
-                }
-                return
-            }
-        }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
    }

    // This function fulfils the requirement to always report a call when PushKit notification is received,
@@ -277,8 +223,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    }

    func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callUUID))")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
            if invitation.callTs.timeIntervalSinceNow >= -180 {
                let update = cxCallUpdate(invitation: invitation)
                provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
@@ -299,14 +245,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        return update
    }

-    private func cxCallUpdate(_ contactId: String, _ displayName: String, _ media: CallMediaType) -> CXCallUpdate {
-        let update = CXCallUpdate()
-        update.remoteHandle = CXHandle(type: .generic, value: contactId)
-        update.hasVideo = media == .video
-        update.localizedCallerName = displayName
-        return update
-    }
-
    func reportIncomingCall(call: Call, connectedAt dateConnected: Date?) {
        logger.debug("CallController: reporting incoming call connected")
        if CallController.useCallKit() {
@@ -318,14 +256,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
        logger.debug("CallController: reporting outgoing call connected")
-        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
            provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
        }
    }

    func reportCallRemoteEnded(invitation: RcvCallInvitation) {
        logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
        } else if invitation.contact.id == activeCallInvitation?.contact.id {
            activeCallInvitation = nil
@@ -334,17 +272,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    func reportCallRemoteEnded(call: Call) {
        logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
        }
    }

    func startCall(_ contact: Contact, _ media: CallMediaType) {
        logger.debug("CallController.startCall")
-        let callUUID = callManager.newOutgoingCall(contact, media)
-        guard let uuid = UUID(uuidString: callUUID) else {
-            return
-        }
+        let uuid = callManager.newOutgoingCall(contact, media)
        if CallController.useCallKit() {
            let handle = CXHandle(type: .generic, value: contact.id)
            let action = CXStartCallAction(call: uuid, handle: handle)
@@ -356,8 +291,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                update.localizedCallerName = contact.displayName
                self.provider.reportCall(with: uuid, updated: update)
            }
-        } else if callManager.startOutgoingCall(callUUID: callUUID) {
-            if callManager.startOutgoingCall(callUUID: callUUID) {
+        } else if callManager.startOutgoingCall(callUUID: uuid) {
+            if callManager.startOutgoingCall(callUUID: uuid) {
                logger.debug("CallController.startCall: call started")
            } else {
                logger.error("CallController.startCall: no active call")
@@ -367,8 +302,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    func answerCall(invitation: RcvCallInvitation) {
        logger.debug("CallController: answering a call")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
-            requestTransaction(with: CXAnswerCallAction(call: uuid))
+        if CallController.useCallKit(), let callUUID = invitation.callkitUUID {
+            requestTransaction(with: CXAnswerCallAction(call: callUUID))
        } else {
            callManager.answerIncomingCall(invitation: invitation)
        }
@@ -377,13 +312,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        }
    }

-    func endCall(callUUID: String) {
-        let uuid = UUID(uuidString: callUUID)
-        logger.debug("CallController: ending the call with UUID \(callUUID)")
+    func endCall(callUUID: UUID) {
+        logger.debug("CallController: ending the call with UUID \(callUUID.uuidString)")
        if CallController.useCallKit() {
-            if let uuid {
-                requestTransaction(with: CXEndCallAction(call: uuid))
-            }
+            requestTransaction(with: CXEndCallAction(call: callUUID))
        } else {
            callManager.endCall(callUUID: callUUID) { ok in
                if ok {
@@ -10,17 +10,17 @@ import Foundation
 import SimpleXChat

 class CallManager {
-    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> String {
-        let uuid = UUID().uuidString.lowercased()
-        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, localMedia: media)
+    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
+        let uuid = UUID()
+        let call = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
        call.speakerEnabled = media == .video
        ChatModel.shared.activeCall = call
        return uuid
    }

-    func startOutgoingCall(callUUID: String) -> Bool {
+    func startOutgoingCall(callUUID: UUID) -> Bool {
        let m = ChatModel.shared
-        if let call = m.activeCall, call.callUUID == callUUID {
+        if let call = m.activeCall, call.callkitUUID == callUUID {
            m.showCallView = true
            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
            return true
@@ -28,7 +28,7 @@ class CallManager {
        return false
    }

-    func answerIncomingCall(callUUID: String) -> Bool {
+    func answerIncomingCall(callUUID: UUID) -> Bool {
        if let invitation = getCallInvitation(callUUID) {
            answerIncomingCall(invitation: invitation)
            return true
@@ -42,7 +42,7 @@ class CallManager {
        let call = Call(
            direction: .incoming,
            contact: invitation.contact,
-            callUUID: invitation.callUUID,
+            callkitUUID: invitation.callkitUUID,
            callState: .invitationAccepted,
            localMedia: invitation.callType.media,
            sharedKey: invitation.sharedKey
@@ -68,8 +68,8 @@ class CallManager {
        }
    }

-    func enableMedia(media: CallMediaType, enable: Bool, callUUID: String) -> Bool {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
            let m = ChatModel.shared
            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
            return true
@@ -77,8 +77,8 @@ class CallManager {
        return false
    }

-    func endCall(callUUID: String, completed: @escaping (Bool) -> Void) {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
            endCall(call: call) { completed(true) }
        } else if let invitation = getCallInvitation(callUUID) {
            endCall(invitation: invitation) { completed(true) }
@@ -126,8 +126,8 @@ class CallManager {
        }
    }

-    private func getCallInvitation(_ callUUID: String) -> RcvCallInvitation? {
-        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callUUID == callUUID }) {
+    private func getCallInvitation(_ callUUID: UUID) -> RcvCallInvitation? {
+        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callkitUUID == callUUID }) {
            return invitation
        }
        return nil
@@ -11,7 +11,6 @@ import SimpleXChat

 struct IncomingCallView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var cc = CallController.shared

    var body: some View {
@@ -31,7 +30,8 @@ struct IncomingCallView: View {
        VStack(alignment: .leading, spacing: 6) {
            HStack {
                if m.users.count > 1 {
-                    ProfileImage(imageStr: invitation.user.image, size: 24, color: .white)
+                    ProfileImage(imageStr: invitation.user.image, color: .white)
+                        .frame(width: 24, height: 24)
                }
                Image(systemName: invitation.callType.media == .video ? "video.fill" : "phone.fill").foregroundColor(.green)
                Text(invitation.callTypeText)
@@ -44,7 +44,7 @@ struct IncomingCallView: View {
                    cc.endCall(invitation: invitation)
                }

-                callButton("Ignore", "multiply", .primary) {
+                callButton("Ignore", "multiply", .accentColor) {
                    cc.activeCallInvitation = nil
                }

@@ -64,7 +64,7 @@ struct IncomingCallView: View {
        .padding(.horizontal, 16)
        .padding(.vertical, 12)
        .frame(maxWidth: .infinity)
-        .modifier(ThemedBackground())
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
        .onAppear { dismissAllSheets() }
    }

@@ -77,7 +77,7 @@ struct IncomingCallView: View {
                    .frame(width: 24, height: 24)
                Text(text)
                    .font(.caption)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            }
            .frame(minWidth: 44)
        })
@@ -8,7 +8,6 @@

 import Foundation
 import AVFoundation
-import UIKit

 class SoundPlayer {
    static let shared = SoundPlayer()
@@ -44,63 +43,3 @@ class SoundPlayer {
        audioPlayer = nil
    }
 }
-
-class CallSoundsPlayer {
-    static let shared = CallSoundsPlayer()
-    private var audioPlayer: AVAudioPlayer?
-    private var playerTask: Task = Task {}
-
-    private func start(_ soundName: String, delayMs: Double) {
-        audioPlayer?.stop()
-        playerTask.cancel()
-        logger.debug("start \(soundName)")
-        guard let path = Bundle.main.path(forResource: soundName, ofType: "mp3", inDirectory: "sounds") else {
-            logger.debug("start: file not found")
-            return
-        }
-        do {
-            let player = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: path))
-            if player.prepareToPlay() {
-                audioPlayer = player
-            }
-        } catch {
-            logger.debug("start: AVAudioPlayer error \(error.localizedDescription)")
-        }
-
-        playerTask = Task {
-            while let player = audioPlayer {
-                player.play()
-                do {
-                    try await Task.sleep(nanoseconds: UInt64((player.duration * 1_000_000_000) + delayMs * 1_000_000))
-                } catch {
-                    break
-                }
-            }
-        }
-    }
-
-    func startConnectingCallSound() {
-        start("connecting_call", delayMs: 0)
-    }
-
-    func startInCallSound() {
-        // Taken from https://github.com/TelegramOrg/Telegram-Android
-        // https://github.com/TelegramOrg/Telegram-Android/blob/master/LICENSE
-        start("in_call", delayMs: 1000)
-    }
-
-    func stop() {
-        playerTask.cancel()
-        audioPlayer?.stop()
-        audioPlayer = nil
-    }
-
-    func vibrate(long: Bool) {
-        // iOS just don't want to vibrate more than once after a short period of time, and all 'styles' feel the same
-        if long {
-            AudioServicesPlayAlertSound(kSystemSoundID_Vibrate)
-        } else {
-            UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
-        }
-    }
-}
@@ -18,7 +18,7 @@ class Call: ObservableObject, Equatable {

    var direction: CallDirection
    var contact: Contact
-    var callUUID: String?
+    var callkitUUID: UUID?
    var localMedia: CallMediaType
    @Published var callState: CallState
    @Published var localCapabilities: CallCapabilities?
@@ -33,14 +33,14 @@ class Call: ObservableObject, Equatable {
    init(
        direction: CallDirection,
        contact: Contact,
-        callUUID: String?,
+        callkitUUID: UUID?,
        callState: CallState,
        localMedia: CallMediaType,
        sharedKey: String? = nil
    ) {
        self.direction = direction
        self.contact = contact
-        self.callUUID = callUUID
+        self.callkitUUID = callkitUUID
        self.callState = callState
        self.localMedia = localMedia
        self.sharedKey = sharedKey
@@ -431,18 +431,17 @@ struct RTCIceServer: Codable, Equatable {
 }

 // the servers are expected in this format:
-// stuns:stun.simplex.im:443?transport=tcp
-// turns:private2:Hxuq2QxUjnhj96Zq2r4HjqHRj@turn.simplex.im:443?transport=tcp
+// stun:stun.simplex.im:443?transport=tcp
+// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
 func parseRTCIceServer(_ str: String) -> RTCIceServer? {
    var s = replaceScheme(str, "stun:")
-    s = replaceScheme(s, "stuns:")
    s = replaceScheme(s, "turn:")
    s = replaceScheme(s, "turns:")
    if let u: URL = URL(string: s),
       let scheme = u.scheme,
       let host = u.host,
       let port = u.port,
-       u.path == "" && (scheme == "stun" || scheme == "stuns" || scheme == "turn" || scheme == "turns")  {
+       u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")  {
        let query = u.query == nil || u.query == "" ? "" : "?" + (u.query ?? "")
        return RTCIceServer(
            urls: ["\(scheme):\(host):\(port)\(query)"],
@@ -49,7 +49,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }

    private let rtcAudioSession =  RTCAudioSession.sharedInstance()
-    private let audioQueue = DispatchQueue(label: "chat.simplex.app.audio")
+    private let audioQueue = DispatchQueue(label: "audio")
    private var sendCallResponse: (WVAPIMessage) async -> Void
    var activeCall: Binding<Call?>
    private var localRendererAspectRatio: Binding<CGFloat?>
@@ -65,14 +65,14 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        self.localRendererAspectRatio = localRendererAspectRatio
        rtcAudioSession.useManualAudio = CallController.useCallKit()
        rtcAudioSession.isAudioEnabled = !CallController.useCallKit()
-        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)")
+        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)}")
        super.init()
    }

    let defaultIceServers: [WebRTC.RTCIceServer] = [
-        WebRTC.RTCIceServer(urlStrings: ["stuns:stun.simplex.im:443"]),
-        //WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=udp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
-        WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=tcp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
+        WebRTC.RTCIceServer(urlStrings: ["stun:stun.simplex.im:443"]),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
    ]

    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
@@ -411,15 +411,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }

    func endCall() {
-        if #available(iOS 16.0, *) {
-            _endCall()
-        } else {
-            // Fixes `connection.close()` getting locked up in iOS15
-            DispatchQueue.global(qos: .utility).async { self._endCall() }
-        }
-    }
-
-    private func _endCall() {
        guard let call = activeCall.wrappedValue else { return }
        logger.debug("WebRTCClient: ending the call")
        activeCall.wrappedValue = nil
@@ -614,23 +605,9 @@ extension WebRTCClient {
                self.rtcAudioSession.unlockForConfiguration()
            }
            do {
-                let hasExternalAudioDevice = self.rtcAudioSession.session.hasExternalAudioDevice()
-                if enabled {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.defaultToSpeaker, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.videoChat.rawValue)
-                    if hasExternalAudioDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
-                        try self.rtcAudioSession.setPreferredInput(preferred)
-                    } else {
-                        try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
-                    }
-                } else {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
-                    try self.rtcAudioSession.overrideOutputAudioPort(.none)
-                }
-                if hasExternalAudioDevice {
-                    logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
-                }
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
                try self.rtcAudioSession.setActive(true)
                logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
            } catch let error {
@@ -681,17 +658,6 @@ extension WebRTCClient {
    }
 }

-extension AVAudioSession {
-    func hasExternalAudioDevice() -> Bool {
-        availableInputs?.allSatisfy({ $0.portType == .builtInMic }) != true
-    }
-
-    func preferredInputDevice() -> AVAudioSessionPortDescription? {
-//        logger.debug("Preferred input device: \(String(describing: self.availableInputs?.filter({ $0.portType != .builtInMic })))")
-        return availableInputs?.filter({ $0.portType != .builtInMic }).last
-    }
-}
-
 struct CustomRTCSessionDescription: Codable {
    public var type: RTCSdpType?
    public var sdp: String?
@@ -9,9 +9,10 @@
 import SwiftUI
 import SimpleXChat

+let chatImageColorLight = Color(red: 0.9, green: 0.9, blue: 0.9)
+let chatImageColorDark = Color(red: 0.2, green: 0.2, blue: 0.2)
 struct ChatInfoToolbar: View {
    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    var imageSize: CGFloat = 32

@@ -24,30 +25,30 @@ struct ChatInfoToolbar: View {
            }
            ChatInfoImage(
                chat: chat,
-                size: imageSize,
-                color: Color(uiColor: .tertiaryLabel)
+                color: colorScheme == .dark
+                        ? chatImageColorDark
+                        : chatImageColorLight
            )
+            .frame(width: imageSize, height: imageSize)
            .padding(.trailing, 4)
-            let t = Text(cInfo.displayName).font(.headline)
-            (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)
-                .lineLimit(1)
-                .if (cInfo.fullName != "" && cInfo.displayName != cInfo.fullName) { v in
-                    VStack(spacing: 0) {
-                        v
-                        Text(cInfo.fullName).font(.subheadline)
-                            .lineLimit(1)
-                            .padding(.top, -2)
-                    }
+            VStack {
+                let t = Text(cInfo.displayName).font(.headline)
+                (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)
+                    .lineLimit(1)
+                if cInfo.fullName != "" && cInfo.displayName != cInfo.fullName {
+                    Text(cInfo.fullName).font(.subheadline)
+                        .lineLimit(1)
                }
+            }
        }
-        .foregroundColor(theme.colors.onBackground)
+        .foregroundColor(.primary)
        .frame(width: 220)
    }

    private var contactVerifiedShield: Text {
        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
            .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
            .baselineOffset(1)
            .kerning(-2)
    }
@@ -56,6 +57,5 @@ struct ChatInfoToolbar: View {
 struct ChatInfoToolbar_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoToolbar(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
-            .environmentObject(CurrentColors.toAppTheme())
    }
 }
@@ -9,7 +9,6 @@ import SwiftUI
 class AnimatedImageView: UIView {
    var image: UIImage? = nil
    var imageView: UIImageView? = nil
-    var cMode: UIView.ContentMode = .scaleAspectFit

    override init(frame: CGRect) {
        super.init(frame: frame)
@@ -19,12 +18,11 @@ class AnimatedImageView: UIView {
        fatalError("Not implemented")
    }

-    convenience init(image: UIImage, contentMode: UIView.ContentMode) {
+    convenience init(image: UIImage) {
        self.init()
        self.image = image
-        self.cMode = contentMode
        imageView = UIImageView(gifImage: image)
-        imageView!.contentMode = contentMode
+        imageView!.contentMode = .scaleAspectFit
        self.addSubview(imageView!)
    }

@@ -37,7 +35,7 @@ class AnimatedImageView: UIView {
        if let subview = self.subviews.first as? UIImageView {
            if image.imageData != subview.gifImage?.imageData {
                imageView = UIImageView(gifImage: image)
-                imageView!.contentMode = contentMode
+                imageView!.contentMode = .scaleAspectFit
                self.addSubview(imageView!)
                subview.removeFromSuperview()
            }
@@ -49,15 +47,13 @@ class AnimatedImageView: UIView {

 struct SwiftyGif: UIViewRepresentable {
    private let image: UIImage
-    private let contentMode: UIView.ContentMode

-    init(image: UIImage, contentMode: UIView.ContentMode = .scaleAspectFit) {
+    init(image: UIImage) {
        self.image = image
-        self.contentMode = contentMode
    }

    func makeUIView(context: Context) -> AnimatedImageView {
-        AnimatedImageView(image: image, contentMode: contentMode)
+        AnimatedImageView(image: image)
    }

    func updateUIView(_ imageView: AnimatedImageView, context: Context) {
@@ -11,7 +11,6 @@ import SimpleXChat

 struct CICallItemView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var status: CICallStatus
@@ -23,7 +22,7 @@ struct CICallItemView: View {
            switch status {
            case .pending:
                if sent {
-                    Image(systemName: "phone.arrow.up.right").foregroundColor(theme.colors.secondary)
+                    Image(systemName: "phone.arrow.up.right").foregroundColor(.secondary)
                } else {
                    acceptCallButton()
                }
@@ -36,7 +35,9 @@ struct CICallItemView: View {
            case .error: missedCallIcon(sent).foregroundColor(.orange)
            }

-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
                .padding(.bottom, 8)
                .padding(.horizontal, 12)
        }
@@ -53,7 +54,7 @@ struct CICallItemView: View {
    @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
        HStack {
            Image(systemName: "phone.down")
-            Text(durationText(duration)).foregroundColor(theme.colors.secondary)
+            Text(durationText(duration)).foregroundColor(.secondary)
        }
    }

@@ -71,7 +72,7 @@ struct CICallItemView: View {
                Label("Answer call", systemImage: "phone.arrow.down.left")
            }
        } else {
-            Image(systemName: "phone.arrow.down.left").foregroundColor(theme.colors.secondary)
+            Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
        }
    }
 }
@@ -11,9 +11,6 @@ import SimpleXChat

 struct CIChatFeatureView: View {
    @EnvironmentObject var m: ChatModel
-    @ObservedObject var im = ItemsModel.shared
-    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    @Binding var revealed: Bool
    var feature: Feature
@@ -21,7 +18,7 @@ struct CIChatFeatureView: View {
    var iconColor: Color

    var body: some View {
-        if !revealed, let fs = mergedFeatures() {
+        if !revealed, let fs = mergedFeautures() {
            HStack {
                ForEach(fs, content: featureIconView)
            }
@@ -50,12 +47,12 @@ struct CIChatFeatureView: View {
        }
    }

-    private func mergedFeatures() -> [FeatureInfo]? {
+    private func mergedFeautures() -> [FeatureInfo]? {
        var fs: [FeatureInfo] = []
        var icons: Set<String> = []
        if var i = m.getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count,
-                  let f = featureInfo(im.reversedChatItems[i]) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
                if !icons.contains(f.icon) {
                    fs.insert(f, at: 0)
                    icons.insert(f.icon)
@@ -68,10 +65,10 @@ struct CIChatFeatureView: View {

    private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
        switch ci.content {
-        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor(theme.colors.secondary), param)
-        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor(theme.colors.secondary), param)
-        case let .rcvGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary), param)
-        case let .sndGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary), param)
+        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
        default: nil
        }
    }
@@ -83,7 +80,7 @@ struct CIChatFeatureView: View {
        if let param = f.param {
            HStack {
                i
-                chatEventText(Text(param), theme.colors.secondary).lineLimit(1)
+                chatEventText(Text(param)).lineLimit(1)
            }
        } else {
            i
@@ -95,7 +92,7 @@ struct CIChatFeatureView: View {
            Image(systemName: icon ?? feature.iconFilled)
                .foregroundColor(iconColor)
                .scaleEffect(feature.iconScale)
-            chatEventText(chatItem, theme.colors.secondary)
+            chatEventText(chatItem)
        }
        .padding(.horizontal, 6)
        .padding(.vertical, 4)
@@ -106,6 +103,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
    static var previews: some View {
        let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chat: Chat.sampleData, chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary))
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
    }
 }
@@ -17,7 +17,6 @@ struct CIEventView: View {
        .padding(.horizontal, 6)
        .padding(.vertical, 4)
        .textSelection(.disabled)
-        .lineLimit(4)
    }
 }

@@ -11,7 +11,6 @@ import SimpleXChat

 struct CIFeaturePreferenceView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    var feature: ChatFeature
    var allowed: FeatureAllowed
@@ -20,7 +19,7 @@ struct CIFeaturePreferenceView: View {
    var body: some View {
        HStack(alignment: .center, spacing: 4) {
            Image(systemName: feature.icon)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
                .scaleEffect(feature.iconScale)
            if let ct = chat.chatInfo.contact,
               allowed != .no && ct.allowsFeature(feature) && !ct.userAllowsFeature(feature) {
@@ -41,17 +40,17 @@ struct CIFeaturePreferenceView: View {
    private func featurePreferenceView(acceptText: LocalizedStringKey? = nil) -> some View {
        var r = Text(CIContent.preferenceText(feature, allowed, param) + "  ")
            .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
        if let acceptText {
            r = r
            + Text(acceptText)
                .fontWeight(.medium)
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
            + Text("  ")
        }
        r = r + chatItem.timestampText
            .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
        return r.font(.caption)
    }
 }
@@ -11,48 +11,42 @@ import SimpleXChat

 struct CIFileView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    let file: CIFile?
    let edited: Bool
-    var smallViewSize: CGFloat?

    var body: some View {
-        if smallViewSize != nil {
-            fileIndicator()
-            .onTapGesture(perform: fileAction)
-        } else {
-            let metaReserve = edited
-            ? "                           "
-            : "                       "
-            Button(action: fileAction) {
-                HStack(alignment: .bottom, spacing: 6) {
-                    fileIndicator()
-                        .padding(.top, 5)
-                        .padding(.bottom, 3)
-                    if let file = file {
-                        let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
-                        VStack(alignment: .leading, spacing: 2) {
-                            Text(file.fileName)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.onBackground)
-                            Text(prettyFileSize + metaReserve)
-                                .font(.caption)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    } else {
-                        Text(metaReserve)
+        let metaReserve = edited
+        ? "                           "
+        : "                       "
+        Button(action: fileAction) {
+            HStack(alignment: .bottom, spacing: 6) {
+                fileIndicator()
+                    .padding(.top, 5)
+                    .padding(.bottom, 3)
+                if let file = file {
+                    let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text(file.fileName)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(.primary)
+                        Text(prettyFileSize + metaReserve)
+                            .font(.caption)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(.secondary)
                    }
+                } else {
+                    Text(metaReserve)
                }
-                .padding(.top, 4)
-                .padding(.bottom, 6)
-                .padding(.leading, 10)
-                .padding(.trailing, 12)
            }
-            .disabled(!itemInteractive)
+            .padding(.top, 4)
+            .padding(.bottom, 6)
+            .padding(.leading, 10)
+            .padding(.trailing, 12)
        }
+        .disabled(!itemInteractive)
    }

    private var itemInteractive: Bool {
@@ -60,32 +54,36 @@ struct CIFileView: View {
            switch (file.fileStatus) {
            case .sndStored: return file.fileProtocol == .local
            case .sndTransfer: return false
-            case .sndComplete: return true
+            case .sndComplete: return false
            case .sndCancelled: return false
-            case .sndError: return true
-            case .sndWarning: return true
+            case .sndError: return false
            case .rcvInvitation: return true
            case .rcvAccepted: return true
            case .rcvTransfer: return false
-            case .rcvAborted: return true
            case .rcvComplete: return true
            case .rcvCancelled: return false
-            case .rcvError: return true
-            case .rcvWarning: return true
+            case .rcvError: return false
            case .invalid: return false
            }
        }
        return false
    }

+    private func fileSizeValid() -> Bool {
+        if let file = file {
+            return file.fileSize <= getMaxFileSize(file.fileProtocol)
+        }
+        return false
+    }
+
    private func fileAction() {
        logger.debug("CIFileView fileAction")
        if let file = file {
            switch (file.fileStatus) {
-            case .rcvInvitation, .rcvAborted:
-                if fileSizeValid(file) {
+            case .rcvInvitation:
+                if fileSizeValid() {
                    Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                        if let user = m.currentUser {
                            await receiveFile(user: user, fileId: file.fileId)
                        }
@@ -116,40 +114,11 @@ struct CIFileView: View {
                if let fileSource = getLoadedFileSource(file) {
                    saveCryptoFile(fileSource)
                }
-            case let .rcvError(rcvFileError):
-                logger.debug("CIFileView fileAction - in .rcvError")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("File error"),
-                    message: Text(rcvFileError.errorInfo)
-                ))
-            case let .rcvWarning(rcvFileError):
-                logger.debug("CIFileView fileAction - in .rcvWarning")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Temporary file error"),
-                    message: Text(rcvFileError.errorInfo)
-                ))
            case .sndStored:
                logger.debug("CIFileView fileAction - in .sndStored")
                if file.fileProtocol == .local, let fileSource = getLoadedFileSource(file) {
                    saveCryptoFile(fileSource)
                }
-            case .sndComplete:
-                logger.debug("CIFileView fileAction - in .sndComplete")
-                if let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
-                }
-            case let .sndError(sndFileError):
-                logger.debug("CIFileView fileAction - in .sndError")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("File error"),
-                    message: Text(sndFileError.errorInfo)
-                ))
-            case let .sndWarning(sndFileError):
-                logger.debug("CIFileView fileAction - in .sndWarning")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Temporary file error"),
-                    message: Text(sndFileError.errorInfo)
-                ))
            default: break
            }
        }
@@ -173,10 +142,9 @@ struct CIFileView: View {
            case .sndComplete: fileIcon("doc.fill", innerIcon: "checkmark", innerIconSize: 10)
            case .sndCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .sndError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
-            case .sndWarning: fileIcon("doc.fill", innerIcon: "exclamationmark.triangle.fill", innerIconSize: 10)
            case .rcvInvitation:
-                if fileSizeValid(file) {
-                    fileIcon("arrow.down.doc.fill", color: theme.colors.primary)
+                if fileSizeValid() {
+                    fileIcon("arrow.down.doc.fill", color: .accentColor)
                } else {
                    fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
                }
@@ -187,12 +155,9 @@ struct CIFileView: View {
                } else {
                    progressView()
                }
-            case .rcvAborted:
-                fileIcon("doc.fill", color: theme.colors.primary, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
            case .rcvComplete: fileIcon("doc.fill")
            case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
-            case .rcvWarning: fileIcon("doc.fill", innerIcon: "exclamationmark.triangle.fill", innerIconSize: 10)
            case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
            }
        } else {
@@ -201,22 +166,21 @@ struct CIFileView: View {
    }

    private func fileIcon(_ icon: String, color: Color = Color(uiColor: .tertiaryLabel), innerIcon: String? = nil, innerIconSize: CGFloat? = nil) -> some View {
-        let size = smallViewSize ?? 30
-        return ZStack(alignment: .center) {
+        ZStack(alignment: .center) {
            Image(systemName: icon)
                .resizable()
                .aspectRatio(contentMode: .fit)
-                .frame(width: size, height: size)
+                .frame(width: 30, height: 30)
                .foregroundColor(color)
            if let innerIcon = innerIcon,
-               let innerIconSize = innerIconSize, (smallViewSize == nil || file?.showStatusIconInSmallView == true) {
+               let innerIconSize = innerIconSize {
                Image(systemName: innerIcon)
                    .resizable()
                    .aspectRatio(contentMode: .fit)
                    .frame(maxHeight: 16)
                    .frame(width: innerIconSize, height: innerIconSize)
                    .foregroundColor(.white)
-                    .padding(.top, size / 2.5)
+                    .padding(.top, 12)
            }
        }
    }
@@ -237,13 +201,6 @@ struct CIFileView: View {
    }
 }

-func fileSizeValid(_ file: CIFile?) -> Bool {
-    if let file = file {
-        return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-}
-
 func saveCryptoFile(_ fileSource: CryptoFile) {
    if let cfArgs = fileSource.cryptoArgs {
        let url = getAppFilePath(fileSource.filePath)
@@ -11,8 +11,7 @@ import SimpleXChat

 struct CIGroupInvitationView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @ObservedObject var chat: Chat
+    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
    var groupInvitation: CIGroupInvitation
    var memberRole: GroupMemberRole
@@ -21,8 +20,6 @@ struct CIGroupInvitationView: View {
    @State private var inProgress = false
    @State private var progressByTimeout = false

-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
    var body: some View {
        let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
        let v = ZStack(alignment: .bottomTrailing) {
@@ -40,22 +37,16 @@ struct CIGroupInvitationView: View {
                        VStack(alignment: .leading, spacing: 2) {
                            groupInvitationText()
                                .overlay(DetermineWidth())
-                            (
-                                Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                                    .foregroundColor(inProgress ? theme.colors.secondary : chatIncognito ? .indigo : theme.colors.primary)
-                                    .font(.callout)
-                                + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
-                            )
-                            .overlay(DetermineWidth())
+                            Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                                .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
+                                .font(.callout)
+                                .padding(.trailing, 60)
+                                .overlay(DetermineWidth())
                        }
                    } else {
-                        (
-                            groupInvitationText()
-                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
-                        )
-                        .overlay(DetermineWidth())
+                        groupInvitationText()
+                            .padding(.trailing, 60)
+                            .overlay(DetermineWidth())
                    }
                }
                .padding(.bottom, 2)
@@ -65,11 +56,14 @@ struct CIGroupInvitationView: View {
                }
            }

-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
        }
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
        .textSelection(.disabled)
        .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
        .onChange(of: inProgress) { inProgress in
@@ -98,7 +92,7 @@ struct CIGroupInvitationView: View {
    private func groupInfoView(_ action: Bool) -> some View {
        var color: Color
        if action && !inProgress {
-            color = chatIncognito ? .indigo : theme.colors.primary
+            color = chatIncognito ? .indigo : .accentColor
        } else {
            color = Color(uiColor: .tertiaryLabel)
        }
@@ -106,9 +100,9 @@ struct CIGroupInvitationView: View {
            ProfileImage(
                imageStr: groupInvitation.groupProfile.image,
                iconName: "person.2.circle.fill",
-                size: 44,
                color: color
            )
+            .frame(width: 44, height: 44)
            .padding(.trailing, 4)
            VStack(alignment: .leading) {
                let p = groupInvitation.groupProfile
@@ -121,7 +115,7 @@ struct CIGroupInvitationView: View {
        }
    }

-    private func groupInvitationText() -> Text {
+    private func groupInvitationText() -> some View {
        Text(groupInvitationStr())
            .font(.callout)
    }
@@ -143,8 +137,8 @@ struct CIGroupInvitationView: View {
 struct CIGroupInvitationView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
        }
    }
 }
@@ -11,41 +11,34 @@ import SimpleXChat

 struct CIImageView: View {
    @EnvironmentObject var m: ChatModel
+    @Environment(\.colorScheme) var colorScheme
    let chatItem: ChatItem
-    var preview: UIImage?
+    let image: String
    let maxWidth: CGFloat
-    var imgWidth: CGFloat?
-    var smallView: Bool = false
-    @Binding var showFullScreenImage: Bool
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0
+    @Binding var imgWidth: CGFloat?
+    @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
+    @State private var showFullScreenImage = false

    var body: some View {
        let file = chatItem.file
        VStack(alignment: .center, spacing: 6) {
            if let uiImage = getLoadedImage(file) {
-                Group { if smallView { smallViewImageView(uiImage) } else { imageView(uiImage) } }
+                imageView(uiImage)
                .fullScreenCover(isPresented: $showFullScreenImage) {
-                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage)
-                }
-                .if(!smallView) { view in
-                    view.modifier(PrivacyBlur(blurred: $blurred))
+                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
                }
                .onTapGesture { showFullScreenImage = true }
                .onChange(of: m.activeCallViewIsCollapsed) { _ in
                    showFullScreenImage = false
                }
-            } else if let preview {
-                Group {
-                    if smallView {
-                        smallViewImageView(preview)
-                    } else {
-                        imageView(preview).modifier(PrivacyBlur(blurred: $blurred))
-                    }
-                }
+            } else if let data = Data(base64Encoded: dropImagePrefix(image)),
+                      let uiImage = UIImage(data: data) {
+                imageView(uiImage)
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                Task {
                                    if let user = m.currentUser {
                                        await receiveFile(user: user, fileId: file.fileId)
@@ -68,70 +61,29 @@ struct CIImageView: View {
                            case .rcvTransfer: () // ?
                            case .rcvComplete: () // ?
                            case .rcvCancelled: () // TODO
-                            case let .rcvError(rcvFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("File error"),
-                                    message: Text(rcvFileError.errorInfo)
-                                ))
-                            case let .rcvWarning(rcvFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("Temporary file error"),
-                                    message: Text(rcvFileError.errorInfo)
-                                ))
-                            case let .sndError(sndFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("File error"),
-                                    message: Text(sndFileError.errorInfo)
-                                ))
-                            case let .sndWarning(sndFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("Temporary file error"),
-                                    message: Text(sndFileError.errorInfo)
-                                ))
                            default: ()
                            }
                        }
                    }
            }
        }
-        .onDisappear {
-            showFullScreenImage = false
-        }
    }

    private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : img.imageData == nil ? .infinity : maxWidth
+        DispatchQueue.main.async { imgWidth = w }
        return ZStack(alignment: .topTrailing) {
            if img.imageData == nil {
                Image(uiImage: img)
                        .resizable()
                        .scaledToFit()
-                        .frame(width: w)
+                        .frame(maxWidth: w)
            } else {
                SwiftyGif(image: img)
                        .frame(width: w, height: w * img.size.height / img.size.width)
                        .scaledToFit()
            }
-            if !blurred || !showDownloadButton(chatItem.file?.fileStatus) {
-                loadingIndicator()
-            }
-        }
-    }
-
-    private func smallViewImageView(_ img: UIImage) -> some View {
-        ZStack(alignment: .topTrailing) {
-            if img.imageData == nil {
-                Image(uiImage: img)
-                    .resizable()
-                    .aspectRatio(contentMode: .fill)
-                    .frame(width: maxWidth, height: maxWidth)
-            } else {
-                SwiftyGif(image: img, contentMode: .scaleAspectFill)
-                    .frame(width: maxWidth, height: maxWidth)
-            }
-            if chatItem.file?.showStatusIconInSmallView == true {
-                loadingIndicator()
-            }
+            loadingIndicator()
        }
    }

@@ -148,16 +100,13 @@ struct CIImageView: View {
            case .sndComplete: fileIcon("checkmark", 10, 13)
            case .sndCancelled: fileIcon("xmark", 10, 13)
            case .sndError: fileIcon("xmark", 10, 13)
-            case .sndWarning: fileIcon("exclamationmark.triangle.fill", 10, 13)
            case .rcvInvitation: fileIcon("arrow.down", 10, 13)
            case .rcvAccepted: fileIcon("ellipsis", 14, 11)
            case .rcvTransfer: progressView()
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
-            case .rcvComplete: EmptyView()
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
-            case .rcvWarning: fileIcon("exclamationmark.triangle.fill", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
+            default: EmptyView()
            }
        }
    }
@@ -167,7 +116,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
            .padding(padding)
    }

@@ -178,12 +127,4 @@ struct CIImageView: View {
            .tint(.white)
            .padding(8)
    }
-
-    private func showDownloadButton(_ fileStatus: CIFileStatus?) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
-    }
 }
@@ -9,7 +9,6 @@
 import SwiftUI

 struct CIInvalidJSONView: View {
-    @EnvironmentObject var theme: AppTheme
    var json: String
    @State private var showJSON = false
    
@@ -22,9 +21,10 @@ struct CIInvalidJSONView: View {
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
        .textSelection(.disabled)
        .onTapGesture { showJSON = true }
-        .appSheet(isPresented: $showJSON) {
+        .sheet(isPresented: $showJSON) {
            invalidJSONView(json)
        }
    }
@@ -44,7 +44,6 @@ func invalidJSONView(_ json: String) -> some View {
    }
    .frame(maxHeight: .infinity)
    .padding()
-    .modifier(ThemedBackground())
 }

 struct CIInvalidJSONView_Previews: PreviewProvider {
@@ -10,17 +10,16 @@ import SwiftUI
 import SimpleXChat

 struct CILinkView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    let linkPreview: LinkPreview
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0

    var body: some View {
        VStack(alignment: .center, spacing: 6) {
-            if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+            if let data = Data(base64Encoded: dropImagePrefix(linkPreview.image)),
+               let uiImage = UIImage(data: data) {
                Image(uiImage: uiImage)
                    .resizable()
                    .scaledToFit()
-                    .modifier(PrivacyBlur(blurred: $blurred))
            }
            VStack(alignment: .leading, spacing: 6) {
                Text(linkPreview.title)
@@ -33,7 +32,7 @@ struct CILinkView: View {
                Text(linkPreview.uri.absoluteString)
                    .font(.caption)
                    .lineLimit(1)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            }
            .padding(.horizontal, 12)
            .frame(maxWidth: .infinity, alignment: .leading)
@@ -11,7 +11,6 @@ import SimpleXChat

 struct CIMemberCreatedContactView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    
    var body: some View {
@@ -44,12 +43,12 @@ struct CIMemberCreatedContactView: View {
            r = r
            + Text(openText)
                .fontWeight(.medium)
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
            + Text("  ")
        }
        r = r + chatItem.timestampText
            .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
        return r.font(.caption)
    }
    
@@ -57,11 +56,11 @@ struct CIMemberCreatedContactView: View {
        if let member = chatItem.memberDisplayName {
            return Text(member + " " + chatItem.content.text + "  ")
                .fontWeight(.light)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
        } else {
            return Text(chatItem.content.text + "  ")
                .fontWeight(.light)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
        }
    }
 }
@@ -11,14 +11,9 @@ import SimpleXChat

 struct CIMetaView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
-    var metaColor: Color
+    var metaColor = Color.secondary
    var paleMetaColor = Color(UIColor.tertiaryLabel)
-    var showStatus = true
-    var showEdited = true
-
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false

    var body: some View {
        if chatItem.isDeletedContent {
@@ -30,24 +25,24 @@ struct CIMetaView: View {
            switch meta.itemStatus {
            case let .sndSent(sndProgress):
                switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                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, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        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, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        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, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
            }
        }
    }
@@ -59,20 +54,9 @@ enum SentCheckmark {
    case rcvd2
 }

-func ciMetaText(
-    _ meta: CIMeta,
-    chatTTL: Int?,
-    encrypted: Bool?,
-    color: Color = .clear,
-    primaryColor: Color = .accentColor,
-    transparent: Bool = false,
-    sent: SentCheckmark? = nil,
-    showStatus: Bool = true,
-    showEdited: Bool = true,
-    showViaProxy: Bool
-) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
    var r = Text("")
-    if showEdited, meta.itemEdited {
+    if meta.itemEdited {
        r = r + statusIconText("pencil", color)
    }
    if meta.disappearing {
@@ -83,24 +67,19 @@ func ciMetaText(
        }
        r = r + Text(" ")
    }
-    if showViaProxy, meta.sentViaProxy == true {
-        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
-    }
-    if showStatus {
-        if let (icon, statusColor) = meta.statusIcon(color, primaryColor) {
-            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(" ")
+    if let (icon, statusColor) = meta.statusIcon(color) {
+        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(" ")
    }
    if let enc = encrypted {
        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
@@ -114,16 +93,15 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 }

 struct CIMetaView_Previews: PreviewProvider {
-    static let metaColor = Color.secondary
    static var previews: some View {
        Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
        }
        .previewLayout(.fixed(width: 360, height: 100))
    }
@@ -13,21 +13,18 @@ let decryptErrorReason: LocalizedStringKey = "It can happen when you or your con

 struct CIRcvDecryptionError: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    var msgDecryptError: MsgDecryptError
    var msgCount: UInt32
    var chatItem: ChatItem
    @State private var alert: CIRcvDecryptionErrorAlert?

-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
    enum CIRcvDecryptionErrorAlert: Identifiable {
        case syncAllowedAlert(_ syncConnection: () -> Void)
        case syncNotSupportedContactAlert
        case syncNotSupportedMemberAlert
        case decryptionErrorAlert
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)

        var id: String {
            switch self {
@@ -62,7 +59,7 @@ struct CIRcvDecryptionError: View {
                case .syncNotSupportedContactAlert: return Alert(title: Text("Fix not supported by contact"), message: message())
                case .syncNotSupportedMemberAlert: return Alert(title: Text("Fix not supported by group member"), message: message())
                case .decryptionErrorAlert: return Alert(title: Text("Decryption error"), message: message())
-                case let .error(title, error): return mkAlert(title: title, message: error)
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
                }
            }
    }
@@ -115,23 +112,24 @@ struct CIRcvDecryptionError: View {
                }
                (
                    Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
-                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text(" ")
                    + Text("Fix connection")
-                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                )
            }
            .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
        .padding(.vertical, 6)
        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
        .textSelection(.disabled)
    }

@@ -142,15 +140,16 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
            }
            .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
        .padding(.vertical, 6)
        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
        .textSelection(.disabled)
    }

@@ -13,53 +13,63 @@ import Combine

 struct CIVideoView: View {
    @EnvironmentObject var m: ChatModel
+    @Environment(\.colorScheme) var colorScheme
    private let chatItem: ChatItem
-    private let preview: UIImage?
+    private let image: String
    @State private var duration: Int
    @State private var progress: Int = 0
    @State private var videoPlaying: Bool = false
    private let maxWidth: CGFloat
-    private var videoWidth: CGFloat?
-    private let smallView: Bool
+    @Binding private var videoWidth: CGFloat?
+    @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 urlDecrypted: URL?
    @State private var decryptionInProgress: Bool = false
-    @Binding private var showFullScreenPlayer: Bool
+    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
    @State private var fullScreenTimeObserver: Any? = nil
    @State private var publisher: AnyCancellable? = nil
-    private var sizeMultiplier: CGFloat { smallView ? 0.38 : 1 }
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0

-    init(chatItem: ChatItem, preview: UIImage?, duration: Int, maxWidth: CGFloat, videoWidth: CGFloat?, smallView: Bool = false, showFullscreenPlayer: Binding<Bool>) {
+    init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
        self.chatItem = chatItem
-        self.preview = preview
+        self.image = image
        self._duration = State(initialValue: duration)
        self.maxWidth = maxWidth
-        self.videoWidth = videoWidth
-        self.smallView = smallView
-        self._showFullScreenPlayer = showFullscreenPlayer
+        self._videoWidth = videoWidth
+        self.scrollProxy = scrollProxy
+        if let url = getLoadedVideo(chatItem.file) {
+            let decrypted = chatItem.file?.fileSource?.cryptoArgs == nil ? url : chatItem.file?.fileSource?.decryptedGet()
+            self._urlDecrypted = State(initialValue: decrypted)
+            if let decrypted = decrypted {
+                self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(decrypted, false))
+                self._fullPlayer = State(initialValue: AVPlayer(url: decrypted))
+            }
+            self._url = State(initialValue: url)
+        }
+        if let data = Data(base64Encoded: dropImagePrefix(image)),
+           let uiImage = UIImage(data: data) {
+            self._preview = State(initialValue: uiImage)
+        }
    }

    var body: some View {
        let file = chatItem.file
-        ZStack(alignment: smallView ? .topLeading : .center) {
+        ZStack {
            ZStack(alignment: .topLeading) {
-                if let file = file, let preview = preview, let decrypted = urlDecrypted, smallView {
-                    smallVideoView(decrypted, file, preview)
-                } else if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
+                if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
                    videoView(player, decrypted, file, preview, duration)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil, smallView {
-                    smallVideoViewEncrypted(file, defaultPreview)
                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
                    videoViewEncrypted(file, defaultPreview, duration)
-                } else if let preview, let file {
-                    Group { if smallView { smallViewImageView(preview, file) } else { imageView(preview) } }
-                        .onTapGesture {
+                } else if let data = Data(base64Encoded: dropImagePrefix(image)),
+                          let uiImage = UIImage(data: data) {
+                    imageView(uiImage)
+                    .onTapGesture {
+                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -81,69 +91,18 @@ struct CIVideoView: View {
                            default: ()
                            }
                        }
-                }
-                if !smallView {
-                    durationProgress()
-                }
-            }
-            if !blurred, let file, showDownloadButton(file.fileStatus) {
-                if !smallView {
-                    Button {
-                        receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                    } label: {
-                        playPauseIcon("play.fill")
                    }
-                } else if !file.showStatusIconInSmallView {
+                }
+                durationProgress()
+            }
+            if let file = file, case .rcvInvitation = file.fileStatus {
+                Button {
+                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                } label: {
                    playPauseIcon("play.fill")
-                        .onTapGesture {
-                            receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                        }
                }
            }
        }
-        .fullScreenCover(isPresented: $showFullScreenPlayer) {
-            if let decrypted = urlDecrypted {
-                fullScreenPlayer(decrypted)
-            }
-        }
-        .onAppear {
-            setupPlayer(chatItem.file)
-        }
-        .onChange(of: chatItem.file) { file in
-            // ChatItem can be changed in small view on chat list screen
-            setupPlayer(file)
-        }
-        .onDisappear {
-            showFullScreenPlayer = false
-        }
-    }
-
-    private func setupPlayer(_ file: CIFile?) {
-        let newUrl = getLoadedVideo(file)
-        if newUrl == url {
-            return
-        }
-        url = nil
-        urlDecrypted = nil
-        player = nil
-        fullPlayer = nil
-        if let newUrl {
-            let decrypted = file?.fileSource?.cryptoArgs == nil ? newUrl : file?.fileSource?.decryptedGet()
-            urlDecrypted = decrypted
-            if let decrypted = decrypted {
-                player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                fullPlayer = AVPlayer(url: decrypted)
-            }
-            url = newUrl
-        }
-    }
-
-    private func showDownloadButton(_ fileStatus: CIFileStatus?) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
    }

    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
@@ -151,6 +110,11 @@ struct CIVideoView: View {
            ZStack(alignment: .center) {
                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
                imageView(defaultPreview)
+                .fullScreenCover(isPresented: $showFullScreenPlayer) {
+                    if let decrypted = urlDecrypted {
+                        fullScreenPlayer(decrypted)
+                    }
+                }
                .onTapGesture {
                    decrypt(file: file) {
                        showFullScreenPlayer = urlDecrypted != nil
@@ -159,22 +123,20 @@ struct CIVideoView: View {
                .onChange(of: m.activeCallViewIsCollapsed) { _ in
                    showFullScreenPlayer = false
                }
-                if !blurred {
-                    if !decryptionInProgress {
-                        Button {
-                            decrypt(file: file) {
-                                if urlDecrypted != nil {
-                                    videoPlaying = true
-                                    player?.play()
-                                }
+                if !decryptionInProgress {
+                    Button {
+                        decrypt(file: file) {
+                            if let decrypted = urlDecrypted {
+                                videoPlaying = true
+                                player?.play()
                            }
-                        } label: {
-                            playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                        }
-                        .disabled(!canBePlayed)
-                    } else {
-                        videoDecryptionProgress()
+                    } label: {
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                    }
+                    .disabled(!canBePlayed)
+                } else {
+                    videoDecryptionProgress()
                }
            }
        }
@@ -182,6 +144,7 @@ struct CIVideoView: View {

    private func videoView(_ player: AVPlayer, _ url: URL, _ file: CIFile, _ preview: UIImage, _ duration: Int) -> some View {
        let w = preview.size.width <= preview.size.height ? maxWidth * 0.75 : maxWidth
+        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
@@ -193,7 +156,9 @@ struct CIVideoView: View {
                        videoPlaying = false
                    }
                }
-                .modifier(PrivacyBlur(enabled: !videoPlaying, blurred: $blurred))
+                .fullScreenCover(isPresented: $showFullScreenPlayer) {
+                    fullScreenPlayer(url)
+                }
                .onTapGesture {
                    switch player.timeControlStatus {
                    case .playing:
@@ -209,7 +174,7 @@ struct CIVideoView: View {
                .onChange(of: m.activeCallViewIsCollapsed) { _ in
                    showFullScreenPlayer = false
                }
-                if !videoPlaying && !blurred {
+                if !videoPlaying {
                    Button {
                        m.stopPreviousRecPlay = url
                        player.play()
@@ -219,7 +184,7 @@ struct CIVideoView: View {
                    .disabled(!canBePlayed)
                }
            }
-            fileStatusIcon()
+            loadingIndicator()
        }
        .onAppear {
            addObserver(player, url)
@@ -231,53 +196,14 @@ struct CIVideoView: View {
        }
    }

-    private func smallVideoViewEncrypted(_ file: CIFile, _ preview: UIImage) -> some View {
-        return ZStack(alignment: .topLeading) {
-            let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
-            smallViewImageView(preview, file)
-                .onTapGesture {
-                    decrypt(file: file) {
-                        showFullScreenPlayer = urlDecrypted != nil
-                    }
-                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
-            if file.showStatusIconInSmallView {
-                // Show nothing
-            } else if !decryptionInProgress {
-                playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-            } else {
-                videoDecryptionProgress()
-            }
-        }
-    }
-
-    private func smallVideoView(_ url: URL, _ file: CIFile, _ preview: UIImage) -> some View {
-        return ZStack(alignment: .topLeading) {
-            smallViewImageView(preview, file)
-                .onTapGesture {
-                    showFullScreenPlayer = true
-                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
-
-            if !file.showStatusIconInSmallView {
-                playPauseIcon("play.fill")
-            }
-        }
-    }
-
-
    private func playPauseIcon(_ image: String, _ color: Color = .white) -> some View {
        Image(systemName: image)
        .resizable()
        .aspectRatio(contentMode: .fit)
-        .frame(width: smallView ? 12 * sizeMultiplier * 1.6 : 12, height: smallView ? 12 * sizeMultiplier * 1.6 : 12)
+        .frame(width: 12, height: 12)
        .foregroundColor(color)
-        .padding(.leading, smallView ? 0 : 4)
-        .frame(width: 40 * sizeMultiplier, height: 40 * sizeMultiplier)
+        .padding(.leading, 4)
+        .frame(width: 40, height: 40)
        .background(Color.black.opacity(0.35))
        .clipShape(Circle())
    }
@@ -285,9 +211,9 @@ struct CIVideoView: View {
    private func videoDecryptionProgress(_ color: Color = .white) -> some View {
        ProgressView()
            .progressViewStyle(.circular)
-            .frame(width: smallView ? 12 * sizeMultiplier : 12, height: smallView ? 12 * sizeMultiplier : 12)
+            .frame(width: 12, height: 12)
            .tint(color)
-            .frame(width: smallView ? 40 * sizeMultiplier * 0.9 : 40, height: smallView ? 40 * sizeMultiplier * 0.9 : 40)
+            .frame(width: 40, height: 40)
            .background(Color.black.opacity(0.35))
            .clipShape(Circle())
    }
@@ -317,33 +243,18 @@ struct CIVideoView: View {
    }

    private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : .infinity
+        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            Image(uiImage: img)
            .resizable()
            .scaledToFit()
-            .frame(width: w)
-            .modifier(PrivacyBlur(blurred: $blurred))
-            if !blurred || !showDownloadButton(chatItem.file?.fileStatus) {
-                fileStatusIcon()
-            }
+            .frame(maxWidth: w)
+            loadingIndicator()
        }
    }

-    private func smallViewImageView(_ img: UIImage, _ file: CIFile) -> some View {
-        ZStack(alignment: .center) {
-            Image(uiImage: img)
-                .resizable()
-                .aspectRatio(contentMode: .fill)
-                .frame(width: maxWidth, height: maxWidth)
-            if file.showStatusIconInSmallView {
-                fileStatusIcon()
-                    .allowsHitTesting(false)
-            }
-        }
-    }
-
-    @ViewBuilder private func fileStatusIcon() -> some View {
+    @ViewBuilder private func loadingIndicator() -> some View {
        if let file = chatItem.file {
            switch file.fileStatus {
            case .sndStored:
@@ -360,22 +271,7 @@ struct CIVideoView: View {
                }
            case .sndComplete: fileIcon("checkmark", 10, 13)
            case .sndCancelled: fileIcon("xmark", 10, 13)
-            case let .sndError(sndFileError):
-                fileIcon("xmark", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("File error"),
-                            message: Text(sndFileError.errorInfo)
-                        ))
-                    }
-            case let .sndWarning(sndFileError):
-                fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("Temporary file error"),
-                            message: Text(sndFileError.errorInfo)
-                        ))
-                    }
+            case .sndError: fileIcon("xmark", 10, 13)
            case .rcvInvitation: fileIcon("arrow.down", 10, 13)
            case .rcvAccepted: fileIcon("ellipsis", 14, 11)
            case let .rcvTransfer(rcvProgress, rcvTotal):
@@ -384,26 +280,10 @@ struct CIVideoView: View {
                } else {
                    progressView()
                }
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
-            case .rcvComplete: EmptyView()
            case .rcvCancelled: fileIcon("xmark", 10, 13)
-            case let .rcvError(rcvFileError):
-                fileIcon("xmark", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("File error"),
-                            message: Text(rcvFileError.errorInfo)
-                        ))
-                    }
-            case let .rcvWarning(rcvFileError):
-                fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("Temporary file error"),
-                            message: Text(rcvFileError.errorInfo)
-                        ))
-                    }
+            case .rcvError: fileIcon("xmark", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
+            default: EmptyView()
            }
        }
    }
@@ -414,7 +294,7 @@ struct CIVideoView: View {
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
            .foregroundColor(.white)
-            .padding(smallView ? 0 : padding)
+            .padding(padding)
    }

    private func progressView() -> some View {
@@ -422,7 +302,7 @@ struct CIVideoView: View {
        .progressViewStyle(.circular)
        .frame(width: 16, height: 16)
        .tint(.white)
-        .padding(smallView ? 0 : 11)
+        .padding(11)
    }

    private func progressCircle(_ progress: Int64, _ total: Int64) -> some View {
@@ -434,14 +314,14 @@ struct CIVideoView: View {
        )
        .rotationEffect(.degrees(-90))
        .frame(width: 16, height: 16)
-        .padding([.trailing, .top], smallView ? 0 : 11)
+        .padding([.trailing, .top], 11)
    }

    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
        Task {
            if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false, false)
+                await receiveFile(user, file.fileId, false)
            }
        }
    }
@@ -474,8 +354,7 @@ struct CIVideoView: View {
            )
            .onAppear {
                DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    // Prevent feedback loop - setting `ChatModel`s property causes `onAppear` to be called on iOS17+
-                    if m.stopPreviousRecPlay != url { m.stopPreviousRecPlay = url }
+                    m.stopPreviousRecPlay = url
                    if let player = fullPlayer {
                        player.play()
                        var played = false
@@ -512,12 +391,10 @@ struct CIVideoView: View {
            urlDecrypted = await file.fileSource?.decryptedGetOrCreate(&ChatModel.shared.filesToDelete)
            await MainActor.run {
                if let decrypted = urlDecrypted {
-                    if !smallView {
-                        player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                    }
+                    player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
                    fullPlayer = AVPlayer(url: decrypted)
                }
-                decryptionInProgress = false
+                decryptionInProgress = true
                completed?()
            }
        }
@@ -11,30 +11,18 @@ import SimpleXChat

 struct CIVoiceView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    let recordingFile: CIFile?
    let duration: Int
-    @State var audioPlayer: AudioPlayer? = nil
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval? = nil
-
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
    @Binding var allowMenu: Bool
-    var smallViewSize: CGFloat?
    @State private var seek: (TimeInterval) -> Void = { _ in }

    var body: some View {
        Group {
-            if smallViewSize != nil {
-                HStack(spacing: 10) {
-                    player()
-                    playerTime()
-                        .allowsHitTesting(false)
-                    if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
-                        playbackSlider()
-                    }
-                }
-            } else if chatItem.chatDir.sent {
+            if chatItem.chatDir.sent {
                VStack (alignment: .trailing, spacing: 6) {
                    HStack {
                        if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
@@ -65,13 +53,7 @@ struct CIVoiceView: View {
    }

    private func player() -> some View {
-        let sizeMultiplier: CGFloat = if let sz = smallViewSize {
-            voiceMessageSizeBasedOnSquareSize(sz) / 56
-        } else {
-            1
-        }
-        return VoiceMessagePlayer(
-            chat: chat,
+        VoiceMessagePlayer(
            chatItem: chatItem,
            recordingFile: recordingFile,
            recordingTime: TimeInterval(duration),
@@ -80,8 +62,7 @@ struct CIVoiceView: View {
            audioPlayer: $audioPlayer,
            playbackState: $playbackState,
            playbackTime: $playbackTime,
-            allowMenu: $allowMenu,
-            sizeMultiplier: sizeMultiplier
+            allowMenu: $allowMenu
        )
    }

@@ -91,7 +72,7 @@ struct CIVoiceView: View {
            playbackState: $playbackState,
            playbackTime: $playbackTime
        )
-        .foregroundColor(theme.colors.secondary)
+        .foregroundColor(.secondary)
    }
    
    private func playbackSlider() -> some View {
@@ -108,11 +89,10 @@ struct CIVoiceView: View {
                    allowMenu = true
                }
            }
-            .tint(theme.colors.primary)
    }

    private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+        CIMetaView(chat: chat, chatItem: chatItem)
    }
 }

@@ -137,9 +117,8 @@ struct VoiceMessagePlayerTime: View {
 }

 struct VoiceMessagePlayer: View {
-    @ObservedObject var chat: Chat
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    var chatItem: ChatItem
    var recordingFile: CIFile?
    var recordingTime: TimeInterval
@@ -149,61 +128,23 @@ struct VoiceMessagePlayer: View {
    @Binding var audioPlayer: AudioPlayer?
    @Binding var playbackState: VoiceMessagePlaybackState
    @Binding var playbackTime: TimeInterval?
-
    @Binding var allowMenu: Bool
-    var sizeMultiplier: CGFloat

    var body: some View {
        ZStack {
            if let recordingFile = recordingFile {
                switch recordingFile.fileStatus {
-                case .sndStored:
-                    if recordingFile.fileProtocol == .local {
-                        playbackButton()
-                    } else {
-                        loadingIcon()
-                    }
-                case .sndTransfer: loadingIcon()
+                case .sndStored: playbackButton()
+                case .sndTransfer: playbackButton()
                case .sndComplete: playbackButton()
                case .sndCancelled: playbackButton()
-                case let .sndError(sndFileError):
-                    fileStatusIcon("multiply", 14)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("File error"),
-                                message: Text(sndFileError.errorInfo)
-                            ))
-                        }
-                case let .sndWarning(sndFileError):
-                    fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("Temporary file error"),
-                                message: Text(sndFileError.errorInfo)
-                            ))
-                        }
-                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
+                case .sndError: playbackButton()
+                case .rcvInvitation: downloadButton(recordingFile)
                case .rcvAccepted: loadingIcon()
                case .rcvTransfer: loadingIcon()
-                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
-                case let .rcvError(rcvFileError):
-                    fileStatusIcon("multiply", 14)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("File error"),
-                                message: Text(rcvFileError.errorInfo)
-                            ))
-                        }
-                case let .rcvWarning(rcvFileError):
-                    fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("Temporary file error"),
-                                message: Text(rcvFileError.errorInfo)
-                            ))
-                        }
+                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                }
            } else {
@@ -211,170 +152,84 @@ struct VoiceMessagePlayer: View {
            }
        }
        .onAppear {
-            if audioPlayer == nil {
-                let small = sizeMultiplier != 1
-                audioPlayer = small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.audioPlayer : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.audioPlayer
-                playbackState = (small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.playbackState : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.playbackState) ?? .noPlayback
-                playbackTime = small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.playbackTime : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.playbackTime
-            }
            seek = { to in audioPlayer?.seek(to) }
-            let audioPath: URL? = if let recordingSource = getLoadedFileSource(recordingFile) {
-                getAppFilePath(recordingSource.filePath)
-            } else {
-                nil
-            }
-            let chatId = chatModel.chatId
-            let userId = chatModel.currentUser?.userId
-            audioPlayer?.onTimer = {
-                playbackTime = $0
-                notifyStateChange()
-                // Manual check here is needed because when this view is not visible, SwiftUI don't react on stopPreviousRecPlay, chatId and current user changes and audio keeps playing when it should stop
-                if (audioPath != nil && chatModel.stopPreviousRecPlay != audioPath) || chatModel.chatId != chatId || chatModel.currentUser?.userId != userId {
-                    stopPlayback()
-                }
-            }
+            audioPlayer?.onTimer = { playbackTime = $0 }
            audioPlayer?.onFinishPlayback = {
                playbackState = .noPlayback
                playbackTime = TimeInterval(0)
-                notifyStateChange()
-            }
-            // One voice message was paused, then scrolled far from it, started to play another one, drop to stopped state
-            if let audioPath, chatModel.stopPreviousRecPlay != audioPath {
-                stopPlayback()
            }
        }
        .onChange(of: chatModel.stopPreviousRecPlay) { it in
            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
-                stopPlayback()
+                audioPlayer?.stop()
+                playbackState = .noPlayback
+                playbackTime = TimeInterval(0)
            }
        }
        .onChange(of: playbackState) { state in
            allowMenu = state == .paused || state == .noPlayback
-            // Notify activeContentPreview in ChatPreviewView that playback is finished
-            if state == .noPlayback, let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
-               chatModel.stopPreviousRecPlay == getAppFilePath(recordingFileName) {
-                chatModel.stopPreviousRecPlay = nil
-            }
-        }
-        .onChange(of: chatModel.chatId) { _ in
-            stopPlayback()
-        }
-        .onDisappear {
-            if sizeMultiplier == 1 && chatModel.chatId == nil {
-                stopPlayback()
-            }
        }
    }

    @ViewBuilder private func playbackButton() -> some View {
-        if sizeMultiplier != 1 {
-            switch playbackState {
-            case .noPlayback:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
-                        if let recordingSource = getLoadedFileSource(recordingFile) {
-                            startPlayback(recordingSource)
-                        }
-                    }
-            case .playing:
-                playPauseIcon("pause.fill", theme.colors.primary)
-                    .onTapGesture {
-                        audioPlayer?.pause()
-                        playbackState = .paused
-                        notifyStateChange()
-                    }
-            case .paused:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
-                        audioPlayer?.play()
-                        playbackState = .playing
-                        notifyStateChange()
-                    }
+        switch playbackState {
+        case .noPlayback:
+            Button {
+                if let recordingSource = getLoadedFileSource(recordingFile) {
+                    startPlayback(recordingSource)
+                }
+            } label: {
+                playPauseIcon("play.fill")
            }
-        } else {
-            switch playbackState {
-            case .noPlayback:
-                Button {
-                    if let recordingSource = getLoadedFileSource(recordingFile) {
-                        startPlayback(recordingSource)
-                    }
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
-                }
-            case .playing:
-                Button {
-                    audioPlayer?.pause()
-                    playbackState = .paused
-                    notifyStateChange()
-                } label: {
-                    playPauseIcon("pause.fill", theme.colors.primary)
-                }
-            case .paused:
-                Button {
-                    audioPlayer?.play()
-                    playbackState = .playing
-                    notifyStateChange()
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
-                }
+        case .playing:
+            Button {
+                audioPlayer?.pause()
+                playbackState = .paused
+            } label: {
+                playPauseIcon("pause.fill")
+            }
+        case .paused:
+            Button {
+                audioPlayer?.play()
+                playbackState = .playing
+            } label: {
+                playPauseIcon("play.fill")
            }
        }
    }

-    private func playPauseIcon(_ image: String, _ color: Color/* = .accentColor*/) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
        ZStack {
            Image(systemName: image)
                .resizable()
                .aspectRatio(contentMode: .fit)
-                .frame(width: 20 * sizeMultiplier, height: 20 * sizeMultiplier)
+                .frame(width: 20, height: 20)
                .foregroundColor(color)
                .padding(.leading, image == "play.fill" ? 4 : 0)
-                .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-                .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
+                .frame(width: 56, height: 56)
+                .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
                .clipShape(Circle())
            if recordingTime > 0 {
                ProgressCircle(length: recordingTime, progress: $playbackTime)
-                    .frame(width: 53 * sizeMultiplier, height: 53 * sizeMultiplier) // this + ProgressCircle lineWidth = background circle diameter
+                    .frame(width: 53, height: 53) // this + ProgressCircle lineWidth = background circle diameter
            }
        }
    }

-    private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
-        Group {
-            if sizeMultiplier != 1 {
-                playPauseIcon(icon, theme.colors.primary)
-                    .onTapGesture {
-                        Task {
-                            if let user = chatModel.currentUser {
-                                await receiveFile(user: user, fileId: recordingFile.fileId)
-                            }
-                        }
-                    }
-            } else {
-                Button {
-                    Task {
-                        if let user = chatModel.currentUser {
-                            await receiveFile(user: user, fileId: recordingFile.fileId)
-                        }
-                    }
-                } label: {
-                    playPauseIcon(icon, theme.colors.primary)
+    private func downloadButton(_ recordingFile: CIFile) -> some View {
+        Button {
+            Task {
+                if let user = chatModel.currentUser {
+                    await receiveFile(user: user, fileId: recordingFile.fileId)
                }
            }
-        }
-    }
-
-    func notifyStateChange() {
-        if sizeMultiplier != 1 {
-            VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)] = VoiceItemState(audioPlayer: audioPlayer, playbackState: playbackState, playbackTime: playbackTime)
-        } else {
-            VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)] = VoiceItemState(audioPlayer: audioPlayer, playbackState: playbackState, playbackTime: playbackTime)
+        } label: {
+            playPauseIcon("play.fill")
        }
    }

    private struct ProgressCircle: View {
-        @EnvironmentObject var theme: AppTheme
        var length: TimeInterval
        @Binding var progress: TimeInterval?

@@ -382,7 +237,7 @@ struct VoiceMessagePlayer: View {
            Circle()
                .trim(from: 0, to: ((progress ?? TimeInterval(0)) / length))
                .stroke(
-                    theme.colors.primary,
+                    Color.accentColor,
                    style: StrokeStyle(lineWidth: 3)
                )
                .rotationEffect(.degrees(-90))
@@ -390,100 +245,26 @@ struct VoiceMessagePlayer: View {
        }
    }

-    private func fileStatusIcon(_ image: String, _ size: CGFloat) -> some View {
-        Image(systemName: image)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .frame(width: size * sizeMultiplier, height: size * sizeMultiplier)
-            .foregroundColor(Color(uiColor: .tertiaryLabel))
-            .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
-            .clipShape(Circle())
-    }
-
    private func loadingIcon() -> some View {
        ProgressView()
-            .frame(width: 30 * sizeMultiplier, height: 30 * sizeMultiplier)
-            .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
+            .frame(width: 30, height: 30)
+            .frame(width: 56, height: 56)
+            .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
            .clipShape(Circle())
    }

    private func startPlayback(_ recordingSource: CryptoFile) {
-        let audioPath = getAppFilePath(recordingSource.filePath)
-        let chatId = chatModel.chatId
-        let userId = chatModel.currentUser?.userId
-        chatModel.stopPreviousRecPlay = audioPath
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
        audioPlayer = AudioPlayer(
-            onTimer: {
-                playbackTime = $0
-                notifyStateChange()
-                // Manual check here is needed because when this view is not visible, SwiftUI don't react on stopPreviousRecPlay, chatId and current user changes and audio keeps playing when it should stop
-                if chatModel.stopPreviousRecPlay != audioPath || chatModel.chatId != chatId || chatModel.currentUser?.userId != userId {
-                    stopPlayback()
-                }
-            },
+            onTimer: { playbackTime = $0 },
            onFinishPlayback: {
                playbackState = .noPlayback
                playbackTime = TimeInterval(0)
-                notifyStateChange()
            }
        )
        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
        playbackState = .playing
-        notifyStateChange()
    }
-
-    private func stopPlayback() {
-        audioPlayer?.stop()
-        playbackState = .noPlayback
-        playbackTime = TimeInterval(0)
-        notifyStateChange()
-    }
-}
-
-func voiceMessageSizeBasedOnSquareSize(_ squareSize: CGFloat) -> CGFloat {
-    let squareToCircleRatio = 0.935
-    return squareSize + squareSize * (1 - squareToCircleRatio)
-}
-
-class VoiceItemState {
-    var audioPlayer: AudioPlayer?
-    var playbackState: VoiceMessagePlaybackState
-    var playbackTime: TimeInterval?
-
-    init(audioPlayer: AudioPlayer? = nil, playbackState: VoiceMessagePlaybackState, playbackTime: TimeInterval? = nil) {
-        self.audioPlayer = audioPlayer
-        self.playbackState = playbackState
-        self.playbackTime = playbackTime
-    }
-
-    static func id(_ chat: Chat, _ chatItem: ChatItem) -> String {
-        "\(chat.id) \(chatItem.id)"
-    }
-
-    static func id(_ chatInfo: ChatInfo, _ chatItem: ChatItem) -> String {
-        "\(chatInfo.id) \(chatItem.id)"
-    }
-
-    static func stopVoiceInSmallView(_ chatInfo: ChatInfo, _ chatItem: ChatItem) {
-        let id = id(chatInfo, chatItem)
-        if let item = smallView[id] {
-            item.audioPlayer?.stop()
-            ChatModel.shared.stopPreviousRecPlay = nil
-        }
-    }
-
-    static func stopVoiceInChatView(_ chatInfo: ChatInfo, _ chatItem: ChatItem) {
-        let id = id(chatInfo, chatItem)
-        if let item = chatView[id] {
-            item.audioPlayer?.stop()
-            ChatModel.shared.stopPreviousRecPlay = nil
-        }
-    }
-
-    static var smallView: [String: VoiceItemState] = [:]
-    static var chatView: [String: VoiceItemState] = [:]
 }

 struct CIVoiceView_Previews: PreviewProvider {
@@ -508,12 +289,15 @@ struct CIVoiceView_Previews: PreviewProvider {
                chatItem: ChatItem.getVoiceMsgContentSample(),
                recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                duration: 30,
+                audioPlayer: .constant(nil),
+                playbackState: .constant(.playing),
+                playbackTime: .constant(TimeInterval(20)),
                allowMenu: Binding.constant(true)
            )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
        }
        .previewLayout(.fixed(width: 360, height: 360))
    }
@@ -10,21 +10,22 @@ import SwiftUI
 import SimpleXChat

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

    var body: some View {
        HStack(alignment: .bottom, spacing: 0) {
            Text(chatItem.content.text)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
                .italic()
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .padding(.leading, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
        .textSelection(.disabled)
    }
 }
@@ -11,7 +11,6 @@ import SimpleXChat

 struct EmojiItemView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem

    var body: some View {
@@ -19,7 +18,7 @@ struct EmojiItemView: View {
            emojiText(chatItem.content.text)
                .padding(.top, 8)
                .padding(.horizontal, 6)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.bottom, 8)
                .padding(.horizontal, 12)
        }
@@ -12,24 +12,21 @@ import SwiftUI
 import SimpleXChat

 struct FramedCIVoiceView: View {
-    @EnvironmentObject var theme: AppTheme
-    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    let recordingFile: CIFile?
    let duration: Int
-
-    @State var audioPlayer: AudioPlayer? = nil
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval? = nil
-
+    
    @Binding var allowMenu: Bool
-
+    
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
+    
    @State private var seek: (TimeInterval) -> Void = { _ in }
    
    var body: some View {
        HStack {
            VoiceMessagePlayer(
-                chat: chat,
                chatItem: chatItem,
                recordingFile: recordingFile,
                recordingTime: TimeInterval(duration),
@@ -38,15 +35,14 @@ struct FramedCIVoiceView: View {
                audioPlayer: $audioPlayer,
                playbackState: $playbackState,
                playbackTime: $playbackTime,
-                allowMenu: $allowMenu,
-                sizeMultiplier: 1
+                allowMenu: $allowMenu
            )
            VoiceMessagePlayerTime(
                recordingTime: TimeInterval(duration),
                playbackState: $playbackState,
                playbackTime: $playbackTime
            )
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
            .frame(width: 50, alignment: .leading)
            if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
                playbackSlider()
@@ -13,12 +13,12 @@ import AVKit

 struct FullScreenMediaView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
    @State var chatItem: ChatItem
    @State var image: UIImage?
    @State var player: AVPlayer? = nil
    @State var url: URL? = nil
    @Binding var showView: Bool
+    @State var scrollProxy: ScrollViewProxy?
    @State private var showNext = false
    @State private var nextImage: UIImage?
    @State private var nextPlayer: AVPlayer?
@@ -71,7 +71,9 @@ struct FullScreenMediaView: View {
                let w = abs(t.width)
                if t.height > 60 && t.height > w * 2  {
                    showView = false
-                    scrollModel.scrollToItem(id: chatItem.id)
+                    if let proxy = scrollProxy {
+                        proxy.scrollTo(chatItem.viewId)
+                    }
                } else if w > 60 && w > abs(t.height) * 2 && !scrolling {
                    let previous = t.width > 0
                    scrolling = true
@@ -11,7 +11,6 @@ import SimpleXChat

 struct IntegrityErrorItemView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var msgError: MsgErrorType
    var chatItem: ChatItem

@@ -55,7 +54,6 @@ struct IntegrityErrorItemView: View {

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

@@ -64,12 +62,13 @@ struct CIMsgError: View {
            Text(chatItem.content.text)
                .foregroundColor(.red)
                .italic()
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                .padding(.horizontal, 12)
        }
        .padding(.leading, 12)
        .padding(.vertical, 6)
        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
        .textSelection(.disabled)
        .onTapGesture(perform: onTap)
    }
@@ -11,7 +11,7 @@ import SimpleXChat

 struct MarkedDeletedItemView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    @Binding var revealed: Bool
@@ -19,10 +19,11 @@ struct MarkedDeletedItemView: View {
    var body: some View {
        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
        .font(.caption)
-        .foregroundColor(theme.colors.secondary)
+        .foregroundColor(.secondary)
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
        .textSelection(.disabled)
    }

@@ -35,8 +36,8 @@ struct MarkedDeletedItemView: View {
            var blockedByAdmin = 0
            var deleted = 0
            var moderatedBy: Set<String> = []
-            while i < ItemsModel.shared.reversedChatItems.count,
-                  let ci = .some(ItemsModel.shared.reversedChatItems[i]),
+            while i < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
                  ci.mergeCategory == ciCategory,
                  let itemDeleted = ci.meta.itemDeleted {
                switch itemDeleted {
@@ -26,7 +26,6 @@ private func typing(_ w: Font.Weight = .light) -> Text {

 struct MsgContentView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var text: String
    var formattedText: [FormattedText]? = nil
    var sender: String? = nil
@@ -36,8 +35,6 @@ struct MsgContentView: View {
    @State private var typingIdx = 0
    @State private var timer: Timer?

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

    private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary)
+        var v = messageText(text, formattedText, sender, showSecrets: showSecrets)
        if let mt = meta {
            if mt.isLive {
                v = v + typingIndicator(mt.recent)
@@ -80,15 +77,15 @@ struct MsgContentView: View {
        return (recent ? typingIndicators[typingIdx] : noTyping)
            .font(.body.monospaced())
            .kerning(-2)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
    }

    private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+        (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, showSecrets: Bool, secondaryColor: Color) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
    let s = text
    var res: Text
    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
@@ -103,7 +100,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
    }

    if let i = icon {
-        res = Text(Image(systemName: i)).foregroundColor(secondaryColor) + Text(" ") + res
+        res = Text(Image(systemName: i)).foregroundColor(Color(uiColor: .tertiaryLabel)) + Text(" ") + res
    }

    if let s = sender {
@@ -1,131 +0,0 @@
-//
-//  ChatItemForwardingView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 12.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ChatItemForwardingView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.dismiss) var dismiss
-
-    var ci: ChatItem
-    var fromChatInfo: ChatInfo
-    @Binding var composeState: ComposeState
-
-    @State private var searchText: String = ""
-    @FocusState private var searchFocused
-    @State private var alert: SomeAlert?
-    private let chatsToForwardTo = filterChatsToForwardTo(chats: ChatModel.shared.chats)
-
-    var body: some View {
-        NavigationView {
-            forwardListView()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarLeading) {
-                        Button("Cancel") {
-                            dismiss()
-                        }
-                    }
-                    ToolbarItem(placement: .principal) {
-                        Text("Forward")
-                            .bold()
-                    }
-                }
-        }
-        .modifier(ThemedBackground())
-        .alert(item: $alert) { $0.alert }
-    }
-
-    @ViewBuilder private func forwardListView() -> some View {
-        VStack(alignment: .leading) {
-            if !chatsToForwardTo.isEmpty {
-                List {
-                    searchFieldView(text: $searchText, focussed: $searchFocused, theme.colors.onBackground, theme.colors.secondary)
-                        .padding(.leading, 2)
-                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
-                    ForEach(chats) { chat in
-                        forwardListChatView(chat)
-                            .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
-                    }
-                }
-                .modifier(ThemedBackground(grouped: true))
-            } else {
-                ZStack {
-                    emptyList()
-                }
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .modifier(ThemedBackground())
-            }
-        }
-    }
-
-    private func emptyList() -> some View {
-        Text("No filtered chats")
-            .foregroundColor(theme.colors.secondary)
-            .frame(maxWidth: .infinity)
-    }
-
-    @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
-        let prohibited = chat.prohibitedByPref(
-            hasSimplexLink: hasSimplexLink(ci.content.msgContent?.text),
-            isMediaOrFileAttachment: ci.content.msgContent?.isMediaOrFileAttachment ?? false,
-            isVoice: ci.content.msgContent?.isVoice ?? false
-        )
-        Button {
-            if prohibited {
-                alert = SomeAlert(
-                    alert: mkAlert(
-                        title: "Cannot forward message",
-                        message: "Selected chat preferences prohibit this message."
-                    ),
-                    id: "forward prohibited by preferences"
-                )
-            } else {
-                dismiss()
-                if chat.id == fromChatInfo.id {
-                    composeState = ComposeState(
-                        message: composeState.message,
-                        preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                        contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
-                    )
-                } else {
-                    composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                    ItemsModel.shared.loadOpenChat(chat.id)
-                }
-            }
-        } label: {
-            HStack {
-                ChatInfoImage(chat: chat, size: 30)
-                    .padding(.trailing, 2)
-                Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(prohibited ? theme.colors.secondary : theme.colors.onBackground)
-                    .lineLimit(1)
-                if chat.chatInfo.incognito {
-                    Spacer()
-                    Image(systemName: "theatermasks")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(theme.colors.secondary)
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-}
-
-#Preview {
-    ChatItemForwardingView(
-        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
-        fromChatInfo: .direct(contact: Contact.sampleData),
-        composeState: Binding.constant(ComposeState(message: "hello"))
-    ).environmentObject(CurrentColors.toAppTheme())
-}
-
@@ -11,20 +11,16 @@ import SimpleXChat

 struct ChatItemInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    var ci: ChatItem
    @Binding var chatItemInfo: ChatItemInfo?
    @State private var selection: CIInfoTab = .history
    @State private var alert: CIInfoViewAlert? = nil
-    @State private var messageStatusLimited: Bool = true
-    @State private var fileStatusLimited: Bool = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

    enum CIInfoTab {
        case history
        case quote
-        case forwarded
        case delivery
    }

@@ -72,20 +68,9 @@ struct ChatItemInfoView: View {
        if ci.quotedItem != nil {
            numTabs += 1
        }
-        if chatItemInfo?.forwardedFromChatItem != nil {
-            numTabs += 1
-        }
        return numTabs
    }

-    private var local: Bool {
-        switch ci.chatDir {
-        case .localSnd: true
-        case .localRcv: true
-        default: false
-        }
-    }
-
    @ViewBuilder private func itemInfoView() -> some View {
        if numTabs > 1 {
            TabView(selection: $selection) {
@@ -101,22 +86,12 @@ struct ChatItemInfoView: View {
                        Label("History", systemImage: "clock")
                    }
                    .tag(CIInfoTab.history)
-                    .modifier(ThemedBackground())
                if let qi = ci.quotedItem {
                    quoteTab(qi)
                        .tabItem {
                            Label("In reply to", systemImage: "arrowshape.turn.up.left")
                        }
                        .tag(CIInfoTab.quote)
-                        .modifier(ThemedBackground())
-                }
-                if let forwardedFromItem = chatItemInfo?.forwardedFromChatItem {
-                    forwardedFromTab(forwardedFromItem)
-                        .tabItem {
-                            Label(local ? "Saved" : "Forwarded", systemImage: "arrowshape.turn.up.forward")
-                        }
-                        .tag(CIInfoTab.forwarded)
-                        .modifier(ThemedBackground())
                }
            }
            .onAppear {
@@ -126,7 +101,6 @@ struct ChatItemInfoView: View {
            }
        } else {
            historyTab()
-            .modifier(ThemedBackground())
        }
    }

@@ -163,35 +137,6 @@ struct ChatItemInfoView: View {
            if developerTools {
                infoRow("Database ID", "\(meta.itemId)")
                infoRow("Record updated at", localTimestamp(meta.updatedAt))
-                let msv = infoRow("Message status", ci.meta.itemStatus.id)
-                Group {
-                    if messageStatusLimited {
-                        msv.lineLimit(1)
-                    } else {
-                        msv
-                    }
-                }
-                .onTapGesture {
-                    withAnimation {
-                        messageStatusLimited.toggle()
-                    }
-                }
-
-                if let file = ci.file {
-                    let fsv = infoRow("File status", file.fileStatus.id)
-                    Group {
-                        if fileStatusLimited {
-                            fsv.lineLimit(1)
-                        } else {
-                            fsv
-                        }
-                    }
-                    .onTapGesture {
-                        withAnimation {
-                            fileStatusLimited.toggle()
-                        }
-                    }
-                }
            }
        }
    }
@@ -216,7 +161,7 @@ struct ChatItemInfoView: View {
                    }
                    else {
                        Text("No history")
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                            .frame(maxWidth: .infinity)
                    }
                }
@@ -231,8 +176,8 @@ struct ChatItemInfoView: View {
            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, theme))
-                .modifier(ChatItemClipped())
+                .background(chatItemFrameColor(ci, colorScheme))
+                .cornerRadius(18)
                .contextMenu {
                    if itemVersion.msgContent.text != "" {
                        Button {
@@ -262,19 +207,18 @@ struct ChatItemInfoView: View {
        } else {
            Text("no text")
                .italic()
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
        }
    }

    private struct TextBubble: View {
-        @EnvironmentObject var theme: AppTheme
        var text: String
        var formattedText: [FormattedText]?
        var sender: String? = nil
        @State private var showSecrets = false

        var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary))
+            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets))
        }
    }

@@ -301,8 +245,8 @@ struct ChatItemInfoView: View {
            textBubble(qi.text, qi.formattedText, qi.getSender(nil))
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
-                .background(quotedMsgFrameColor(qi, theme))
-                .modifier(ChatItemClipped())
+                .background(quotedMsgFrameColor(qi, colorScheme))
+                .cornerRadius(18)
                .contextMenu {
                    if qi.text != "" {
                        Button {
@@ -325,78 +269,10 @@ struct ChatItemInfoView: View {
        .frame(maxWidth: maxWidth, alignment: .leading)
    }

-    func quotedMsgFrameColor(_ qi: CIQuote, _ theme: AppTheme) -> Color {
+    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
        (qi.chatDir?.sent ?? false)
-        ? theme.appColors.sentMessage
-        : theme.appColors.receivedMessage
-    }
-
-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 16) {
-                details()
-                Divider().padding(.vertical)
-                Text(local ? "Saved from" : "Forwarded from")
-                    .font(.title2)
-                    .padding(.bottom, 4)
-                forwardedFromView(forwardedFromItem)
-            }
-            .padding()
-        }
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    private func forwardedFromView(_ forwardedFromItem: AChatItem) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Button {
-                Task {
-                    await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
-                        dismiss()
-                    }
-                }
-            } label: {
-                forwardedFromSender(forwardedFromItem)
-            }
-
-            if !local {
-                Divider().padding(.top, 32)
-                Text("Recipient(s) can't see who this message is from.")
-                    .font(.caption)
-                    .foregroundColor(theme.colors.secondary)
-            }
-        }
-    }
-
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
-        HStack {
-            ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
-                .padding(.trailing, 6)
-
-            if forwardedFromItem.chatItem.chatDir.sent {
-                VStack(alignment: .leading) {
-                    Text("you")
-                        .italic()
-                        .foregroundColor(theme.colors.onBackground)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(theme.colors.secondary)
-                        .lineLimit(1)
-                }
-            } else if case let .groupRcv(groupMember) = forwardedFromItem.chatItem.chatDir {
-                VStack(alignment: .leading) {
-                    Text(groupMember.chatViewName)
-                        .foregroundColor(theme.colors.onBackground)
-                        .lineLimit(1)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(theme.colors.secondary)
-                        .lineLimit(1)
-                }
-            } else {
-                Text(forwardedFromItem.chatInfo.chatViewName)
-                    .foregroundColor(theme.colors.onBackground)
-                    .lineLimit(1)
-            }
-        }
+        ? (colorScheme == .light ? sentColorLight : sentColorDark)
+        : Color(uiColor: .tertiarySystemGroupedBackground)
    }

    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
@@ -415,54 +291,55 @@ struct ChatItemInfoView: View {
    }

    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
-        LazyVStack(alignment: .leading, spacing: 12) {
+        VStack(alignment: .leading, spacing: 12) {
            let mss = membersStatuses(memberDeliveryStatuses)
            if !mss.isEmpty {
                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
                }
            } else {
                Text("No delivery information")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            }
        }
    }

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

-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: GroupSndStatus, _ sentViaProxy: Bool?) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
        HStack{
-            MemberProfileImage(member, size: 30)
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
                .padding(.trailing, 2)
            Text(member.chatViewName)
                .lineLimit(1)
            Spacer()
-            if sentViaProxy == true {
-                Image(systemName: "arrow.forward")
-                    .foregroundColor(theme.colors.secondary).opacity(0.67)
-            }
            let v = Group {
-                let (icon, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary)
-                switch status {
-                case .rcvd:
-                    ZStack(alignment: .trailing) {
+                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.opacity(0.67))
-                            .padding(.trailing, 6)
-                        Image(systemName: icon)
-                            .foregroundColor(statusColor.opacity(0.67))
+                            .foregroundColor(statusColor)
                    }
-                default:
-                    Image(systemName: icon)
-                        .foregroundColor(statusColor)
+                } else {
+                    Image(systemName: "ellipsis")
+                        .foregroundColor(Color.secondary)
                }
            }

@@ -505,12 +382,8 @@ struct ChatItemInfoView: View {
        if developerTools {
            shareText += [
                String.localizedStringWithFormat(NSLocalizedString("Database ID: %d", comment: "copied message info"), meta.itemId),
-                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt)),
-                String.localizedStringWithFormat(NSLocalizedString("Message status: %@", comment: "copied message info"), meta.itemStatus.id)
+                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt))
            ]
-            if let file = ci.file {
-                shareText += [String.localizedStringWithFormat(NSLocalizedString("File status: %@", comment: "copied message info"), file.fileStatus.id)]
-            }
        }
        if let qi = ci.quotedItem {
            shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]
@@ -11,36 +11,46 @@ import SimpleXChat

 struct ChatItemView: View {
    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    var maxWidth: CGFloat = .infinity
+    @State var scrollProxy: ScrollViewProxy? = nil
    @Binding var revealed: Bool
    @Binding var allowMenu: Bool
-
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
    init(
        chat: Chat,
        chatItem: ChatItem,
        showMember: Bool = false,
        maxWidth: CGFloat = .infinity,
+        scrollProxy: ScrollViewProxy? = nil,
        revealed: Binding<Bool>,
-        allowMenu: Binding<Bool> = .constant(false)
+        allowMenu: Binding<Bool> = .constant(false),
+        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
+        playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback),
+        playbackTime: Binding<TimeInterval?> = .constant(nil)
    ) {
        self.chat = chat
        self.chatItem = chatItem
        self.maxWidth = maxWidth
+        _scrollProxy = .init(initialValue: scrollProxy)
        _revealed = revealed
        _allowMenu = allowMenu
+        _audioPlayer = audioPlayer
+        _playbackState = playbackState
+        _playbackTime = playbackTime
    }

    var body: some View {
        let ci = chatItem
        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
-        } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
+        } 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(chat: chat, chatItem: ci)
            } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu)
+                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
            } else if ci.content.msgContent == nil {
                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
@@ -52,38 +62,12 @@ struct ChatItemView: View {
    }

    private func framedItemView() -> some View {
-        let preview = chatItem.content.msgContent
-            .flatMap {
-                switch $0 {
-                case let .image(_, image): image
-                case let .video(_, image, _): image
-                default: nil
-                }
-            }
-            .flatMap { UIImage(base64Encoded: $0) }
-        let adjustedMaxWidth = {
-            if let preview, preview.size.width <= preview.size.height {
-                maxWidth * 0.75
-            } else {
-                maxWidth
-            }
-        }()
-        return FramedItemView(
-            chat: chat,
-            chatItem: chatItem,
-            preview: preview,
-            revealed: $revealed,
-            maxWidth: maxWidth,
-            imgWidth: adjustedMaxWidth,
-            videoWidth: adjustedMaxWidth,
-            allowMenu: $allowMenu
-        )
+        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
    }
 }

 struct ChatItemContentView<Content: View>: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    @Binding var revealed: Bool
@@ -113,14 +97,14 @@ struct ChatItemContentView<Content: View>: View {
        case .sndGroupEvent: eventItemView()
        case .rcvConnEvent: eventItemView()
        case .sndConnEvent: eventItemView()
-        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor(theme.colors.secondary))
-        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor(theme.colors.secondary))
+        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
+        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
        case let .rcvChatPreference(feature, allowed, param):
            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
        case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
-        case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
-        case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
+            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
+        case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
+        case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
        case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
        case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
        case .sndModerated: deletedItemView()
@@ -143,29 +127,29 @@ struct ChatItemContentView<Content: View>: View {
    }

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

    private func eventItemView() -> some View {
-        CIEventView(eventText: eventItemViewText(theme.colors.secondary))
+        return CIEventView(eventText: eventItemViewText())
    }

-    private func eventItemViewText(_ secondaryColor: Color) -> Text {
+    private func eventItemViewText() -> Text {
        if !revealed, let t = mergedGroupEventText {
-            return chatEventText(t + Text(" ") + chatItem.timestampText, secondaryColor)
+            return chatEventText(t + Text(" ") + chatItem.timestampText)
        } else if let member = chatItem.memberDisplayName {
            return Text(member + " ")
                    .font(.caption)
-                    .foregroundColor(secondaryColor)
+                    .foregroundColor(.secondary)
                    .fontWeight(.light)
-                + chatEventText(chatItem, secondaryColor)
+                + chatEventText(chatItem)
        } else {
-            return chatEventText(chatItem, secondaryColor)
+            return chatEventText(chatItem)
        }
    }

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

    private var mergedGroupEventText: Text? {
@@ -195,7 +179,7 @@ struct ChatItemContentView<Content: View>: View {
        info.pqEnabled
        ? Text("Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.")
            .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
            .fontWeight(.light)
        : e2eeInfoNoPQText()
    }
@@ -203,24 +187,24 @@ struct ChatItemContentView<Content: View>: View {
    private func e2eeInfoNoPQText() -> Text {
        Text("Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.")
            .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
            .fontWeight(.light)
    }
 }

-func chatEventText(_ text: Text, _ secondaryColor: Color) -> Text {
+func chatEventText(_ text: Text) -> Text {
    text
        .font(.caption)
-        .foregroundColor(secondaryColor)
+        .foregroundColor(.secondary)
        .fontWeight(.light)
 }

-func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text, _ secondaryColor: Color) -> Text {
-    chatEventText(Text(eventText) + Text(" ") + ts, secondaryColor)
+func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
+    chatEventText(Text(eventText) + Text(" ") + ts)
 }

-func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
-    chatEventText("\(ci.content.text)", ci.timestampText, secondaryColor)
+func chatEventText(_ ci: ChatItem) -> Text {
+    chatEventText("\(ci.content.text)", ci.timestampText)
 }

 struct ChatItemView_Previews: PreviewProvider {
@@ -9,7 +9,7 @@
 import SwiftUI

 struct ComposeFileView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    let fileName: String
    let cancelFile: (() -> Void)
    let cancelEnabled: Bool
@@ -32,8 +32,9 @@ struct ComposeFileView: View {
        }
        .padding(.vertical, 1)
        .padding(.trailing, 12)
-        .frame(height: 54)
-        .background(theme.appColors.sentMessage)
+        .frame(height: 50)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
        .frame(maxWidth: .infinity)
+        .padding(.top, 8)
    }
 }
@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat

 struct ComposeImageView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    let images: [String]
    let cancelImage: (() -> Void)
    let cancelEnabled: Bool
@@ -18,7 +18,10 @@ struct ComposeImageView: View {
    var body: some View {
        HStack(alignment: .center, spacing: 8) {
            let imgs: [UIImage] = images.compactMap { image in
-                UIImage(base64Encoded: image)
+                if let data = Data(base64Encoded: dropImagePrefix(image)) {
+                    return UIImage(data: data)
+                }
+                return nil
            }
            if imgs.count == 0 {
                ProgressView()
@@ -45,9 +48,9 @@ struct ComposeImageView: View {
        }
        .padding(.vertical, 1)
        .padding(.trailing, 12)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
        .frame(maxWidth: .infinity)
+        .padding(.top, 8)
    }
 }

@@ -10,8 +10,37 @@ import SwiftUI
 import LinkPresentation
 import SimpleXChat

+func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
+    logger.debug("getLinkMetadata: fetching URL preview")
+    LPMetadataProvider().startFetchingMetadata(for: url){ metadata, error in
+        if let e = error {
+            logger.error("Error retrieving link metadata: \(e.localizedDescription)")
+        }
+        if let metadata = metadata,
+           let imageProvider = metadata.imageProvider,
+           imageProvider.canLoadObject(ofClass: UIImage.self) {
+            imageProvider.loadObject(ofClass: UIImage.self){ object, error in
+                var linkPreview: LinkPreview? = nil
+                if let error = error {
+                    logger.error("Couldn't load image preview from link metadata with error: \(error.localizedDescription)")
+                } else {
+                    if let image = object as? UIImage,
+                       let resized = resizeImageToStrSize(image, maxDataSize: 14000),
+                       let title = metadata.title,
+                       let uri = metadata.originalURL {
+                        linkPreview = LinkPreview(uri: uri, title: title, image: resized)
+                    }
+                }
+                cb(linkPreview)
+            }
+        } else {
+            cb(nil)
+        }
+    }
+}
+
 struct ComposeLinkView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    let linkPreview: LinkPreview?
    var cancelPreview: (() -> Void)? = nil
    let cancelEnabled: Bool
@@ -33,14 +62,15 @@ struct ComposeLinkView: View {
        }
        .padding(.vertical, 1)
        .padding(.trailing, 12)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
        .frame(maxWidth: .infinity)
+        .padding(.top, 8)
    }

    private func linkPreviewView(_ linkPreview: LinkPreview) -> some View {
        HStack(alignment: .center, spacing: 8) {
-            if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+            if let data = Data(base64Encoded: dropImagePrefix(linkPreview.image)),
+               let uiImage = UIImage(data: data) {
                Image(uiImage: uiImage)
                    .resizable()
                    .aspectRatio(contentMode: .fit)
@@ -52,10 +82,10 @@ struct ComposeLinkView: View {
                Text(linkPreview.uri.absoluteString)
                    .font(.caption)
                    .lineLimit(1)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            }
            .padding(.vertical, 5)
-            .frame(maxWidth: .infinity, minHeight: 60)
+            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
        }
    }
 }
@@ -23,7 +23,6 @@ enum ComposeContextItem {
    case noContextItem
    case quotedItem(chatItem: ChatItem)
    case editingItem(chatItem: ChatItem)
-    case forwardingItem(chatItem: ChatItem, fromChatInfo: ChatInfo)
 }

 enum VoiceMessageRecordingState {
@@ -73,13 +72,6 @@ struct ComposeState {
        }
    }

-    init(forwardingItem: ChatItem, fromChatInfo: ChatInfo) {
-        self.message = ""
-        self.preview = .noPreview
-        self.contextItem = .forwardingItem(chatItem: forwardingItem, fromChatInfo: fromChatInfo)
-        self.voiceMessageRecordingState = .noRecording
-    }
-
    func copy(
        message: String? = nil,
        liveMessage: LiveMessage? = nil,
@@ -110,19 +102,12 @@ struct ComposeState {
        }
    }

-    var forwarding: Bool {
-        switch contextItem {
-        case .forwardingItem: return true
-        default: return false
-        }
-    }
-
    var sendEnabled: Bool {
        switch preview {
        case let .mediaPreviews(media): return !media.isEmpty
        case .voicePreview: return voiceMessageRecordingState == .finished
        case .filePreview: return true
-        default: return !message.isEmpty || forwarding || liveMessage != nil
+        default: return !message.isEmpty || liveMessage != nil
        }
    }

@@ -168,7 +153,7 @@ struct ComposeState {
    }

    var attachmentDisabled: Bool {
-        if editing || forwarding || liveMessage != nil || inProgress { return true }
+        if editing || liveMessage != nil || inProgress { return true }
        switch preview {
        case .noPreview: return false
        case .linkPreview: return false
@@ -176,16 +161,6 @@ struct ComposeState {
        }
    }

-    var attachmentPreview: Bool {
-        switch preview {
-        case .noPreview: false
-        case .linkPreview: false
-        case let .mediaPreviews(mediaPreviews): !mediaPreviews.isEmpty
-        case .voicePreview: false
-        case .filePreview: true
-        }
-    }
-
    var empty: Bool {
        message == "" && noPreview
    }
@@ -254,13 +229,11 @@ enum UploadContent: Equatable {

 struct ComposeView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    @Binding var composeState: ComposeState
    @Binding var keyboardVisible: Bool

    @State var linkUrl: URL? = nil
-    @State var hasSimplexLink: Bool = false
    @State var prevLinkUrl: URL? = nil
    @State var pendingLinkUrl: URL? = nil
    @State var cancelledLinks: Set<String> = []
@@ -281,28 +254,11 @@ struct ComposeView: View {
    @State private var stopPlayback: Bool = false

    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

    var body: some View {
        VStack(spacing: 0) {
-            Divider()
            if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                ContextInvitingContactMemberView()
-                Divider()
-            }
-            // preference checks should match checks in forwarding list
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
-            let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
-            if simplexLinkProhibited {
-                msgNotAllowedView("SimpleX links not allowed", icon: "link")
-                Divider()
-            } else if fileProhibited {
-                msgNotAllowedView("Files and media not allowed", icon: "doc")
-                Divider()
-            } else if voiceProhibited {
-                msgNotAllowedView("Voice messages not allowed", icon: "mic")
-                Divider()
            }
            contextItemView()
            switch (composeState.editing, composeState.preview) {
@@ -321,9 +277,8 @@ struct ComposeView: View {
                .frame(width: 25, height: 25)
                .padding(.bottom, 12)
                .padding(.leading, 12)
-                .tint(theme.colors.primary)
                if case let .group(g) = chat.chatInfo,
-                   !g.fullGroupPreferences.files.on(for: g.membership) {
+                   !g.fullGroupPreferences.files.on {
                    b.disabled(true).onTapGesture {
                        AlertManager.shared.showAlertMsg(
                            title: "Files and media prohibited!",
@@ -348,7 +303,6 @@ struct ComposeView: View {
                        },
                        nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                        voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
-                        disableSendButton: simplexLinkProhibited || fileProhibited || voiceProhibited,
                        showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                        startVoiceMessageRecording: {
                            Task {
@@ -362,15 +316,16 @@ struct ComposeView: View {
                        keyboardVisible: $keyboardVisible,
                        sendButtonColor: chat.chatInfo.incognito
                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : theme.colors.primary
+                            : .accentColor
                    )
                    .padding(.trailing, 12)
+                    .background(.background)
                    .disabled(!chat.userCanSend)

                    if chat.userIsObserver {
                        Text("you are observer")
                            .italic()
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                            .padding(.horizontal, 12)
                            .onTapGesture {
                                AlertManager.shared.showAlertMsg(
@@ -382,23 +337,13 @@ struct ComposeView: View {
                }
            }
        }
-        .background {
-            Color.clear
-                .overlay(ToolbarMaterial.material(toolbarMaterial))
-                .ignoresSafeArea(.all, edges: .bottom)
-        }
-        .onChange(of: composeState.message) { msg in
+        .onChange(of: composeState.message) { _ in
            if composeState.linkPreviewAllowed {
-                if msg.count > 0 {
-                    showLinkPreview(msg)
+                if composeState.message.count > 0 {
+                    showLinkPreview(composeState.message)
                } else {
                    resetLinkPreview()
-                    hasSimplexLink = false
                }
-            } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
-            } else {
-                hasSimplexLink = false
            }
        }
        .onChange(of: chat.userCanSend) { canSend in
@@ -635,7 +580,6 @@ struct ComposeView: View {
                cancelPreview: cancelLinkPreview,
                cancelEnabled: !composeState.inProgress
            )
-            Divider()
        case let .mediaPreviews(mediaPreviews: media):
            ComposeImageView(
                images: media.map { (img, _) in img },
@@ -644,7 +588,6 @@ struct ComposeView: View {
                    chosenMedia = []
                },
                cancelEnabled: !composeState.editing && !composeState.inProgress)
-            Divider()
        case let .voicePreview(recordingFileName, _):
            ComposeVoiceView(
                recordingFileName: recordingFileName,
@@ -657,7 +600,6 @@ struct ComposeView: View {
                cancelEnabled: !composeState.editing && !composeState.inProgress,
                stopPlayback: $stopPlayback
            )
-            Divider()
        case let .filePreview(fileName, _):
            ComposeFileView(
                fileName: fileName,
@@ -665,21 +607,9 @@ struct ComposeView: View {
                    composeState = composeState.copy(preview: .noPreview)
                },
                cancelEnabled: !composeState.editing && !composeState.inProgress)
-            Divider()
        }
    }

-    private func msgNotAllowedView(_ reason: LocalizedStringKey, icon: String) -> some View {
-        HStack {
-            Image(systemName: icon).foregroundColor(theme.colors.secondary)
-            Text(reason).italic()
-        }
-        .padding(12)
-        .frame(minHeight: 54)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(.thinMaterial)
-    }
-
    @ViewBuilder private func contextItemView() -> some View {
        switch composeState.contextItem {
        case .noContextItem:
@@ -691,7 +621,6 @@ struct ComposeView: View {
                contextIcon: "arrowshape.turn.up.left",
                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
            )
-            Divider()
        case let .editingItem(chatItem: editingItem):
            ContextItemView(
                chat: chat,
@@ -699,16 +628,6 @@ struct ComposeView: View {
                contextIcon: "pencil",
                cancelContextItem: { clearState() }
            )
-            Divider()
-        case let .forwardingItem(chatItem: forwardedItem, _):
-            ContextItemView(
-                chat: chat,
-                contextItem: forwardedItem,
-                contextIcon: "arrowshape.turn.up.forward",
-                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) },
-                showSender: false
-            )
-            Divider()
        }
    }

@@ -730,11 +649,6 @@ struct ComposeView: View {
        }
        if chat.chatInfo.contact?.nextSendGrpInv ?? false {
            await sendMemberContactInvitation()
-        } else if case let .forwardingItem(ci, fromChatInfo) = composeState.contextItem {
-            sent = await forwardItem(ci, fromChatInfo, ttl)
-            if !composeState.message.isEmpty {
-                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
-            }
        } else if case let .editingItem(ci) = composeState.contextItem {
            sent = await updateMessage(ci, live: live)
        } else if let liveMessage = liveMessage, liveMessage.sentMsg != nil {
@@ -780,15 +694,7 @@ struct ComposeView: View {
                }
            }
        }
-        await MainActor.run {
-            let wasForwarding = composeState.forwarding
-            clearState(live: live)
-            if wasForwarding,
-               chatModel.draftChatId == chat.chatInfo.id,
-               let draft = chatModel.draft {
-                composeState = draft
-            }
-        }
+        await MainActor.run { clearState(live: live) }
        return sent

        func sending() async {
@@ -865,7 +771,6 @@ 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 = moveTempFileFromURL(url) {
-                ChatModel.shared.filesToDelete.remove(url)
                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
            }
            return nil
@@ -910,27 +815,10 @@ struct ComposeView: View {
            return nil
        }

-        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
-            if let chatItem = await apiForwardChatItem(
-                toChatType: chat.chatInfo.chatType,
-                toChatId: chat.chatInfo.apiId,
-                fromChatType: fromChatInfo.chatType,
-                fromChatId: fromChatInfo.apiId,
-                itemId: forwardedItem.id,
-                ttl: ttl
-            ) {
-                await MainActor.run {
-                    chatModel.addChatItem(chat.chatInfo, chatItem)
-                }
-                return chatItem
-            }
-            return nil
-        }
-
        func checkLinkPreview() -> MsgContent {
            switch (composeState.preview) {
            case let .linkPreview(linkPreview: linkPreview):
-                if let url = parseMessage(msgText).url,
+                if let url = parseMessage(msgText),
                   let linkPreview = linkPreview,
                   url == linkPreview.uri {
                    return .link(text: msgText, preview: linkPreview)
@@ -1059,7 +947,7 @@ struct ComposeView: View {

    private func showLinkPreview(_ s: String) {
        prevLinkUrl = linkUrl
-        (linkUrl, hasSimplexLink) = parseMessage(s)
+        linkUrl = parseMessage(s)
        if let url = linkUrl {
            if url != composeState.linkPreview?.uri && url != pendingLinkUrl {
                pendingLinkUrl = url
@@ -1076,17 +964,13 @@ struct ComposeView: View {
        }
    }

-    private func parseMessage(_ msg: String) -> (url: URL?, hasSimplexLink: Bool) {
-        guard let parsedMsg = parseSimpleXMarkdown(msg) else { return (nil, false) }
-        let url: URL? = if let uri = parsedMsg.first(where: { ft in
+    private func parseMessage(_ msg: String) -> URL? {
+        let parsedMsg = parseSimpleXMarkdown(msg)
+        let uri = parsedMsg?.first(where: { ft in
            ft.format == .uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text)
-        }) {
-            URL(string: uri.text)
-        } else {
-            nil
-        }
-        let simplexLink = parsedMsgHasSimplexLink(parsedMsg)
-        return (url, simplexLink)
+        })
+        if let uri = uri { return URL(string: uri.text) }
+        else { return nil }
    }

    private func isSimplexLink(_ link: String) -> Bool {
@@ -25,7 +25,7 @@ func voiceMessageTime_(_ time: TimeInterval?) -> String {

 struct ComposeVoiceView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    var recordingFileName: String
    @Binding var recordingTime: TimeInterval?
    @Binding var recordingState: VoiceMessageRecordingState
@@ -50,9 +50,9 @@ struct ComposeVoiceView: View {
        }
        .padding(.vertical, 1)
        .frame(height: ComposeVoiceView.previewHeight)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
        .frame(maxWidth: .infinity)
+        .padding(.top, 8)
    }

    private func recordingMode() -> some View {
@@ -80,7 +80,7 @@ struct ComposeVoiceView: View {
                    Button {
                        startPlayback()
                    } label: {
-                        playPauseIcon("play.fill", theme.colors.primary)
+                        playPauseIcon("play.fill")
                    }
                    Text(voiceMessageTime_(recordingTime))
                case .playing:
@@ -88,7 +88,7 @@ struct ComposeVoiceView: View {
                        audioPlayer?.pause()
                        playbackState = .paused
                    } label: {
-                        playPauseIcon("pause.fill", theme.colors.primary)
+                        playPauseIcon("pause.fill")
                    }
                    Text(voiceMessageTime_(playbackTime))
                case .paused:
@@ -96,7 +96,7 @@ struct ComposeVoiceView: View {
                        audioPlayer?.play()
                        playbackState = .playing
                    } label: {
-                        playPauseIcon("play.fill", theme.colors.primary)
+                        playPauseIcon("play.fill")
                    }
                    Text(voiceMessageTime_(playbackTime))
                }
@@ -131,7 +131,7 @@ struct ComposeVoiceView: View {
        }
    }

-    private func playPauseIcon(_ image: String, _ color: Color) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
        Image(systemName: image)
            .resizable()
            .aspectRatio(contentMode: .fit)
@@ -147,11 +147,9 @@ struct ComposeVoiceView: View {
        } label: {
            Image(systemName: "multiply")
        }
-        .tint(theme.colors.primary)
    }

    struct SliderBar: View {
-        @EnvironmentObject var theme: AppTheme
        var length: TimeInterval
        @Binding var progress: TimeInterval?
        var seek: (TimeInterval) -> Void
@@ -160,12 +158,10 @@ struct ComposeVoiceView: View {
            Slider(value: Binding(get: { progress ?? TimeInterval(0) }, set: { seek($0) }), in: 0 ... length)
                .frame(maxWidth: .infinity)
                .frame(height: 4)
-                .tint(theme.colors.primary)
        }
    }

    private struct ProgressBar: View {
-        @EnvironmentObject var theme: AppTheme
        var length: TimeInterval
        @Binding var progress: TimeInterval?

@@ -173,7 +169,7 @@ struct ComposeVoiceView: View {
            GeometryReader { geometry in
                ZStack {
                    Rectangle()
-                        .fill(theme.colors.primary)
+                        .fill(Color.accentColor)
                        .frame(width: min(CGFloat((progress ?? TimeInterval(0)) / length) * geometry.size.width, geometry.size.width), height: 4)
                        .animation(.linear, value: progress)
                }
@@ -9,18 +9,19 @@
 import SwiftUI

 struct ContextInvitingContactMemberView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme

    var body: some View {
        HStack {
            Image(systemName: "message")
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
            Text("Send direct message to connect")
        }
        .padding(12)
-        .frame(minHeight: 54)
+        .frame(minHeight: 50)
        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(.thinMaterial)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .padding(.top, 8)
    }
 }

@@ -10,12 +10,11 @@ import SwiftUI
 import SimpleXChat

 struct ContextItemView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    @ObservedObject var chat: Chat
    let contextItem: ChatItem
    let contextIcon: String
    let cancelContextItem: () -> Void
-    var showSender: Bool = true

    var body: some View {
        HStack {
@@ -23,10 +22,10 @@ struct ContextItemView: View {
                .resizable()
                .aspectRatio(contentMode: .fit)
                .frame(width: 16, height: 16)
-                .foregroundColor(theme.colors.secondary)
-            if showSender, let sender = contextItem.memberDisplayName {
+                .foregroundColor(.secondary)
+            if let sender = contextItem.memberDisplayName {
                VStack(alignment: .leading, spacing: 4) {
-                    Text(sender).font(.caption).foregroundColor(theme.colors.secondary)
+                    Text(sender).font(.caption).foregroundColor(.secondary)
                    msgContentView(lines: 2)
                }
            } else {
@@ -40,35 +39,23 @@ struct ContextItemView: View {
            } label: {
                Image(systemName: "multiply")
            }
-            .tint(theme.colors.primary)
        }
        .padding(12)
-        .frame(minHeight: 54)
+        .frame(minHeight: 50)
        .frame(maxWidth: .infinity)
-        .background(chatItemFrameColor(contextItem, theme))
+        .background(chatItemFrameColor(contextItem, colorScheme))
+        .padding(.top, 8)
    }

    private func msgContentView(lines: Int) -> some View {
-        contextMsgPreview()
-            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-            .lineLimit(lines)
-    }
-
-    private func contextMsgPreview() -> Text {
-        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
-
-        func attachment() -> Text {
-            switch contextItem.content.msgContent {
-            case .file: return image("doc.fill")
-            case .image: return image("photo")
-            case .voice: return image("play.fill")
-            default: return Text("")
-            }
-        }
-
-        func image(_ s: String) -> Text {
-            Text(Image(systemName: s)).foregroundColor(Color(uiColor: .tertiaryLabel)) + Text(" ")
-        }
+        MsgContentView(
+            chat: chat,
+            text: contextItem.text,
+            formattedText: contextItem.formattedText,
+            showSecrets: false
+        )
+        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+        .lineLimit(lines)
    }
 }

@@ -16,6 +16,7 @@ struct NativeTextEditor: UIViewRepresentable {
    @Binding var disableEditing: Bool
    @Binding var height: CGFloat
    @Binding var focused: Bool
+    let alignment: TextAlignment
    let onImagesAdded: ([UploadContent]) -> Void
    
    private let minHeight: CGFloat = 37
@@ -28,18 +29,14 @@ struct NativeTextEditor: UIViewRepresentable {
    
    func makeUIView(context: Context) -> UITextView {
        let field = CustomUITextField(height: _height)
-        field.backgroundColor = .clear
        field.text = text
-        field.textAlignment = alignment(text)
+        field.textAlignment = alignment == .leading ? .left : .right
        field.autocapitalizationType = .sentences
        field.setOnTextChangedListener { newText, images in
            if !disableEditing {
-                text = newText
-                field.textAlignment = alignment(text)
-                updateFont(field)
                // Speed up the process of updating layout, reduce jumping content on screen
-                updateHeight(field)
-                self.height = field.frame.size.height
+                if !isShortEmoji(newText) { updateHeight(field) }
+                text = newText
            } else {
                field.text = text
            }
@@ -56,12 +53,10 @@ struct NativeTextEditor: UIViewRepresentable {
    }
    
    func updateUIView(_ field: UITextView, context: Context) {
-        if field.markedTextRange == nil && field.text != text {
-            field.text = text
-            field.textAlignment = alignment(text)
-            updateFont(field)
-            updateHeight(field)
-        }
+        field.text = text
+        field.textAlignment = alignment == .leading ? .left : .right
+        updateFont(field)
+        updateHeight(field)
    }

    private func updateHeight(_ field: UITextView) {
@@ -78,19 +73,12 @@ struct NativeTextEditor: UIViewRepresentable {
    }

    private func updateFont(_ field: UITextView) {
-        let newFont = isShortEmoji(field.text)
+        field.font = isShortEmoji(field.text)
        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
        : UIFont.preferredFont(forTextStyle: .body)
-        if field.font != newFont {
-            field.font = newFont
-        }
    }
 }

-private func alignment(_ text: String) -> NSTextAlignment {
-    isRightToLeft(text) ? .right : .left
-}
-
 private class CustomUITextField: UITextView, UITextViewDelegate {
    var height: Binding<CGFloat>
    var newHeight: CGFloat = 0
@@ -217,6 +205,7 @@ struct NativeTextEditor_Previews: PreviewProvider{
            disableEditing: Binding.constant(false),
            height: Binding.constant(100),
            focused: Binding.constant(false),
+            alignment: TextAlignment.leading,
            onImagesAdded: { _ in }
        )
        .fixedSize(horizontal: false, vertical: true)
@@ -13,7 +13,6 @@ private let liveMsgInterval: UInt64 = 3000_000000

 struct SendMessageView: View {
    @Binding var composeState: ComposeState
-    @EnvironmentObject var theme: AppTheme
    var sendMessage: (Int?) -> Void
    var sendLiveMessage: (() async -> Void)? = nil
    var updateLiveMessage: (() async -> Void)? = nil
@@ -21,7 +20,6 @@ struct SendMessageView: View {
    var nextSendGrpInv: Bool = false
    var showVoiceMessageButton: Bool = true
    var voiceMessageAllowed: Bool = true
-    var disableSendButton = false
    var showEnableVoiceMessagesAlert: ChatInfo.ShowEnableVoiceMessagesAlert = .other
    var startVoiceMessageRecording: (() -> Void)? = nil
    var finishVoiceMessageRecording: (() -> Void)? = nil
@@ -44,29 +42,31 @@ struct SendMessageView: View {

    var body: some View {
        ZStack {
-            let composeShape = RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
            HStack(alignment: .bottom) {
                ZStack(alignment: .leading) {
                    if case .voicePreview = composeState.preview {
                        Text("Voice message…")
                            .font(teFont.italic())
                            .multilineTextAlignment(.leading)
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                            .padding(.horizontal, 10)
                            .padding(.vertical, 8)
                            .frame(maxWidth: .infinity)
                    } else {
+                        let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
                        NativeTextEditor(
                            text: $composeState.message,
                            disableEditing: $composeState.inProgress,
                            height: $teHeight,
                            focused: $keyboardVisible,
+                            alignment: alignment,
                            onImagesAdded: onMediaAdded
                        )
                        .allowsTightening(false)
                        .fixedSize(horizontal: false, vertical: true)
                    }
                }
+
                if progressByTimeout {
                    ProgressView()
                        .scaleEffect(1.4)
@@ -84,9 +84,10 @@ struct SendMessageView: View {
                }
            }
            .padding(.vertical, 1)
-            .background(theme.colors.background)
-            .clipShape(composeShape)
-            .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.5).opacity(0.7))
+            .overlay(
+            RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
+                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
+            )
        }
        .onChange(of: composeState.message, perform: { text in updateFont(text) })
        .onChange(of: composeState.inProgress) { inProgress in
@@ -108,7 +109,6 @@ struct SendMessageView: View {
        } else if showVoiceMessageButton
            && composeState.message.isEmpty
            && !composeState.editing
-            && !composeState.forwarding
            && composeState.liveMessage == nil
            && ((composeState.noPreview && vmrs == .noRecording)
                || (vmrs == .recording && holdingVMR)) {
@@ -184,8 +184,7 @@ struct SendMessageView: View {
            !composeState.sendEnabled ||
            composeState.inProgress ||
            (!voiceMessageAllowed && composeState.voicePreview) ||
-            composeState.endLiveDisabled ||
-            disableSendButton
+            composeState.endLiveDisabled
        )
        .frame(width: 29, height: 29)
        .contextMenu{
@@ -247,7 +246,6 @@ struct SendMessageView: View {
    }

    private struct RecordVoiceMessageButton: View {
-        @EnvironmentObject var theme: AppTheme
        var startVoiceMessageRecording: (() -> Void)?
        var finishVoiceMessageRecording: (() -> Void)?
        @Binding var holdingVMR: Bool
@@ -257,10 +255,7 @@ struct SendMessageView: View {
        var body: some View {
            Button(action: {}) {
                Image(systemName: "mic.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 20, height: 20)
-                    .foregroundColor(theme.colors.primary)
+                    .foregroundColor(.accentColor)
            }
            .disabled(disabled)
            .frame(width: 29, height: 29)
@@ -313,10 +308,7 @@ struct SendMessageView: View {
            }
        } label: {
            Image(systemName: "mic")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
        }
        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
@@ -330,7 +322,7 @@ struct SendMessageView: View {
            Image(systemName: "multiply")
                .resizable()
                .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
                .frame(width: 15, height: 15)
        }
        .frame(width: 29, height: 29)
@@ -347,7 +339,7 @@ struct SendMessageView: View {
            Image(systemName: "bolt.fill")
                .resizable()
                .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
                .frame(width: 20, height: 20)
        }
        .frame(width: 29, height: 29)
@@ -390,7 +382,7 @@ struct SendMessageView: View {
            }
            Task {
                _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
-                while await composeState.liveMessage != nil {
+                while composeState.liveMessage != nil {
                    await update()
                    _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
                }
@@ -401,7 +393,7 @@ struct SendMessageView: View {
    private func finishVoiceMessageRecordingButton() -> some View {
        Button(action: { finishVoiceMessageRecording?() }) {
            Image(systemName: "stop.fill")
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
        }
        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
@@ -12,7 +12,6 @@ import SimpleXChat
 struct ContactPreferencesView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @Binding var contact: Contact
    @State var featuresAllowed: ContactFeaturesAllowed
    @State var currentFeaturesAllowed: ContactFeaturesAllowed
@@ -67,8 +66,8 @@ struct ContactPreferencesView: View {
            .frame(height: 36)
            infoRow("Contact allows", pref.contactPreference.allow.text)
        }
-        header: { featureHeader(feature, enabled).foregroundColor(theme.colors.secondary) }
-        footer: { featureFooter(feature, enabled).foregroundColor(theme.colors.secondary) }
+        header: { featureHeader(feature, enabled) }
+        footer: { featureFooter(feature, enabled) }
    }

    private func timedMessagesFeatureSection() -> some View {
@@ -103,8 +102,8 @@ struct ContactPreferencesView: View {
                infoRow("Delete after", timeText(pref.contactPreference.ttl))
            }
        }
-        header: { featureHeader(.timedMessages, enabled).foregroundColor(theme.colors.secondary) }
-        footer: { featureFooter(.timedMessages, enabled).foregroundColor(theme.colors.secondary) }
+        header: { featureHeader(.timedMessages, enabled) }
+        footer: { featureFooter(.timedMessages, enabled) }
    }

    private func featureHeader(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
@@ -21,7 +21,6 @@ struct AddGroupMembersView: View {

 struct AddGroupMembersViewCommon: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    var chat: Chat
    @State var groupInfo: GroupInfo
    var creatingGroup: Bool = false
@@ -35,7 +34,7 @@ struct AddGroupMembersViewCommon: View {

    private enum AddGroupMembersAlert: Identifiable {
        case prohibitedToInviteIncognito
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")

        var id: String {
            switch self {
@@ -47,13 +46,14 @@ struct AddGroupMembersViewCommon: View {

    var body: some View {
        if creatingGroup {
-            addGroupMembersView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Skip") { addedMembersCb(selectedContacts) }
+            NavigationView {
+                addGroupMembersView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Skip") { addedMembersCb(selectedContacts) }
+                        }
                    }
-                }
+            }
        } else {
            addGroupMembersView()
        }
@@ -70,7 +70,7 @@ struct AddGroupMembersViewCommon: View {

                if (membersToAdd.isEmpty) {
                    Text("No contacts to add")
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                        .padding()
                        .frame(maxWidth: .infinity, alignment: .center)
                        .listRowBackground(Color.clear)
@@ -90,18 +90,16 @@ struct AddGroupMembersViewCommon: View {
                                    Button { selectedContacts.removeAll() } label: { Text("Clear").font(.caption) }
                                    Spacer()
                                    Text("\(count) contact(s) selected")
-                                        .foregroundColor(theme.colors.secondary)
                                }
                            } else {
                                Text("No contacts selected")
                                    .frame(maxWidth: .infinity, alignment: .trailing)
-                                    .foregroundColor(theme.colors.secondary)
                            }
                        }
                    }

                    Section {
-                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.primary, theme.colors.secondary)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed)
                            .padding(.leading, 2)
                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                        let members = s == "" ? membersToAdd : membersToAdd.filter { $0.chatViewName.localizedLowercase.contains(s) }
@@ -121,13 +119,12 @@ struct AddGroupMembersViewCommon: View {
                    message: Text("You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile")
                )
            case let .error(title, error):
-                return mkAlert(title: title, message: error)
+                return Alert(title: Text(title), message: Text(error))
            }
        }
        .onChange(of: selectedContacts) { _ in
            searchFocussed = false
        }
-        .modifier(ThemedBackground(grouped: true))
    }

    private func inviteMembersButton() -> some View {
@@ -175,14 +172,14 @@ struct AddGroupMembersViewCommon: View {
        var iconColor: Color
        if prohibitedToInviteIncognito {
            icon = "theatermasks.circle.fill"
-            iconColor = Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+            iconColor = Color(uiColor: .tertiaryLabel)
        } else {
            if checked {
                icon = "checkmark.circle.fill"
-                iconColor = theme.colors.primary
+                iconColor = .accentColor
            } else {
                icon = "circle"
-                iconColor = Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+                iconColor = Color(uiColor: .tertiaryLabel)
            }
        }
        return Button {
@@ -197,10 +194,11 @@ struct AddGroupMembersViewCommon: View {
            }
        } label: {
            HStack{
-                ProfileImage(imageStr: contact.image, size: 30)
+                ProfileImage(imageStr: contact.image)
+                    .frame(width: 30, height: 30)
                    .padding(.trailing, 2)
                Text(ChatInfo.direct(contact: contact).chatViewName)
-                    .foregroundColor(prohibitedToInviteIncognito ? theme.colors.secondary : theme.colors.onBackground)
+                    .foregroundColor(prohibitedToInviteIncognito ? .secondary : .primary)
                    .lineLimit(1)
                Spacer()
                Image(systemName: icon)
@@ -210,7 +208,7 @@ struct AddGroupMembersViewCommon: View {
    }
 }

-func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding, _ onBackgroundColor: Color, _ secondaryColor: Color) -> some View {
+func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding) -> some View {
    HStack {
        Image(systemName: "magnifyingglass")
            .resizable()
@@ -219,7 +217,7 @@ func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding,
            .padding(.trailing, 10)
        TextField("Search", text: text)
            .focused(focussed)
-            .foregroundColor(onBackgroundColor)
+            .foregroundColor(.primary)
            .frame(maxWidth: .infinity)
        Image(systemName: "xmark.circle.fill")
            .resizable()
@@ -231,7 +229,7 @@ func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding,
                focussed.wrappedValue = false
            }
    }
-    .foregroundColor(secondaryColor)
+    .foregroundColor(.secondary)
    .frame(height: 36)
 }

@@ -13,16 +13,13 @@ let SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20

 struct GroupChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
    @Binding var groupInfo: GroupInfo
-    var onSearch: () -> Void
    @State private var alert: GroupChatInfoViewAlert? = nil
    @State private var groupLink: String?
    @State private var groupLinkMemberRole: GroupMemberRole = .member
-    @State private var groupLinkNavLinkActive: Bool = false
-    @State private var addMembersNavLinkActive: Bool = false
+    @State private var showAddMembersSheet: Bool = false
    @State private var connectionStats: ConnectionStats?
    @State private var connectionCode: String?
    @State private var sendReceipts = SendReceipts.userDefault(true)
@@ -42,7 +39,7 @@ struct GroupChatInfoView: View {
        case blockForAllAlert(mem: GroupMember)
        case unblockForAllAlert(mem: GroupMember)
        case removeMemberAlert(mem: GroupMember)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)

        var id: String {
            switch self {
@@ -65,20 +62,11 @@ struct GroupChatInfoView: View {
        NavigationView {
            let members = chatModel.groupMembers
                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
-                .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }

            List {
                groupInfoHeader()
                    .listRowBackground(Color.clear)
-                    .padding(.bottom, 18)
-
-                infoActionButtons()
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

                Section {
                    if groupInfo.canEdit {
@@ -93,19 +81,13 @@ struct GroupChatInfoView: View {
                    } else {
                        sendReceiptsOptionDisabled()
                    }
-                    NavigationLink {
-                        ChatWallpaperEditorSheet(chat: chat)
-                    } label: {
-                        Label("Chat theme", systemImage: "photo")
-                    }
                } header: {
                    Text("")
                } footer: {
                    Text("Only group owners can change group preferences.")
-                        .foregroundColor(theme.colors.secondary)
                }

-                Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
+                Section("\(members.count + 1) members") {
                    if groupInfo.canAddMembers {
                        groupLinkButton()
                        if (chat.chatInfo.incognito) {
@@ -117,7 +99,7 @@ struct GroupChatInfoView: View {
                        }
                    }
                    if members.count > 8 {
-                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed)
                            .padding(.leading, 8)
                    }
                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
@@ -147,13 +129,12 @@ struct GroupChatInfoView: View {
                }

                if developerTools {
-                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                    Section(header: Text("For console")) {
                        infoRow("Local name", chat.chatInfo.localDisplayName)
                        infoRow("Database ID", "\(chat.chatInfo.apiId)")
                    }
                }
            }
-            .modifier(ThemedBackground(grouped: true))
            .navigationBarHidden(true)
        }
        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -169,7 +150,7 @@ struct GroupChatInfoView: View {
            case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
            case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem)
            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-            case let .error(title, error): return mkAlert(title: title, message: error)
+            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
            }
        }
        .onAppear {
@@ -185,12 +166,14 @@ struct GroupChatInfoView: View {
                logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
            }
        }
+         .keyboardPadding()
    }

    private func groupInfoHeader() -> some View {
        VStack {
            let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
            Text(cInfo.displayName)
@@ -208,116 +191,45 @@ struct GroupChatInfoView: View {
        .frame(maxWidth: .infinity, alignment: .center)
    }

-    func infoActionButtons() -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                searchButton(width: buttonWidth)
-                if groupInfo.canAddMembers {
-                    addMembersActionButton(width: buttonWidth)
-                }
-                muteButton(width: buttonWidth)
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func searchButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
-            dismiss()
-            onSearch()
-        }
-        .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
-    }
-
-    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
-        if chat.chatInfo.incognito {
-            ZStack {
-                InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
-                    groupLinkNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $groupLinkNavLinkActive) {
-                    groupLinkDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .frame(width: 1, height: 1)
-                .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        } else {
-            ZStack {
-                InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
-                    addMembersNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $addMembersNavLinkActive) {
-                    addMembersDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .frame(width: 1, height: 1)
-                .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        }
-    }
-
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
-            width: width
-        ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        }
-        .disabled(!groupInfo.ready)
-    }
-
    private func addMembersButton() -> some View {
        NavigationLink {
-            addMembersDestinationView()
+            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                .onAppear {
+                    searchFocussed = false
+                    Task {
+                        let groupMembers = await apiListMembers(groupInfo.groupId)
+                        await MainActor.run {
+                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                        }
+                    }
+                }
        } label: {
            Label("Invite members", systemImage: "plus")
        }
    }

-    private func addMembersDestinationView() -> some View {
-        AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-            .onAppear {
-                searchFocussed = false
-                Task {
-                    let groupMembers = await apiListMembers(groupInfo.groupId)
-                    await MainActor.run {
-                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                        chatModel.populateGroupMembersIndexes()
-                    }
-                }
-            }
-    }
-
    private struct MemberRowView: View {
        var groupInfo: GroupInfo
        @ObservedObject var groupMember: GMember
-        @EnvironmentObject var theme: AppTheme
        var user: Bool = false
        @Binding var alert: GroupChatInfoViewAlert?

        var body: some View {
            let member = groupMember.wrapped
            let v = HStack{
-                MemberProfileImage(member, size: 38)
+                ProfileImage(imageStr: member.image)
+                    .frame(width: 38, height: 38)
                    .padding(.trailing, 2)
                // TODO server connection status
                VStack(alignment: .leading) {
-                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)
+                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
                    (member.verified ? memberVerifiedShield + t : t)
                        .lineLimit(1)
-                    (user ? Text ("you: ") + Text(member.memberStatus.shortText) : Text(memberConnStatus(member)))
+                    let s = Text(member.memberStatus.shortText)
+                    (user ? Text ("you: ") + s : s)
                        .lineLimit(1)
                        .font(.caption)
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                }
                Spacer()
                memberInfo(member)
@@ -347,25 +259,15 @@ struct GroupChatInfoView: View {
            }
        }

-        private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey {
-            if member.activeConn?.connDisabled ?? false {
-                return "disabled"
-            } else if member.activeConn?.connInactive ?? false {
-                return "inactive"
-            } else {
-                return member.memberStatus.shortText
-            }
-        }
-
        @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
            if member.blocked {
                Text("blocked")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            } else {
                let role = member.memberRole
                if [.owner, .admin, .observer].contains(role) {
                    Text(member.memberRole.text)
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                }
            }
        }
@@ -376,13 +278,13 @@ struct GroupChatInfoView: View {
                    Button {
                        alert = .blockMemberAlert(mem: member)
                    } label: {
-                        Label("Block member", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
+                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
                    }
                } else {
                    Button {
                        alert = .unblockMemberAlert(mem: member)
                    } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
                    }
                }
            }
@@ -394,13 +296,13 @@ struct GroupChatInfoView: View {
                    Button {
                        alert = .unblockForAllAlert(mem: member)
                    } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
+                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
                    }
                } else {
                    Button {
                        alert = .blockForAllAlert(mem: member)
                    } label: {
-                        Label("Block for all", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
+                        Label("Block for all", systemImage: "hand.raised").foregroundColor(.secondary)
                    }
                }
            }
@@ -416,14 +318,6 @@ struct GroupChatInfoView: View {
                }
            }
        }
-
-        private var memberVerifiedShield: Text {
-            (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-                .font(.caption)
-                .baselineOffset(2)
-                .kerning(-2)
-                .foregroundColor(theme.colors.secondary)
-        }
    }

    private func memberInfoView(_ groupMember: GMember) -> some View {
@@ -433,7 +327,15 @@ struct GroupChatInfoView: View {

    private func groupLinkButton() -> some View {
        NavigationLink {
-            groupLinkDestinationView()
+            GroupLinkView(
+                groupId: groupInfo.groupId,
+                groupLink: $groupLink,
+                groupLinkMemberRole: $groupLinkMemberRole,
+                showTitle: false,
+                creatingGroup: false
+            )
+            .navigationBarTitle("Group link")
+            .navigationBarTitleDisplayMode(.large)
        } label: {
            if groupLink == nil {
                Label("Create group link", systemImage: "link.badge.plus")
@@ -443,19 +345,6 @@ struct GroupChatInfoView: View {
        }
    }

-    private func groupLinkDestinationView() -> some View {
-        GroupLinkView(
-            groupId: groupInfo.groupId,
-            groupLink: $groupLink,
-            groupLinkMemberRole: $groupLinkMemberRole,
-            showTitle: false,
-            creatingGroup: false
-        )
-        .navigationBarTitle("Group link")
-        .modifier(ThemedBackground(grouped: true))
-        .navigationBarTitleDisplayMode(.large)
-    }
-
    private func editGroupButton() -> some View {
        NavigationLink {
            GroupProfileView(
@@ -463,7 +352,6 @@ struct GroupChatInfoView: View {
                groupProfile: groupInfo.groupProfile
            )
            .navigationBarTitle("Group profile")
-            .modifier(ThemedBackground())
            .navigationBarTitleDisplayMode(.large)
        } label: {
            Label("Edit group profile", systemImage: "pencil")
@@ -478,7 +366,6 @@ struct GroupChatInfoView: View {
                welcomeText: groupInfo.groupProfile.description ?? ""
            )
            .navigationTitle("Welcome message")
-            .modifier(ThemedBackground(grouped: true))
            .navigationBarTitleDisplayMode(.large)
        } label: {
            groupInfo.groupProfile.description == nil
@@ -633,7 +520,6 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
            creatingGroup: creatingGroup
        )
        .navigationBarTitle("Group preferences")
-        .modifier(ThemedBackground(grouped: true))
        .navigationBarTitleDisplayMode(.large)
    } label: {
        if creatingGroup {
@@ -644,6 +530,14 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
    }
 }

+private var memberVerifiedShield: Text {
+    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+        .font(.caption)
+        .baselineOffset(2)
+        .kerning(-2)
+        .foregroundColor(.secondary)
+}
+
 func cantInviteIncognitoAlert() -> Alert {
    Alert(
        title: Text("Can't invite contacts!"),
@@ -662,8 +556,7 @@ struct GroupChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupChatInfoView(
            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData),
-            onSearch: {}
+            groupInfo: Binding.constant(GroupInfo.sampleData)
        )
    }
 }
@@ -22,7 +22,7 @@ struct GroupLinkView: View {

    private enum GroupLinkAlert: Identifiable {
        case deleteLink
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")

        var id: String {
            switch self {
@@ -34,13 +34,14 @@ struct GroupLinkView: View {

    var body: some View {
        if creatingGroup {
-            groupLinkView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Continue") { linkCreatedCb?() }
+            NavigationView {
+                groupLinkView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
                    }
-                }
+            }
        } else {
            groupLinkView()
        }
@@ -112,7 +113,7 @@ struct GroupLinkView: View {
                        }, secondaryButton: .cancel()
                    )
                case let .error(title, error):
-                    return mkAlert(title: title, message: error)
+                    return Alert(title: Text(title), message: Text(error))
                }
            }
            .onChange(of: groupLinkMemberRole) { _ in
@@ -132,7 +133,6 @@ struct GroupLinkView: View {
                shouldCreate = false
            }
        }
-        .modifier(ThemedBackground(grouped: true))
    }

    private func createGroupLink() {
@@ -11,7 +11,6 @@ import SimpleXChat

 struct GroupMemberInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
    @State var groupInfo: GroupInfo
    @ObservedObject var groupMember: GMember
@@ -36,9 +35,7 @@ struct GroupMemberInfoView: View {
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
        case planAndConnectAlert(alert: PlanAndConnectAlert)
-        case queueInfo(info: String)
-        case someAlert(alert: SomeAlert)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)

        var id: String {
            switch self {
@@ -52,8 +49,6 @@ struct GroupMemberInfoView: View {
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
-            case let .queueInfo(info): return "queueInfo \(info)"
-            case let .someAlert(alert): return "someAlert \(alert.id)"
            case let .error(title, _): return "error \(title)"
            }
        }
@@ -67,11 +62,10 @@ struct GroupMemberInfoView: View {
        }
    }

-    private func knownDirectChat(_ contactId: Int64) -> (Chat, Contact)? {
+    private func knownDirectChat(_ contactId: Int64) -> Chat? {
        if let chat = chatModel.getContactChat(contactId),
-           let contact = chat.chatInfo.contact,
-           contact.directOrUsed == true {
-            return (chat, contact)
+           chat.chatInfo.contact?.directOrUsed == true {
+            return chat
        } else {
            return nil
        }
@@ -79,153 +73,142 @@ struct GroupMemberInfoView: View {

    private func groupMemberInfoView() -> some View {
        ZStack {
-            let member = groupMember.wrapped
-            List {
-                groupMemberInfoHeader(member)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .padding(.bottom, 18)
+            VStack {
+                let member = groupMember.wrapped
+                List {
+                    groupMemberInfoHeader(member)
+                        .listRowBackground(Color.clear)

-                infoActionButtons(member)
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
-                if member.memberActive {
-                    Section {
-                        if let code = connectionCode { verifyCodeButton(code) }
-                        if let connStats = connectionStats,
-                            connStats.ratchetSyncAllowed {
-                            synchronizeConnectionButton()
+                    if member.memberActive {
+                        Section {
+                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
+                                knownDirectChatButton(chat)
+                            } else if groupInfo.fullGroupPreferences.directMessages.on {
+                                if let contactId = member.memberContactId {
+                                    newDirectChatButton(contactId)
+                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                                    createMemberContactButton()
+                                }
+                            }
+                            if let code = connectionCode { verifyCodeButton(code) }
+                            if let connStats = connectionStats,
+                               connStats.ratchetSyncAllowed {
+                                synchronizeConnectionButton()
+                            }
+                            // } else if developerTools {
+                            //     synchronizeConnectionButtonForce()
+                            // }
                        }
-                        // } else if developerTools {
-                        //     synchronizeConnectionButtonForce()
-                        // }
                    }
-                }

-                if let contactLink = member.contactLink {
-                    Section {
-                        SimpleXLinkQRCode(uri: contactLink)
-                        Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
-                        } label: {
-                            Label("Share address", systemImage: "square.and.arrow.up")
-                        }
-                        if let contactId = member.memberContactId {
-                            if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                    if let contactLink = member.contactLink {
+                        Section {
+                            SimpleXLinkQRCode(uri: contactLink)
+                            Button {
+                                showShareSheet(items: [simplexChatLink(contactLink)])
+                            } label: {
+                                Label("Share address", systemImage: "square.and.arrow.up")
+                            }
+                            if let contactId = member.memberContactId {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
+                                    connectViaAddressButton(contactLink)
+                                }
+                            } else {
                                connectViaAddressButton(contactLink)
                            }
+                        } header: {
+                            Text("Address")
+                        } footer: {
+                            Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
+                        }
+                    }
+
+                    Section("Member") {
+                        infoRow("Group", groupInfo.displayName)
+
+                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
+                            Picker("Change role", selection: $newRole) {
+                                ForEach(roles) { role in
+                                    Text(role.text)
+                                }
+                            }
+                            .frame(height: 36)
                        } else {
-                            connectViaAddressButton(contactLink)
+                            infoRow("Role", member.memberRole.text)
                        }
-                    } header: {
-                        Text("Address")
-                            .foregroundColor(theme.colors.secondary)
-                    } footer: {
-                        Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
-                            .foregroundColor(theme.colors.secondary)
-                    }
-                }

-                Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
-                    infoRow("Group", groupInfo.displayName)
-
-                    if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
-                        Picker("Change role", selection: $newRole) {
-                            ForEach(roles) { role in
-                                Text(role.text)
-                            }
-                        }
-                        .frame(height: 36)
-                    } else {
-                        infoRow("Role", member.memberRole.text)
-                    }
-                }
-
-                if let connStats = connectionStats {
-                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
-                        // TODO network connection status
-                        Button("Change receiving address") {
-                            alert = .switchAddressAlert
-                        }
-                        .disabled(
-                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
-                            || connStats.ratchetSyncSendProhibited
-                        )
-                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                            Button("Abort changing address") {
-                                alert = .abortSwitchAddressAlert
-                            }
-                            .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
-                                || connStats.ratchetSyncSendProhibited
-                            )
-                        }
-                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
-                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
-                    }
-                }
-
-                if groupInfo.membership.memberRole >= .admin {
-                    adminDestructiveSection(member)
-                } else {
-                    nonAdminBlockSection(member)
-                }
-
-                if developerTools {
-                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
-                        infoRow("Local name", member.localDisplayName)
-                        infoRow("Database ID", "\(member.groupMemberId)")
+                        // TODO invited by - need to get contact by contact id
                        if let conn = member.activeConn {
                            let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
                            infoRow("Connection", connLevelDesc)
                        }
-                        Button ("Debug delivery") {
-                            Task {
-                                do {
-                                    let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
-                                    await MainActor.run { alert = .queueInfo(info: info) }
-                                } catch let e {
-                                    logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                    let a = getErrorAlert(e, "Error")
-                                    await MainActor.run { alert = .error(title: a.title, error: a.message) }
-                                }
+                    }
+
+                    if let connStats = connectionStats {
+                        Section("Servers") {
+                            // TODO network connection status
+                            Button("Change receiving address") {
+                                alert = .switchAddressAlert
                            }
+                            .disabled(
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                || connStats.ratchetSyncSendProhibited
+                            )
+                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                                Button("Abort changing address") {
+                                    alert = .abortSwitchAddressAlert
+                                }
+                                .disabled(
+                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                    || connStats.ratchetSyncSendProhibited
+                                )
+                            }
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
+                        }
+                    }
+
+                    if groupInfo.membership.memberRole >= .admin {
+                        adminDestructiveSection(member)
+                    } else {
+                        nonAdminBlockSection(member)
+                    }
+
+                    if developerTools {
+                        Section("For console") {
+                            infoRow("Local name", member.localDisplayName)
+                            infoRow("Database ID", "\(member.groupMemberId)")
                        }
                    }
                }
-            }
-            .navigationBarHidden(true)
-            .onAppear {
-                if #unavailable(iOS 16) {
-                    // this condition prevents re-setting picker
-                    if !justOpened { return }
-                }
-                justOpened = false
-                DispatchQueue.main.async {
-                    newRole = member.memberRole
-                    do {
-                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                        _ = chatModel.upsertGroupMember(groupInfo, mem)
-                        connectionStats = stats
-                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                .navigationBarHidden(true)
+                .onAppear {
+                    if #unavailable(iOS 16) {
+                        // this condition prevents re-setting picker
+                        if !justOpened { return }
+                    }
+                    justOpened = false
+                    DispatchQueue.main.async {
+                        newRole = member.memberRole
+                        do {
+                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                            _ = chatModel.upsertGroupMember(groupInfo, mem)
+                            connectionStats = stats
+                            connectionCode = code
+                        } catch let error {
+                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        }
                    }
                }
-            }
-            .onChange(of: newRole) { newRole in
-                if newRole != member.memberRole {
-                    alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                .onChange(of: newRole) { newRole in
+                    if newRole != member.memberRole {
+                        alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                    }
+                }
+                .onChange(of: member.memberRole) { role in
+                    newRole = role
                }
-            }
-            .onChange(of: member.memberRole) { role in
-                newRole = role
            }
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
            .alert(item: $alert) { alertItem in
@@ -240,9 +223,7 @@ struct GroupMemberInfoView: View {
                case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
-                case let .queueInfo(info): return queueInfoAlert(info)
-                case let .someAlert(a): return a.alert
-                case let .error(title, error): return mkAlert(title: title, message: error)
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
                }
            }
            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
@@ -251,58 +232,6 @@ struct GroupMemberInfoView: View {
                ProgressView().scaleEffect(2)
            }
        }
-        .modifier(ThemedBackground(grouped: true))
-    }
-
-    func infoActionButtons(_ member: GroupMember) -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
-                    knownDirectChatButton(chat, width: buttonWidth)
-                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                    if let contactId = member.memberContactId {
-                        newDirectChatButton(contactId, width: buttonWidth)
-                    } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                        createMemberContactButton(width: buttonWidth)
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                } else { // no known contact chat && directMessages are off
-                    InfoViewButton(image: "message.fill", title: "message", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't message member")
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    func showSendMessageToEnableCallsAlert() {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: "Can't call member",
-                message: "Send message to enable calls."
-            ),
-            id: "can't call member, send message"
-        ))
-    }
-
-    func showDirectMessagesProhibitedAlert(_ title: LocalizedStringKey) {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: title,
-                message: "Direct messages between members are prohibited in this group."
-            ),
-            id: "can't message member, direct messages prohibited"
-        ))
    }

    func connectViaAddressButton(_ contactLink: String) -> some View {
@@ -319,32 +248,36 @@ struct GroupMemberInfoView: View {
        }
    }

-    func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            ItemsModel.shared.loadOpenChat(chat.id) {
+    func knownDirectChatButton(_ chat: Chat) -> some View {
+        Button {
+            dismissAllSheets(animated: true)
+            DispatchQueue.main.async {
+                chatModel.chatId = chat.id
+            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
+    }
+
+    func newDirectChatButton(_ contactId: Int64) -> some View {
+        Button {
+            do {
+                let chat = try apiGetChat(type: .direct, id: contactId)
+                chatModel.addChat(chat)
                dismissAllSheets(animated: true)
-            }
-        }
-    }
-
-    func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            Task {
-                do {
-                    let chat = try await apiGetChat(type: .direct, id: contactId)
-                    chatModel.addChat(chat)
-                    ItemsModel.shared.loadOpenChat(chat.id) {
-                        dismissAllSheets(animated: true)
-                    }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
+                DispatchQueue.main.async {
+                    chatModel.chatId = chat.id
                }
+            } catch let error {
+                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
        }
    }

-    func createMemberContactButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
+    func createMemberContactButton() -> some View {
+        Button {
            progressIndicator = true
            Task {
                do {
@@ -352,10 +285,9 @@ struct GroupMemberInfoView: View {
                    await MainActor.run {
                        progressIndicator = false
                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        ItemsModel.shared.loadOpenChat(memberContact.id) {
-                            dismissAllSheets(animated: true)
-                        }
-                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
+                        dismissAllSheets(animated: true)
+                        chatModel.chatId = memberContact.id
+                        chatModel.setContactNetworkStatus(memberContact, .connected)
                    }
                } catch let error {
                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
@@ -366,18 +298,21 @@ struct GroupMemberInfoView: View {
                    }
                }
            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
        }
    }

    private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
        VStack {
-            MemberProfileImage(mem, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
            if mem.verified {
                (
                    Text(Image(systemName: "checkmark.shield"))
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                        .font(.title2)
                    + Text(" ")
                    + Text(mem.displayName)
@@ -425,7 +360,6 @@ struct GroupMemberInfoView: View {
            )
            .navigationBarTitleDisplayMode(.inline)
            .navigationTitle("Security code")
-            .modifier(ThemedBackground())
        } label: {
            Label(
                member.verified ? "View security code" : "Verify security code",
@@ -475,7 +409,7 @@ struct GroupMemberInfoView: View {
        Section {
            if mem.blockedByAdmin {
                Label("Blocked by admin", systemImage: "hand.raised")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
            } else if mem.memberSettings.showMessages {
                blockMemberButton(mem)
            } else {
@@ -633,21 +567,6 @@ struct GroupMemberInfoView: View {
    }
 }

-func MemberProfileImage(
-    _ mem: GroupMember,
-    size: CGFloat,
-    color: Color = Color(uiColor: .tertiarySystemGroupedBackground),
-    backgroundColor: Color? = nil
-) -> some View {
-    ProfileImage(
-        imageStr: mem.image,
-        size: size,
-        color: color,
-        backgroundColor: backgroundColor,
-        blurred: mem.blocked
-    )
-}
-
 func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
    Alert(
        title: Text("Block member?"),
@@ -9,16 +9,9 @@
 import SwiftUI
 import SimpleXChat

-private let featureRoles: [(role: GroupMemberRole?, text: LocalizedStringKey)] = [
-    (nil, "all members"),
-    (.admin, "admins"),
-    (.owner, "owners")
-]
-
 struct GroupPreferencesView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
    @Binding var groupInfo: GroupInfo
    @State var preferences: FullGroupPreferences
    @State var currentPreferences: FullGroupPreferences
@@ -31,11 +24,10 @@ struct GroupPreferencesView: View {
            List {
                featureSection(.timedMessages, $preferences.timedMessages.enable)
                featureSection(.fullDelete, $preferences.fullDelete.enable)
-                featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
+                featureSection(.directMessages, $preferences.directMessages.enable)
                featureSection(.reactions, $preferences.reactions.enable)
-                featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
-                featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.voice, $preferences.voice.enable)
+                featureSection(.files, $preferences.files.enable)
                featureSection(.history, $preferences.history.enable)

                if groupInfo.canEdit {
@@ -72,9 +64,9 @@ struct GroupPreferencesView: View {
        }
    }

-    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>, _ enableForRole: Binding<GroupMemberRole?>? = nil) -> some View {
+    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>) -> some View {
        Section {
-            let color: Color = enableFeature.wrappedValue == .on ? .green : theme.colors.secondary
+            let color: Color = enableFeature.wrappedValue == .on ? .green : .secondary
            let icon = enableFeature.wrappedValue == .on ? feature.iconFilled : feature.icon
            let timedOn = feature == .timedMessages && enableFeature.wrappedValue == .on
            if groupInfo.canEdit {
@@ -95,14 +87,6 @@ struct GroupPreferencesView: View {
                    )
                    .frame(height: 36)
                }
-                if enableFeature.wrappedValue == .on, let enableForRole {
-                    Picker("Enabled for", selection: enableForRole) {
-                        ForEach(featureRoles, id: \.role) { fr in
-                            Text(fr.text)
-                        }
-                    }
-                    .frame(height: 36)
-                }
            } else {
                settingsRow(icon, color: color) {
                    infoRow(Text(feature.text), enableFeature.wrappedValue.text)
@@ -110,26 +94,9 @@ struct GroupPreferencesView: View {
                if timedOn {
                    infoRow("Delete after", timeText(preferences.timedMessages.ttl))
                }
-                if enableFeature.wrappedValue == .on, let enableForRole {
-                    HStack {
-                        Text("Enabled for").foregroundColor(theme.colors.secondary)
-                        Spacer()
-                        Text(
-                            featureRoles.first(where: { fr in fr.role == enableForRole.wrappedValue })?.text
-                            ?? "all members"
-                        )
-                        .foregroundColor(theme.colors.secondary)
-                    }
-                }
            }
        } footer: {
            Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.canEdit))
-                .foregroundColor(theme.colors.secondary)
-        }
-        .onChange(of: enableFeature.wrappedValue) { enabled in
-            if case .off = enabled {
-                enableForRole?.wrappedValue = nil
-            }
        }
    }

@@ -11,7 +11,6 @@ import SimpleXChat

 struct GroupWelcomeView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
    @Binding var groupInfo: GroupInfo
    @State var groupProfile: GroupProfile
    @State var welcomeText: String
@@ -58,7 +57,7 @@ struct GroupWelcomeView: View {
    }

    private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false, secondaryColor: theme.colors.secondary)
+        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
            .frame(minHeight: 130, alignment: .topLeading)
            .frame(maxWidth: .infinity, alignment: .leading)
    }
@@ -71,7 +70,7 @@ struct GroupWelcomeView: View {
                        Group {
                            if welcomeText.isEmpty {
                                TextEditor(text: Binding.constant(NSLocalizedString("Enter welcome message…", comment: "placeholder")))
-                                    .foregroundColor(theme.colors.secondary)
+                                    .foregroundColor(.secondary)
                                    .disabled(true)
                            }
                            TextEditor(text: $welcomeText)
@@ -1,316 +0,0 @@
-//
-//  ReverseList.swift
-//  SimpleX (iOS)
-//
-//  Created by Levitating Pineapple on 11/06/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-
-/// A List, which displays it's items in reverse order - from bottom to top
-struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIViewControllerRepresentable {
-    let items: Array<Item>
-
-    @Binding var scrollState: ReverseListScrollModel<Item>.State
-
-    /// Closure, that returns user interface for a given item
-    let content: (Item) -> Content
-
-    let loadPage: () -> Void
-
-    func makeUIViewController(context: Context) -> Controller {
-        Controller(representer: self)
-    }
-
-    func updateUIViewController(_ controller: Controller, context: Context) {
-        if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
-            switch destination {
-            case .nextPage:
-                controller.scrollToNextPage()
-            case let .item(id):
-                controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
-            case .bottom:
-                controller.scroll(to: 0, position: .top)
-            }
-        } else {
-            controller.update(items: items)
-        }
-    }
-
-    /// Controller, which hosts SwiftUI cells
-    class Controller: UITableViewController {
-        private enum Section { case main }
-        private let representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, Item>!
-        private var itemCount: Int = 0
-        private var bag = Set<AnyCancellable>()
-
-        init(representer: ReverseList) {
-            self.representer = representer
-            super.init(style: .plain)
-
-            // 1. Style
-            tableView = InvertedTableView()
-            tableView.separatorStyle = .none
-            tableView.transform = .verticalFlip
-            tableView.backgroundColor = .clear
-
-            // 2. Register cells
-            if #available(iOS 16.0, *) {
-                tableView.register(
-                    UITableViewCell.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            } else {
-                tableView.register(
-                    HostingCell<Content>.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            }
-
-            // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, Item>(
-                tableView: tableView
-            ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
-                    self.representer.loadPage()
-                }
-                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
-                if #available(iOS 16.0, *) {
-                    cell.contentConfiguration = UIHostingConfiguration { self.representer.content(item) }
-                        .margins(.all, 0)
-                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
-                } else {
-                    if let cell = cell as? HostingCell<Content> {
-                        cell.set(content: self.representer.content(item), parent: self)
-                    } else {
-                        fatalError("Unexpected Cell Type for: \(item)")
-                    }
-                }
-                cell.transform = .verticalFlip
-                cell.selectionStyle = .none
-                cell.backgroundColor = .clear
-                return cell
-            }
-
-            // 4. External state changes will require manual layout updates
-            NotificationCenter.default
-                .addObserver(
-                    self,
-                    selector: #selector(updateLayout),
-                    name: notificationName,
-                    object: nil
-                )
-        }
-
-        @available(*, unavailable)
-        required init?(coder: NSCoder) { fatalError() }
-
-        deinit { NotificationCenter.default.removeObserver(self) }
-
-        @objc private func updateLayout() {
-            if #available(iOS 16.0, *) {
-                tableView.setNeedsLayout()
-                tableView.layoutIfNeeded()
-            } else {
-                tableView.reloadData()
-            }
-        }
-
-        /// Hides keyboard, when user begins to scroll.
-        /// Equivalent to `.scrollDismissesKeyboard(.immediately)`
-        override func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
-            UIApplication.shared
-                .sendAction(
-                    #selector(UIResponder.resignFirstResponder),
-                    to: nil,
-                    from: nil,
-                    for: nil
-                )
-            NotificationCenter.default.post(name: .chatViewWillBeginScrolling, object: nil)
-        }
-
-        override func viewDidAppear(_ animated: Bool) {
-            tableView.clipsToBounds = false
-            parent?.viewIfLoaded?.clipsToBounds = false
-        }
-
-        /// Scrolls up
-        func scrollToNextPage() {
-            tableView.setContentOffset(
-                CGPoint(
-                    x: tableView.contentOffset.x,
-                    y: tableView.contentOffset.y + tableView.bounds.height
-                ),
-                animated: true
-            )
-            Task { representer.scrollState = .atDestination }
-        }
-
-        /// Scrolls to Item at index path
-        /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
-        func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            var animated = false
-            if #available(iOS 16.0, *) {
-                animated = true
-            }
-            if let index, tableView.numberOfRows(inSection: 0) != 0 {
-                tableView.scrollToRow(
-                    at: IndexPath(row: index, section: 0),
-                    at: position,
-                    animated: animated
-                )
-            } else {
-                tableView.setContentOffset(
-                    CGPoint(x: .zero, y: -InvertedTableView.inset),
-                    animated: animated
-                )
-            }
-            Task { representer.scrollState = .atDestination }
-        }
-
-        func update(items: Array<Item>) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-            snapshot.appendSections([.main])
-            snapshot.appendItems(items)
-            dataSource.defaultRowAnimation = .none
-            dataSource.apply(
-                snapshot,
-                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
-            )
-            // Sets content offset on initial load
-            if itemCount == 0 {
-                tableView.setContentOffset(
-                    CGPoint(x: 0, y: -InvertedTableView.inset),
-                    animated: false
-                )
-            }
-            itemCount = items.count
-        }
-    }
-
-    /// `UIHostingConfiguration` back-port for iOS14 and iOS15
-    /// Implemented as a `UITableViewCell` that wraps and manages a generic `UIHostingController`
-    private final class HostingCell<Hosted: View>: UITableViewCell {
-        private let hostingController = UIHostingController<Hosted?>(rootView: nil)
-
-        /// Updates content of the cell
-        /// For reference: https://noahgilmore.com/blog/swiftui-self-sizing-cells/
-        func set(content: Hosted, parent: UIViewController) {
-            hostingController.view.backgroundColor = .clear
-            hostingController.rootView = content
-            if let hostingView = hostingController.view {
-                hostingView.invalidateIntrinsicContentSize()
-                if hostingController.parent != parent { parent.addChild(hostingController) }
-                if !contentView.subviews.contains(hostingController.view) {
-                    contentView.addSubview(hostingController.view)
-                    hostingView.translatesAutoresizingMaskIntoConstraints = false
-                    NSLayoutConstraint.activate([
-                        hostingView.leadingAnchor
-                            .constraint(equalTo: contentView.leadingAnchor),
-                        hostingView.trailingAnchor
-                            .constraint(equalTo: contentView.trailingAnchor),
-                        hostingView.topAnchor
-                            .constraint(equalTo: contentView.topAnchor),
-                        hostingView.bottomAnchor
-                            .constraint(equalTo: contentView.bottomAnchor)
-                    ])
-                }
-                if hostingController.parent != parent { hostingController.didMove(toParent: parent) }
-            } else {
-                fatalError("Hosting View not loaded \(hostingController)")
-            }
-        }
-
-        override func prepareForReuse() {
-            super.prepareForReuse()
-            hostingController.rootView = nil
-        }
-    }
-}
-
-/// Manages ``ReverseList`` scrolling
-class ReverseListScrollModel<Item: Identifiable>: ObservableObject {
-    /// Represents Scroll State of ``ReverseList``
-    enum State: Equatable {
-        enum Destination: Equatable {
-            case nextPage
-            case item(Item.ID)
-            case bottom
-        }
-
-        case scrollingTo(Destination)
-        case atDestination
-    }
-
-    @Published var state: State = .atDestination
-
-    func scrollToNextPage() {
-        state = .scrollingTo(.nextPage)
-    }
-
-    func scrollToBottom() {
-        state = .scrollingTo(.bottom)
-    }
-
-    func scrollToItem(id: Item.ID) {
-        state = .scrollingTo(.item(id))
-    }
-}
-
-fileprivate let cellReuseId = "hostingCell"
-
-fileprivate let notificationName = NSNotification.Name(rawValue: "reverseListNeedsLayout")
-
-fileprivate extension CGAffineTransform {
-    /// Transform that vertically flips the view, preserving it's location
-    static let verticalFlip = CGAffineTransform(scaleX: 1, y: -1)
-}
-
-extension NotificationCenter {
-    static func postReverseListNeedsLayout() {
-        NotificationCenter.default.post(
-            name: notificationName,
-            object: nil
-        )
-    }
-}
-
-/// Disable animation on iOS 15
-func withConditionalAnimation<Result>(
-    _ animation: Animation? = .default,
-    _ body: () throws -> Result
-) rethrows -> Result {
-    if #available(iOS 16.0, *) {
-        try withAnimation(animation, body)
-    } else {
-        try body()
-    }
-}
-
-class InvertedTableView: UITableView {
-    static let inset = CGFloat(100)
-
-    static let insets = UIEdgeInsets(
-        top: inset,
-        left: .zero,
-        bottom: inset,
-        right: .zero
-    )
-
-    override var contentInsetAdjustmentBehavior: UIScrollView.ContentInsetAdjustmentBehavior {
-        get { .never }
-        set { }
-    }
-
-    override var contentInset: UIEdgeInsets {
-        get { Self.insets }
-        set { }
-    }
-
-    override var adjustedContentInset: UIEdgeInsets {
-        Self.insets
-    }
-}
@@ -1,133 +0,0 @@
-//
-//  SelectableChatItemToolbars.swift
-//  SimpleX (iOS)
-//
-//  Created by Stanislav Dmitrenko on 30.07.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct SelectedItemsTopToolbar: View {
-    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    @Binding var selectedChatItems: Set<Int64>?
-
-    var body: some View {
-        let count = selectedChatItems?.count ?? 0
-        return Text(count == 0 ? "Nothing selected" : "Selected \(count)").font(.headline)
-            .foregroundColor(theme.colors.onBackground)
-            .frame(width: 220)
-    }
-}
-
-struct SelectedItemsBottomToolbar: View {
-    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    let chatItems: [ChatItem]
-    @Binding var selectedChatItems: Set<Int64>?
-    var chatInfo: ChatInfo
-    // Bool - delete for everyone is possible
-    var deleteItems: (Bool) -> Void
-    var moderateItems: () -> Void
-    //var shareItems: () -> Void
-    @State var deleteEnabled: Bool = false
-    @State var deleteForEveryoneEnabled: Bool = false
-
-    @State var canModerate: Bool = false
-    @State var moderateEnabled: Bool = false
-
-    @State var allButtonsDisabled = false
-
-    var body: some View {
-        VStack(spacing: 0) {
-            Divider()
-
-            HStack(alignment: .center) {
-                Button {
-                    deleteItems(deleteForEveryoneEnabled)
-                } label: {
-                    Image(systemName: "trash")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
-                }
-                .disabled(!deleteEnabled || allButtonsDisabled)
-
-                Spacer()
-                Button {
-                    moderateItems()
-                } label: {
-                    Image(systemName: "flag")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
-                }
-                .disabled(!moderateEnabled || allButtonsDisabled)
-                .opacity(canModerate ? 1 : 0)
-
-
-                Spacer()
-                Button {
-                    //shareItems()
-                } label: {
-                    Image(systemName: "square.and.arrow.up")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
-                }
-                .disabled(allButtonsDisabled)
-                .opacity(0)
-            }
-            .frame(maxHeight: .infinity)
-            .padding([.leading, .trailing], 12)
-        }
-        .onAppear {
-            recheckItems(chatInfo, chatItems, selectedChatItems)
-        }
-        .onChange(of: chatInfo) { info in
-            recheckItems(info, chatItems, selectedChatItems)
-        }
-        .onChange(of: chatItems) { items in
-            recheckItems(chatInfo, items, selectedChatItems)
-        }
-        .onChange(of: selectedChatItems) { selected in
-            recheckItems(chatInfo, chatItems, selected)
-        }
-        .frame(height: 55.5)
-        .background(.thinMaterial)
-    }
-
-    private func recheckItems(_ chatInfo: ChatInfo, _ chatItems: [ChatItem], _ selectedItems: Set<Int64>?) {
-        let count = selectedItems?.count ?? 0
-        allButtonsDisabled = count == 0 || count > 20
-        canModerate = possibleToModerate(chatInfo)
-        if let selected = selectedItems {
-            let me: Bool
-            let onlyOwnGroupItems: Bool
-            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
-                if selected.contains(ci.id) {
-                    var (de, dee, me, onlyOwnGroupItems, sel) = r
-                    de = de && ci.canBeDeletedForSelf
-                    dee = dee && ci.meta.deletable && !ci.localNote
-                    onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd
-                    me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
-                    sel.insert(ci.id) // we are collecting new selected items here to account for any changes in chat items list
-                    return (de, dee, me, onlyOwnGroupItems, sel)
-                } else {
-                    return r
-                }
-            }
-            moderateEnabled = me && !onlyOwnGroupItems
-        }
-    }
-
-    private func possibleToModerate(_ chatInfo: ChatInfo) -> Bool {
-        return switch chatInfo {
-        case let .group(groupInfo):
-            groupInfo.membership.memberRole >= .admin
-        default: false
-        }
-    }
-}
@@ -10,7 +10,6 @@ import SwiftUI

 struct VerifyCodeView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
    var displayName: String
    @State var connectionCode: String?
    @State var connectionVerified: Bool
@@ -31,7 +30,7 @@ struct VerifyCodeView: View {
                    HStack {
                        if connectionVerified {
                            Image(systemName: "checkmark.shield")
-                                .foregroundColor(theme.colors.secondary)
+                                .foregroundColor(.secondary)
                            Text("\(displayName) is verified")
                        } else {
                            Text("\(displayName) is not verified")
@@ -67,7 +66,6 @@ struct VerifyCodeView: View {
                                ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
                                    .navigationBarTitleDisplayMode(.large)
                                    .navigationTitle("Scan code")
-                                    .modifier(ThemedBackground())
                            } label: {
                                Label("Scan code", systemImage: "qrcode")
                            }
@@ -124,6 +122,5 @@ struct VerifyCodeView: View {
 struct VerifyCodeView_Previews: PreviewProvider {
    static var previews: some View {
        VerifyCodeView(displayName: "alice", connectionCode: "12345 67890 12345 67890", connectionVerified: false, verify: {_ in nil})
-            .environmentObject(CurrentColors.toAppTheme())
    }
 }
@@ -11,6 +11,7 @@ import SwiftUI
 struct ChatHelp: View {
    @EnvironmentObject var chatModel: ChatModel
    @Binding var showSettings: Bool
+    @State private var newChatMenuOption: NewChatMenuOption? = nil

    var body: some View {
        ScrollView { chatHelp() }
@@ -38,7 +39,7 @@ struct ChatHelp: View {

                HStack(spacing: 8) {
                    Text("Tap button ")
-                    NewChatMenuButton()
+                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
                    Text("above, then choose:")
                }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Bondarenko	701b4186b6	Merge remote-tracking branch 'origin/master' into ios-profiling	2024-03-30 15:47:29 +03:00
Evgeny Poberezkin	257e03f10a	Merge branch 'master' into ios-profiling	2024-03-29 19:44:17 +00:00
Alexander Bondarenko	7b644c0dcf	Merge remote-tracking branch 'origin/master' into ios-profiling	2024-03-28 20:10:35 +02:00
Alexander Bondarenko	c3d9d9a7c3	Merge remote-tracking branch 'origin/master' into ios-profiling	2024-03-27 17:40:14 +02:00
Alexander Bondarenko	261767035e	Merge remote-tracking branch 'origin/master' into ios-profiling	2024-03-20 11:22:48 +02:00
spaced4ndy	c9b00b3054	Merge branch 'master' into ios-profiling	2024-03-13 11:50:17 +04:00
spaced4ndy	1697190189	remove print	2024-03-12 20:52:05 +04:00
spaced4ndy	24609a98c6	fix paths	2024-03-12 20:49:42 +04:00
Alexander Bondarenko	60752feb9c	fix addr	2024-03-12 17:09:54 +02:00
Alexander Bondarenko	ff5ef638cd	add missing include	2024-03-12 17:09:54 +02:00
spaced4ndy	df619d540b	ios: save debug profile, event log buttons (#3899 )	2024-03-12 19:06:25 +04:00
Alexander Bondarenko	53d8a85b8c	add RTS tuning to haskell_init	2024-03-12 16:58:44 +02:00