update

rfc: conversational agent
docs: Flatpak download (#4393 )
2024-12-17 17:20:21 +01:00 · 2024-11-06 09:24:06 +00:00 · 2024-07-04 12:10:47 +01:00 · 2024-07-04 08:00:12 +01:00 · 2024-07-04 07:58:13 +01:00 · 2024-07-03 22:51:21 +01:00
657 changed files with 69472 additions and 9500 deletions
@@ -65,6 +65,11 @@ jobs:
            asset_name: simplex-chat-ubuntu-22_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
+            ghc: "9.6.3"
+            cache_path: ~/.cabal/store
+            asset_name: simplex-chat-macos-aarch64
+            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
+          - os: macos-13
            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
@@ -107,18 +112,36 @@ jobs:
        if: matrix.os == 'macos-latest'
        shell: bash
        run: |
-          echo "ignore-project: False"                                      >> cabal.project.local
-          echo "package direct-sqlcipher"                                   >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                        >> cabal.project.local
+          echo "ignore-project: False"                                         >> cabal.project.local
+          echo "package simplexmq"                                             >> cabal.project.local
+          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo ""                                                              >> cabal.project.local
+          echo "package direct-sqlcipher"                                      >> cabal.project.local
+          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                           >> cabal.project.local
+
+      - name: Unix prepare cabal.project.local for Mac
+        if: matrix.os == 'macos-13'
+        shell: bash
+        run: |
+          echo "ignore-project: False"                                         >> cabal.project.local
+          echo "package simplexmq"                                             >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
+          echo ""                                                              >> cabal.project.local
+          echo "package direct-sqlcipher"                                      >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
+          echo "    flags: +openssl"                                           >> cabal.project.local

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

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

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

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

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

      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -5,14 +5,20 @@ 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'
+        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'
        # Beta Release
-        uses: cla-assistant/github-action@v2.1.3-beta
+        uses: cla-assistant/github-action@v2.3.0
        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
@@ -33,4 +39,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,7 +4,6 @@ on:
  push:
    branches:
      - master
-      - stable
    paths:
      - website/**
      - images/**
@@ -54,6 +54,7 @@ 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,16 +1,21 @@
+---
+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](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).

 ## Privacy Policy

-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.

@@ -20,7 +25,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

@@ -34,7 +39,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.

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

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

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

 #### Another information stored on the servers

@@ -82,7 +87,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

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

 ## Conditions of Use of Software and Infrastructure

@@ -131,7 +138,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 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.
+**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.

 **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.

@@ -165,4 +172,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 February 24, 2024
+Updated April 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) |
+| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md), [PL](/docs/lang/pl/README.md) |

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

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

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

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

 - chat bots and automations
 - integrations with other apps
@@ -158,20 +158,19 @@ 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) - it is commission-free for us.
- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
+- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission).
+- Bitcoin: bc1qd74rc032ek2knhhr3yjq2ajzc5enz3h4qwnxad
 - Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg
+- Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
 - USDT:
-  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+  - Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
+- Solana: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
+- please ask if you want to donate any other coins.

 Thank you,

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

 Recent and important updates:

+[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)

 [Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
@@ -377,10 +382,11 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Using mobile profiles from the desktop app.
 - ✅ 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.
- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
 - 🏗 Large groups, communities and public channels.
- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
@@ -409,13 +415,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 [Terms & privacy policy](./PRIVACY.md).
+Please read more in [Privacy Policy](./PRIVACY.md).

 ## Security contact

-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 see our [Security Policy](./docs/SECURITY.md) on how to report security vulnerabilities to us. We will coordinate the fix and disclosure.

-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.
+Please do NOT report security vulnerabilities via GitHub issues.

 ## License

@@ -9,6 +9,7 @@
 import Foundation
 import UIKit
 import SimpleXChat
+import SwiftUI

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

@@ -141,6 +143,10 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        }
    }

+    private func prepareForLaunch() {
+        try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
+    }
+
    static func keepScreenOn(_ on: Bool) {
        UIApplication.shared.isIdleTimerDisabled = on
    }
@@ -148,13 +154,79 @@ 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
-        window?.tintColor = UIColor(cgColor: getUIAccentColorDefault())
-        window?.overrideUserInterfaceStyle = getUserInterfaceStyleDefault()
+        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)
    }
 }
@@ -0,0 +1,23 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "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
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "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,6 +14,8 @@ 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

@@ -51,6 +53,16 @@ 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.
@@ -138,6 +150,17 @@ struct ContentView: View {
                break
            }
        }
+        .onAppear {
+            reactOnDarkThemeChanges()
+        }
+        .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()
+        }
+        .onChange(of: theme.name) { _ in
+            ThemeManager.adjustWindowStyle()
+        }
    }

    @ViewBuilder private func contentView() -> some View {
@@ -224,8 +247,8 @@ struct ContentView: View {
        .frame(maxWidth: .infinity, maxHeight: .infinity )
        .background(
            Rectangle()
-                .fill(.background)
-        ) 
+                .fill(theme.colors.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)
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: [.duckOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
            }
        } else {
            if AVAudioSession.sharedInstance().category != .soloAmbient {
@@ -47,7 +47,11 @@ final class ChatModel: ObservableObject {
    @Published var onboardingStage: OnboardingStage?
    @Published var setDeliveryReceipts = false
    @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
-    @Published var currentUser: User?
+    @Published var currentUser: User? {
+        didSet {
+            ThemeManager.applyTheme(currentThemeDefault.get())
+        }
+    }
    @Published var users: [UserInfo] = []
    @Published var chatInitialized = false
    @Published var chatRunning: Bool?
@@ -103,6 +107,7 @@ final class ChatModel: ObservableObject {
    // 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> = [:]

@@ -331,12 +336,12 @@ final class ChatModel: ObservableObject {

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

    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-            withAnimation {
+            withConditionalAnimation {
                _updateChatItem(at: i, with: cItem)
            }
        } else if let status = status {
@@ -421,6 +426,16 @@ 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 {
@@ -511,11 +526,13 @@ final class ChatModel: ObservableObject {
    }

    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        // update preview
-        decreaseUnreadCounter(cInfo)
-        // update current chat
        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-            markChatItemRead_(i)
+            if reversedChatItems[i].isRcvNew {
+                // update current chat
+                markChatItemRead_(i)
+                // update preview
+                decreaseUnreadCounter(cInfo)
+            }
        }
    }

@@ -722,7 +739,7 @@ struct NTFContactRequest {
    var chatId: String
 }

-struct UnreadChatItemCounts {
+struct UnreadChatItemCounts: Equatable {
    var totalBelow: Int
    var unreadBelow: Int
 }
@@ -778,6 +795,24 @@ final class Chat: ObservableObject, Identifiable {

    var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }

+    func groupFeatureEnabled(_ feature: GroupFeature) -> Bool {
+        if case let .group(groupInfo) = self.chatInfo {
+            let p = groupInfo.fullGroupPreferences
+            return switch feature {
+            case .timedMessages: p.timedMessages.on
+            case .directMessages: p.directMessages.on(for: groupInfo.membership)
+            case .fullDelete: p.fullDelete.on
+            case .reactions: p.reactions.on
+            case .voice: p.voice.on(for: groupInfo.membership)
+            case .files: p.files.on(for: groupInfo.membership)
+            case .simplexLinks: p.simplexLinks.on(for: groupInfo.membership)
+            case .history: p.history.on
+            }
+        } else {
+            return true
+        }
+    }
+
    public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }

@@ -205,6 +205,43 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    }
 }

+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
+    }
+}
+
+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
+    }
+}
+
+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)
+    }
+}
+
 func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }
@@ -0,0 +1,73 @@
+//
+//  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))")
+            }
+        }
+    }
+}
@@ -21,6 +21,8 @@ public let CURRENT_CHAT_VERSION: Int = 2
 // version range that supports establishing direct connection with a group member (xGrpDirectInvVRange in core)
 public let CREATE_MEMBER_CONTACT_VRANGE = VersionRange(minVersion: 2, maxVersion: CURRENT_CHAT_VERSION)

+private let networkStatusesLock = DispatchQueue(label: "chat.simplex.app.network-statuses.lock")
+
 enum TerminalItem: Identifiable {
    case cmd(Date, ChatCommand)
    case resp(Date, ChatResponse)
@@ -90,18 +92,22 @@ 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) -> ChatResponse {
-    logger.debug("chatSendCmd \(cmd.cmdType)")
+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)")
+    }
    let start = Date.now
    let resp = bgTask
                ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd, ctrl) }
                : sendSimpleXCmd(cmd, ctrl)
-    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)
+    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)
+        }
    }
    return resp
 }
@@ -240,14 +246,8 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
    logger.error("apiSuspendChat error: \(String(describing: r))")
 }

-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)
+func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, ctrl: chat_ctrl? = nil) throws {
+    let r = chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl)
    if case .cmdOk = r { return }
    throw r
 }
@@ -270,18 +270,6 @@ func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
    throw r
 }

-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))
 }
@@ -319,8 +307,10 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
    throw r
 }

+let loadItemsPerPage = 50
+
 func apiGetChat(type: ChatType, id: Int64, search: String = "") throws -> Chat {
-    let r = chatSendCmdSync(.apiGetChat(type: type, id: id, pagination: .last(count: 50), search: search))
+    let r = chatSendCmdSync(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
    if case let .apiChat(_, chat) = r { return Chat.init(chat) }
    throw r
 }
@@ -351,11 +341,20 @@ 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 chatModel = ChatModel.shared
    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 r: ChatResponse
-    if type == .direct {
+    if toChatType == .direct {
        var cItem: ChatItem? = nil
        let endTask = beginBGTask({
            if let cItem = cItem {
@@ -395,7 +394,7 @@ func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent)
 }

 private func sendMessageErrorAlert(_ r: ChatResponse) {
-    logger.error("apiSendMessage error: \(String(describing: r))")
+    logger.error("send message error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
        title: "Error sending message",
        message: "Error: \(String(describing: r))"
@@ -532,10 +531,21 @@ 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))
 }
@@ -556,6 +566,18 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (Gro
    throw r
 }

+func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
+    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?, QueueInfo) {
+    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 }
@@ -814,6 +836,21 @@ 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))
@@ -922,14 +959,19 @@ func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationF
    }
 }

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

-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
    let am = AlertManager.shared
    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
    if case .rcvFileAcceptedSndCancelled = r {
@@ -942,19 +984,50 @@ func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: B
        }
    } else if let networkErrorAlert = networkErrorAlert(r) {
        logger.error("apiReceiveFile network error: \(String(describing: r))")
-        am.showAlert(networkErrorAlert)
+        if !auto {
+            am.showAlert(networkErrorAlert)
+        }
    } else {
        switch chatError(r) {
        case .fileCancelled:
            logger.debug("apiReceiveFile ignoring fileCancelled error")
        case .fileAlreadyReceiving:
            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
+        case let .fileNotApproved(fileId, unknownServers):
+            logger.debug("apiReceiveFile fileNotApproved error")
+            if !auto {
+                let srvs = unknownServers.map { s in
+                    if let srv = parseServerAddress(s), !srv.hostnames.isEmpty {
+                        srv.hostnames[0]
+                    } else {
+                        serverHost(s)
+                    }
+                }
+                am.showAlert(Alert(
+                    title: Text("Unknown servers!"),
+                    message: Text("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs.sorted().joined(separator: ", "))."),
+                    primaryButton: .default(
+                        Text("Download"),
+                        action: {
+                            Task {
+                                logger.debug("apiReceiveFile fileNotApproved alert - in Task")
+                                if let user = ChatModel.shared.currentUser {
+                                    await receiveFile(user: user, fileId: fileId, userApprovedRelays: true)
+                                }
+                            }
+                        }
+                    ),
+                    secondaryButton: .cancel()
+                ))
+            }
        default:
            logger.error("apiReceiveFile error: \(String(describing: r))")
-            am.showAlertMsg(
-                title: "Error receiving file",
-                message: "Error: \(String(describing: r))"
-            )
+            if !auto {
+                am.showAlertMsg(
+                    title: "Error receiving file",
+                    message: "Error: \(String(describing: r))"
+                )
+            }
        }
    }
    return nil
@@ -1224,7 +1297,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.ready && c.active && !memberContactIds.contains(c.apiId) }
+        .filter{ c in c.sendMsgEnabled && !c.nextSendGrpInv && !memberContactIds.contains(c.apiId) }
        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }

@@ -1281,6 +1354,18 @@ func apiGetVersion() throws -> CoreVersionInfo {
    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
@@ -1295,14 +1380,13 @@ 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 apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
-    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
-    try apiSetPQEncryption(pqExperimentalEnabledDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
    if m.currentUser == nil {
@@ -1386,8 +1470,7 @@ 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 apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
+    try apiSetAppFilePaths(filesFolder: getMigrationTempFilesDirectory().path, tempFolder: getMigrationTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path, ctrl: ctrl)
    _ = try apiStartChat(ctrl: ctrl)
    return migrationActiveUser
 }
@@ -1460,6 +1543,8 @@ 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 } }
@@ -1473,14 +1558,15 @@ class ChatReceiver {
    }

    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg() {
-            self._lastMsgTime = .now
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
+        while self.receiveMessages {
+            if let msg = await chatRecvMsg() {
+                self._lastMsgTime = .now
+                await processReceivedMsg(msg)
+                if let messagesChannel {
+                    messagesChannel(msg)
+                }
+            }
            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
        }
    }

@@ -1568,34 +1654,30 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.removeChat(mergedContact.id)
            }
        }
-    case let .contactsSubscribed(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .connected)
-    case let .contactsDisconnected(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .disconnected)
-    case let .contactSubSummary(_, contactSubscriptions):
-        await MainActor.run {
-            for sub in contactSubscriptions {
-// no need to update contact here, and it is slow
-//                if active(user) {
-//                    m.updateContact(sub.contact)
-//                }
-                if let err = sub.contactError {
-                    processContactSubError(sub.contact, err)
-                } else {
-                    m.setContactNetworkStatus(sub.contact, .connected)
-                }
-            }
-        }
    case let .networkStatus(status, connections):
-        await MainActor.run {
+        // dispatch queue to synchronize access
+        networkStatusesLock.sync {
+            var ns = m.networkStatuses
+            // slow loop is on the background thread
            for cId in connections {
-                m.networkStatuses[cId] = status
+                ns[cId] = status
+            }
+            // fast model update is on the main thread
+            DispatchQueue.main.sync {
+                m.networkStatuses = ns
            }
        }
    case let .networkStatuses(_, statuses): ()
-        await MainActor.run {
+        // dispatch queue to synchronize access
+        networkStatusesLock.sync {
+            var ns = m.networkStatuses
+            // slow loop is on the background thread
            for s in statuses {
-                m.networkStatuses[s.agentConnId] = s.networkStatus
+                ns[s.agentConnId] = s.networkStatus
+            }
+            // fast model update is on the main thread
+            DispatchQueue.main.sync {
+                m.networkStatuses = ns
            }
        }
    case let .newChatItem(user, aChatItem):
@@ -1774,11 +1856,15 @@ 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, _):
@@ -1795,12 +1881,15 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case let .sndFileCompleteXFTP(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupFile(aChatItem) }
-    case let .sndFileError(user, 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
@@ -1846,21 +1935,35 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case .chatSuspended:
        chatSuspended()
-    case let .contactSwitch(_, contact, switchProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+    case let .contactSwitch(user, contact, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+            }
        }
-    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+    case let .groupMemberSwitch(user, groupInfo, member, switchProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+            }
        }
-    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+    case let .contactRatchetSync(user, contact, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+            }
        }
-    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+    case let .groupMemberRatchetSync(user, groupInfo, member, ratchetSyncProgress):
+        if active(user) {
+            await MainActor.run {
+                m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+            }
+        }
+    case let .contactDisabled(user, contact):
+        if active(user) {
+            await MainActor.run {
+                m.updateContact(contact)
+            }
        }
    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
        await MainActor.run {
@@ -1884,12 +1987,28 @@ func processReceivedMsg(_ res: ChatResponse) async {
            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
        }
-    case .remoteCtrlStopped:
+    case let .remoteCtrlStopped(_, rcStopReason):
        // 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 .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) {
@@ -1946,26 +2065,6 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    }
 }

-func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
-    let m = ChatModel.shared
-    await MainActor.run {
-        for c in contactRefs {
-            m.networkStatuses[c.agentConnId] = status
-        }
-    }
-}
-
-func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
-    let m = ChatModel.shared
-    var err: String
-    switch chatError {
-    case .errorAgent(agentError: .BROKER(_, .NETWORK)): err = "network"
-    case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
-    default: err = String(describing: chatError)
-    }
-    m.setContactNetworkStatus(contact, .error(connectionError: err))
-}
-
 func refreshCallInvitations() throws {
    let m = ChatModel.shared
    let callInvitations = try justRefreshCallInvitations()
@@ -39,6 +39,7 @@ 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
@@ -0,0 +1,200 @@
+//
+//  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() {
+    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == systemInDarkThemeCurrently {
+        // 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 data = Data(base64Encoded: dropImagePrefix(image)),
+               let parsed = UIImage(data: data),
+               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
+        )
+    }
+}
@@ -0,0 +1,303 @@
+//
+//  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)
+    }
+
+    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,6 +9,7 @@
 import SwiftUI
 import WebKit
 import SimpleXChat
+import AVFoundation

 struct ActiveCallView: View {
    @EnvironmentObject var m: ChatModel
@@ -21,6 +22,7 @@ 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) {
@@ -69,6 +71,11 @@ 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
@@ -103,6 +110,11 @@ 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 {
@@ -126,6 +138,7 @@ struct ActiveCallView: View {
                    }
                    await MainActor.run {
                        call.callState = .negotiated
+                        CallSoundsPlayer.shared.stop()
                    }
                }
            case let .ice(iceCandidates):
@@ -144,6 +157,10 @@ 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)
@@ -161,6 +178,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
@@ -187,6 +208,22 @@ 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
@@ -198,6 +235,7 @@ 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 {
@@ -213,7 +251,16 @@ struct ActiveCallOverlay: View {
                HStack {
                    toggleAudioButton()
                    Spacer()
-                    Color.clear.frame(width: 40, height: 40)
+                    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)
+                    }
                    Spacer()
                    endCallButton()
                    Spacer()
@@ -239,9 +286,7 @@ struct ActiveCallOverlay: View {
                            .foregroundColor(.white.opacity(0.8))
                    }
                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image)
-                            .scaledToFit()
-                            .frame(width: 192, height: 192)
+                        ProfileImage(imageStr: call.contact.profile.image, size: 192)
                        audioCallInfoView(call)
                    }
                    .foregroundColor(.white)
@@ -256,14 +301,33 @@ struct ActiveCallOverlay: View {
                    toggleAudioButton()
                        .frame(maxWidth: .infinity, alignment: .leading)
                    endCallButton()
-                    toggleSpeakerButton()
-                        .frame(maxWidth: .infinity, alignment: .trailing)
+                    // 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)
+                    }
                }
                .padding(.bottom, 60)
                .padding(.horizontal, 48)
            }
        }
        .frame(maxWidth: .infinity)
+        .onAppear {
+            deviceManager.start()
+        }
+        .onDisappear {
+            deviceManager.stop()
+        }
    }

    private func audioCallInfoView(_ call: Call) -> some View {
@@ -341,12 +405,17 @@ struct ActiveCallOverlay: View {
    private func toggleSpeakerButton() -> some View {
        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
            Task {
-                client.setSpeakerEnabledAndConfigureSession(!call.speakerEnabled)
+                let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
+                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
                DispatchQueue.main.async {
-                    call.speakerEnabled = !call.speakerEnabled
+                    call.speakerEnabled = !speakerEnabled
                }
            }
        }
+        .onAppear {
+            deviceManager.call = call
+            //call.speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
+        }
    }

    private func toggleVideoButton() -> some View {
@@ -0,0 +1,25 @@
+//
+//  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) {
+
+    }
+}
@@ -0,0 +1,67 @@
+//
+//  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()
+    }
+}
@@ -103,7 +103,23 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
        RTCAudioSession.sharedInstance().isAudioEnabled = true
        do {
-            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
+            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) }
+                    }
+                }
+            }
            logger.debug("audioSession category set")
            try audioSession.setActive(true)
            logger.debug("audioSession activated")
@@ -11,6 +11,7 @@ import SimpleXChat

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

    var body: some View {
@@ -30,8 +31,7 @@ struct IncomingCallView: View {
        VStack(alignment: .leading, spacing: 6) {
            HStack {
                if m.users.count > 1 {
-                    ProfileImage(imageStr: invitation.user.image, color: .white)
-                        .frame(width: 24, height: 24)
+                    ProfileImage(imageStr: invitation.user.image, size: 24, color: .white)
                }
                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", .accentColor) {
+                callButton("Ignore", "multiply", .primary) {
                    cc.activeCallInvitation = nil
                }

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

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

 import Foundation
 import AVFoundation
+import UIKit

 class SoundPlayer {
    static let shared = SoundPlayer()
@@ -43,3 +44,63 @@ 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()
+        }
+    }
+}
@@ -431,17 +431,18 @@ struct RTCIceServer: Codable, Equatable {
 }

 // the servers are expected in this format:
-// stun:stun.simplex.im:443?transport=tcp
-// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
+// stuns:stun.simplex.im:443?transport=tcp
+// turns:private2:Hxuq2QxUjnhj96Zq2r4HjqHRj@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 == "turn" || scheme == "turns")  {
+       u.path == "" && (scheme == "stun" || scheme == "stuns" || 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: "audio")
+    private let audioQueue = DispatchQueue(label: "chat.simplex.app.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: ["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"),
+        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"),
    ]

    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
@@ -605,9 +605,23 @@ extension WebRTCClient {
                self.rtcAudioSession.unlockForConfiguration()
            }
            do {
-                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
-                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
-                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
+                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.setActive(true)
                logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
            } catch let error {
@@ -658,6 +672,17 @@ 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,10 +9,9 @@
 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

@@ -25,11 +24,9 @@ struct ChatInfoToolbar: View {
            }
            ChatInfoImage(
                chat: chat,
-                color: colorScheme == .dark
-                        ? chatImageColorDark
-                        : chatImageColorLight
+                size: imageSize,
+                color: Color(uiColor: .tertiaryLabel)
            )
-            .frame(width: imageSize, height: imageSize)
            .padding(.trailing, 4)
            VStack {
                let t = Text(cInfo.displayName).font(.headline)
@@ -41,14 +38,14 @@ struct ChatInfoToolbar: View {
                }
            }
        }
-        .foregroundColor(.primary)
+        .foregroundColor(theme.colors.onBackground)
        .frame(width: 220)
    }

    private var contactVerifiedShield: Text {
        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
            .font(.caption)
-            .foregroundColor(.secondary)
+            .foregroundColor(theme.colors.secondary)
            .baselineOffset(1)
            .kerning(-2)
    }
@@ -57,5 +54,6 @@ struct ChatInfoToolbar: View {
 struct ChatInfoToolbar_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoToolbar(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
+            .environmentObject(CurrentColors.toAppTheme())
    }
 }
@@ -36,20 +36,20 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
    }
 }

-@ViewBuilder func smpServers(_ title: LocalizedStringKey, _ servers: [String]) -> some View {
+@ViewBuilder func smpServers(_ title: LocalizedStringKey, _ servers: [String], _ secondaryColor: Color) -> some View {
    if servers.count > 0 {
        HStack {
            Text(title).frame(width: 120, alignment: .leading)
            Button(serverHost(servers[0])) {
                UIPasteboard.general.string = servers.joined(separator: ";")
            }
-            .foregroundColor(.secondary)
+            .foregroundColor(secondaryColor)
            .lineLimit(1)
        }
    }
 }

-private func serverHost(_ s: String) -> String {
+func serverHost(_ s: String) -> String {
    if let i = s.range(of: "@")?.lowerBound {
        return String(s[i...].dropFirst())
    } else {
@@ -90,6 +90,7 @@ enum SendReceipts: Identifiable, Hashable {

 struct ChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
    @State var contact: Contact
@@ -103,7 +104,6 @@ struct ChatInfoView: View {
    @State private var sendReceipts = SendReceipts.userDefault(true)
    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED, store: groupDefaults) private var pqExperimentalEnabled = false

    enum ChatInfoViewAlert: Identifiable {
        case clearChatAlert
@@ -111,7 +111,7 @@ struct ChatInfoView: View {
        case switchAddressAlert
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
-        case allowContactPQEncryptionAlert
+        case queueInfo(info: String)
        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")

        var id: String {
@@ -121,7 +121,7 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case .allowContactPQEncryptionAlert: return "allowContactPQEncryptionAlert"
+            case let .queueInfo(info): return "queueInfo \(info)"
            case let .error(title, _): return "error \(title)"
            }
        }
@@ -144,7 +144,7 @@ struct ChatInfoView: View {
                .listRowSeparator(.hidden)

                if let customUserProfile = customUserProfile {
-                    Section("Incognito") {
+                    Section(header: Text("Incognito").foregroundColor(theme.colors.secondary)) {
                        HStack {
                            Text("Your random profile")
                            Spacer()
@@ -162,25 +162,20 @@ struct ChatInfoView: View {
                       connStats.ratchetSyncAllowed {
                        synchronizeConnectionButton()
                    }
+                    NavigationLink {
+                        ChatWallpaperEditorSheet(chat: chat)
+                    } label: {
+                        Label("Chat theme", systemImage: "photo")
+                    }
 //                    } else if developerTools {
 //                        synchronizeConnectionButtonForce()
 //                    }
                }
                .disabled(!contact.ready || !contact.active)

-                if pqExperimentalEnabled,
-                   let conn = contact.activeConn {
+                if let conn = contact.activeConn {
                    Section {
                        infoRow(Text(String("E2E encryption")), conn.connPQEnabled ? "Quantum resistant" : "Standard")
-                        if !conn.pqEncryption {
-                            allowPQButton()
-                        }
-                    } header: {
-                        Text(String("Quantum resistant E2E encryption"))
-                    } footer: {
-                        if !conn.pqEncryption {
-                            Text(String("After allowing quantum resistant encryption, it will be enabled after several messages if your contact also allows it."))
-                        }
                    }
                }

@@ -194,13 +189,15 @@ struct ChatInfoView: View {
                        }
                    } header: {
                        Text("Address")
+                            .foregroundColor(theme.colors.secondary)
                    } footer: {
                        Text("You can share this address with your contacts to let them connect with **\(contact.displayName)**.")
+                            .foregroundColor(theme.colors.secondary)
                    }
                }

                if contact.ready && contact.active {
-                    Section("Servers") {
+                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
                        networkStatusRow()
                            .onTapGesture {
                                alert = .networkStatusAlert
@@ -222,8 +219,8 @@ struct ChatInfoView: View {
                                    || connStats.ratchetSyncSendProhibited
                                )
                            }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                        }
                    }
                }
@@ -234,12 +231,25 @@ struct ChatInfoView: View {
                }

                if developerTools {
-                    Section(header: Text("For console")) {
+                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
                        infoRow("Local name", chat.chatInfo.localDisplayName)
                        infoRow("Database ID", "\(chat.chatInfo.apiId)")
+                        Button ("Debug delivery") {
+                            Task {
+                                do {
+                                    let info = queueInfoText(try await apiContactQueueInfo(chat.chatInfo.apiId))
+                                    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) }
+                                }
+                            }
+                        }
                    }
                }
            }
+            .modifier(ThemedBackground(grouped: true))
            .navigationBarHidden(true)
        }
        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -256,7 +266,7 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
-            case .allowContactPQEncryptionAlert: return allowContactPQEncryptionAlert()
+            case let .queueInfo(info): return queueInfoAlert(info)
            case let .error(title, error): return mkAlert(title: title, message: error)
            }
        }
@@ -285,14 +295,13 @@ struct ChatInfoView: View {
    private func contactInfoHeader() -> some View {
        VStack {
            let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
-                .frame(width: 192, height: 192)
+            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
                .padding(.top, 12)
                .padding()
            if contact.verified {
                (
                    Text(Image(systemName: "checkmark.shield"))
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                        .font(.title2)
                    + Text(" ")
                    + Text(contact.profile.displayName)
@@ -332,7 +341,7 @@ struct ChatInfoView: View {
                setContactAlias()
            }
            .multilineTextAlignment(.center)
-            .foregroundColor(.secondary)
+            .foregroundColor(theme.colors.secondary)
    }

    private func setContactAlias() {
@@ -370,6 +379,7 @@ struct ChatInfoView: View {
            )
            .navigationBarTitleDisplayMode(.inline)
            .navigationTitle("Security code")
+            .modifier(ThemedBackground(grouped: true))
        } label: {
            Label(
                contact.verified ? "View security code" : "Verify security code",
@@ -386,6 +396,7 @@ struct ChatInfoView: View {
                currentFeaturesAllowed: contactUserPrefsToFeaturesAllowed(contact.mergedPreferences)
            )
            .navigationBarTitle("Contact preferences")
+            .modifier(ThemedBackground(grouped: true))
            .navigationBarTitleDisplayMode(.large)
        } label: {
            Label("Contact preferences", systemImage: "switch.2")
@@ -430,24 +441,15 @@ struct ChatInfoView: View {
        }
    }

-    private func allowPQButton() -> some View {
-        Button {
-            alert = .allowContactPQEncryptionAlert
-        } label: {
-            Label(String("Allow PQ encryption"), systemImage: "exclamationmark.triangle")
-                .foregroundColor(.orange)
-        }
-    }
-
    private func networkStatusRow() -> some View {
        HStack {
            Text("Network status")
            Image(systemName: "info.circle")
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                .font(.system(size: 14))
            Spacer()
            Text(chatModel.contactNetworkStatus(contact).statusString)
-                .foregroundColor(.secondary)
+                .foregroundColor(theme.colors.secondary)
            serverImage()
        }
    }
@@ -455,7 +457,7 @@ struct ChatInfoView: View {
    private func serverImage() -> some View {
        let status = chatModel.contactNetworkStatus(contact)
        return Image(systemName: status.imageName)
-            .foregroundColor(status == .connected ? .green : .secondary)
+            .foregroundColor(status == .connected ? .green : theme.colors.secondary)
            .font(.system(size: 12))
    }

@@ -572,33 +574,147 @@ struct ChatInfoView: View {
            }
        }
    }
+}

-    private func allowContactPQEncryption() {
-        Task {
-            do {
-                let ct = try await apiSetContactPQ(contact.apiId, true)
-                contact = ct
-                await MainActor.run {
-                    chatModel.updateContact(contact)
-                    dismiss()
-                }
-            } catch let error {
-                logger.error("allowContactPQEncryption apiSetContactPQ error: \(responseError(error))")
-                let a = getErrorAlert(error, "Error allowing contact PQ encryption")
-                await MainActor.run {
-                    alert = .error(title: a.title, error: a.message)
-                }
-            }
+struct ChatWallpaperEditorSheet: View {
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var theme: AppTheme
+    @State private var globalThemeUsed: Bool = false
+    @State var chat: Chat
+    @State private var themes: ThemeModeOverrides
+
+    init(chat: Chat) {
+        self.chat = chat
+        self.themes = if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
+            uiThemes
+        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+            uiThemes
+        } else {
+            ThemeModeOverrides()
        }
    }

-    func allowContactPQEncryptionAlert() -> Alert {
-        Alert(
-            title: Text(String("Allow quantum resistant encryption?")),
-            message: Text(String("This is an experimental feature, it is not recommended to enable it for important chats.")),
-            primaryButton: .destructive(Text(String("Allow")), action: allowContactPQEncryption),
-            secondaryButton: .cancel()
+    var body: some View {
+        let preferred = themes.preferredMode(!theme.colors.isLight)
+        let initialTheme = preferred ?? ThemeManager.defaultActiveTheme(ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+        ChatWallpaperEditor(
+            initialTheme: initialTheme,
+            themeModeOverride: initialTheme,
+            applyToMode: themes.light == themes.dark ? nil : initialTheme.mode,
+            globalThemeUsed: $globalThemeUsed,
+            save: { applyToMode, newTheme in
+                await save(applyToMode, newTheme, $chat)
+            }
        )
+        .navigationTitle("Chat theme")
+        .modifier(ThemedBackground(grouped: true))
+        .navigationBarTitleDisplayMode(.inline)
+        .onAppear {
+            globalThemeUsed = preferred == nil
+        }
+        .onChange(of: theme.base.mode) { _ in
+            globalThemeUsed = themesFromChat(chat).preferredMode(!theme.colors.isLight) == nil
+        }
+        .onChange(of: ChatModel.shared.chatId) { _ in
+            dismiss()
+        }
+    }
+
+    private func themesFromChat(_ chat: Chat) -> ThemeModeOverrides {
+        if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
+            uiThemes
+        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+            uiThemes
+        } else {
+            ThemeModeOverrides()
+        }
+    }
+
+    private static var updateBackendTask: Task = Task {}
+    private func save(
+        _ applyToMode: DefaultThemeMode?,
+        _ newTheme: ThemeModeOverride?,
+        _ chat: Binding<Chat>
+    ) async {
+        let unchangedThemes: ThemeModeOverrides = themesFromChat(chat.wrappedValue)
+        var wallpaperFiles = Set([unchangedThemes.light?.wallpaper?.imageFile, unchangedThemes.dark?.wallpaper?.imageFile])
+        var changedThemes: ThemeModeOverrides? = unchangedThemes
+        let light: ThemeModeOverride? = if let newTheme {
+            ThemeModeOverride(mode: DefaultThemeMode.light, colors: newTheme.colors, wallpaper: newTheme.wallpaper?.withFilledWallpaperPath())
+        } else {
+            nil
+        }
+        let dark: ThemeModeOverride? = if let newTheme {
+            ThemeModeOverride(mode: DefaultThemeMode.dark, colors: newTheme.colors, wallpaper: newTheme.wallpaper?.withFilledWallpaperPath())
+        } else {
+            nil
+        }
+
+        if let applyToMode {
+            switch applyToMode {
+            case DefaultThemeMode.light:
+                changedThemes?.light = light
+            case DefaultThemeMode.dark:
+                changedThemes?.dark = dark
+            }
+        } else {
+            changedThemes?.light = light
+            changedThemes?.dark = dark
+        }
+        if changedThemes?.light != nil || changedThemes?.dark != nil {
+            let light = changedThemes?.light
+            let dark = changedThemes?.dark
+            let currentMode = CurrentColors.base.mode
+            // same image file for both modes, copy image to make them as different files
+            if var light, var dark, let lightWallpaper = light.wallpaper, let darkWallpaper = dark.wallpaper, let lightImageFile = lightWallpaper.imageFile, let darkImageFile = darkWallpaper.imageFile, lightWallpaper.imageFile == darkWallpaper.imageFile {
+                let imageFile = if currentMode == DefaultThemeMode.light {
+                    darkImageFile
+                } else {
+                    lightImageFile
+                }
+                let filePath = saveWallpaperFile(url: getWallpaperFilePath(imageFile))
+                if currentMode == DefaultThemeMode.light {
+                    dark.wallpaper?.imageFile = filePath
+                    changedThemes = ThemeModeOverrides(light: changedThemes?.light, dark: dark)
+                } else {
+                    light.wallpaper?.imageFile = filePath
+                    changedThemes = ThemeModeOverrides(light: light, dark: changedThemes?.dark)
+                }
+            }
+        } else {
+            changedThemes = nil
+        }
+        wallpaperFiles.remove(changedThemes?.light?.wallpaper?.imageFile)
+        wallpaperFiles.remove(changedThemes?.dark?.wallpaper?.imageFile)
+        wallpaperFiles.forEach(removeWallpaperFile)
+
+        let changedThemesConstant = changedThemes
+        ChatWallpaperEditorSheet.updateBackendTask.cancel()
+        ChatWallpaperEditorSheet.updateBackendTask = Task {
+            do {
+                try await Task.sleep(nanoseconds: 300_000000)
+                if await apiSetChatUIThemes(chatId: chat.id, themes: changedThemesConstant) {
+                    if case var ChatInfo.direct(contact) = chat.wrappedValue.chatInfo {
+                        contact.uiThemes = changedThemesConstant
+                        await MainActor.run {
+                            ChatModel.shared.updateChatInfo(ChatInfo.direct(contact: contact))
+                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.direct(contact: contact))
+                            themes = themesFromChat(chat.wrappedValue)
+                        }
+                    } else if case var ChatInfo.group(groupInfo) = chat.wrappedValue.chatInfo {
+                        groupInfo.uiThemes = changedThemesConstant
+
+                        await MainActor.run {
+                            ChatModel.shared.updateChatInfo(ChatInfo.group(groupInfo: groupInfo))
+                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.group(groupInfo: groupInfo))
+                            themes = themesFromChat(chat.wrappedValue)
+                        }
+                    }
+                }
+            } catch {
+                // canceled task
+            }
+        }
    }
 }

@@ -629,6 +745,22 @@ func syncConnectionForceAlert(_ syncConnectionForce: @escaping () -> Void) -> Al
    )
 }

+func queueInfoText(_ info: (RcvMsgInfo?, QueueInfo)) -> String {
+    let (rcvMsgInfo, qInfo) = info
+    var msgInfo: String
+    if let rcvMsgInfo { msgInfo = encodeJSON(rcvMsgInfo) } else { msgInfo = "none" }
+    return String.localizedStringWithFormat(NSLocalizedString("server queue info: %@\n\nlast received msg: %@", comment: "queue info"), encodeJSON(qInfo), msgInfo)
+}
+
+func queueInfoAlert(_ info: String) -> Alert {
+    Alert(
+        title: Text("Message queue info"),
+        message: Text(info),
+        primaryButton: .default(Text("Ok")),
+        secondaryButton: .default(Text("Copy")) { UIPasteboard.general.string = info }
+    )
+}
+
 struct ChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoView(
@@ -11,6 +11,7 @@ import SimpleXChat

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

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

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

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

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

-    private func mergedFeautures() -> [FeatureInfo]? {
+    private func mergedFeatures() -> [FeatureInfo]? {
        var fs: [FeatureInfo] = []
        var icons: Set<String> = []
        if var i = m.getChatItemIndex(chatItem) {
@@ -65,10 +67,10 @@ struct CIChatFeatureView: View {

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

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

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

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

@@ -30,12 +30,12 @@ struct CIFileView: View {
                        Text(file.fileName)
                            .lineLimit(1)
                            .multilineTextAlignment(.leading)
-                            .foregroundColor(.primary)
+                            .foregroundColor(theme.colors.onBackground)
                        Text(prettyFileSize + metaReserve)
                            .font(.caption)
                            .lineLimit(1)
                            .multilineTextAlignment(.leading)
-                            .foregroundColor(.secondary)
+                            .foregroundColor(theme.colors.secondary)
                    }
                } else {
                    Text(metaReserve)
@@ -54,36 +54,32 @@ struct CIFileView: View {
            switch (file.fileStatus) {
            case .sndStored: return file.fileProtocol == .local
            case .sndTransfer: return false
-            case .sndComplete: return false
+            case .sndComplete: return true
            case .sndCancelled: return false
-            case .sndError: return false
+            case .sndError: return true
+            case .sndWarning: return true
            case .rcvInvitation: return true
            case .rcvAccepted: return true
            case .rcvTransfer: return false
+            case .rcvAborted: return true
            case .rcvComplete: return true
            case .rcvCancelled: return false
-            case .rcvError: return false
+            case .rcvError: return true
+            case .rcvWarning: return true
            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:
-                if fileSizeValid() {
+            case .rcvInvitation, .rcvAborted:
+                if fileSizeValid(file) {
                    Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
                        if let user = m.currentUser {
                            await receiveFile(user: user, fileId: file.fileId)
                        }
@@ -114,11 +110,40 @@ 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
            }
        }
@@ -142,9 +167,10 @@ 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() {
-                    fileIcon("arrow.down.doc.fill", color: .accentColor)
+                if fileSizeValid(file) {
+                    fileIcon("arrow.down.doc.fill", color: theme.colors.primary)
                } else {
                    fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
                }
@@ -155,9 +181,12 @@ 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,6 +230,13 @@ 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,7 +11,8 @@ import SimpleXChat

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

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

-            chatItem.timestampText
-                .font(.caption)
-                .foregroundColor(.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
        }
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, colorScheme))
+        .background(chatItemFrameColor(chatItem, theme))
        .cornerRadius(18)
        .textSelection(.disabled)
        .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
@@ -92,7 +99,7 @@ struct CIGroupInvitationView: View {
    private func groupInfoView(_ action: Bool) -> some View {
        var color: Color
        if action && !inProgress {
-            color = chatIncognito ? .indigo : .accentColor
+            color = chatIncognito ? .indigo : theme.colors.primary
        } else {
            color = Color(uiColor: .tertiaryLabel)
        }
@@ -100,9 +107,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
@@ -115,7 +122,7 @@ struct CIGroupInvitationView: View {
        }
    }

-    private func groupInvitationText() -> some View {
+    private func groupInvitationText() -> Text {
        Text(groupInvitationStr())
            .font(.callout)
    }
@@ -137,8 +144,8 @@ struct CIGroupInvitationView: View {
 struct CIGroupInvitationView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            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)
+            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)
        }
    }
 }
@@ -11,13 +11,10 @@ import SimpleXChat

 struct CIImageView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
    let chatItem: ChatItem
-    let image: String
+    var preview: UIImage?
    let maxWidth: CGFloat
-    @Binding var imgWidth: CGFloat?
-    @State var scrollProxy: ScrollViewProxy?
-    @State var metaColor: Color
+    var imgWidth: CGFloat?
    @State private var showFullScreenImage = false

    var body: some View {
@@ -26,19 +23,18 @@ struct CIImageView: View {
            if let uiImage = getLoadedImage(file) {
                imageView(uiImage)
                .fullScreenCover(isPresented: $showFullScreenImage) {
-                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
+                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage)
                }
                .onTapGesture { showFullScreenImage = true }
                .onChange(of: m.activeCallViewIsCollapsed) { _ in
                    showFullScreenImage = false
                }
-            } else if let data = Data(base64Encoded: dropImagePrefix(image)),
-                      let uiImage = UIImage(data: data) {
-                imageView(uiImage)
+            } else if let preview {
+                imageView(preview)
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                Task {
                                    if let user = m.currentUser {
                                        await receiveFile(user: user, fileId: file.fileId)
@@ -61,6 +57,26 @@ 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: ()
                            }
                        }
@@ -70,14 +86,13 @@ struct CIImageView: View {
    }

    private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : img.imageData == nil ? .infinity : maxWidth
-        DispatchQueue.main.async { imgWidth = w }
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
        return ZStack(alignment: .topTrailing) {
            if img.imageData == nil {
                Image(uiImage: img)
                        .resizable()
                        .scaledToFit()
-                        .frame(maxWidth: w)
+                        .frame(width: w)
            } else {
                SwiftyGif(image: img)
                        .frame(width: w, height: w * img.size.height / img.size.width)
@@ -100,13 +115,16 @@ 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()
            }
        }
    }
@@ -116,7 +134,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(metaColor)
+            .foregroundColor(.white)
            .padding(padding)
    }

@@ -9,6 +9,7 @@
 import SwiftUI

 struct CIInvalidJSONView: View {
+    @EnvironmentObject var theme: AppTheme
    var json: String
    @State private var showJSON = false
    
@@ -24,7 +25,7 @@ struct CIInvalidJSONView: View {
        .cornerRadius(18)
        .textSelection(.disabled)
        .onTapGesture { showJSON = true }
-        .sheet(isPresented: $showJSON) {
+        .appSheet(isPresented: $showJSON) {
            invalidJSONView(json)
        }
    }
@@ -44,6 +45,7 @@ func invalidJSONView(_ json: String) -> some View {
    }
    .frame(maxHeight: .infinity)
    .padding()
+    .modifier(ThemedBackground())
 }

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

 struct CILinkView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    let linkPreview: LinkPreview

    var body: some View {
@@ -32,7 +32,7 @@ struct CILinkView: View {
                Text(linkPreview.uri.absoluteString)
                    .font(.caption)
                    .lineLimit(1)
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            }
            .padding(.horizontal, 12)
            .frame(maxWidth: .infinity, alignment: .leading)
@@ -11,6 +11,7 @@ import SimpleXChat

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

 struct CIMetaView: View {
    @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
-    var metaColor = Color.secondary
+    var metaColor: Color
    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 {
@@ -25,24 +30,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)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                }
            case let .sndRcvd(_, sndProgress):
                switch sndProgress {
                case .complete:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                    }
                case .partial:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                    }
                }
            default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
            }
        }
    }
@@ -54,9 +59,20 @@ enum SentCheckmark {
    case rcvd2
 }

-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
+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 {
    var r = Text("")
-    if meta.itemEdited {
+    if showEdited, meta.itemEdited {
        r = r + statusIconText("pencil", color)
    }
    if meta.disappearing {
@@ -67,19 +83,24 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color =
        }
        r = r + 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
+    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(" ")
        }
-        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(" ")
@@ -93,15 +114,16 @@ 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)))
-            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())
+            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)
        }
        .previewLayout(.fixed(width: 360, height: 100))
    }
@@ -13,12 +13,15 @@ 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
@@ -112,18 +115,18 @@ struct CIRcvDecryptionError: View {
                }
                (
                    Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
-                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                        .font(.callout)
                    + Text(" ")
                    + Text("Fix connection")
-                        .foregroundColor(syncSupported ? .accentColor : .secondary)
+                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
                )
            }
            .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
@@ -140,10 +143,10 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
            }
            .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                .padding(.horizontal, 12)
        }
        .onTapGesture(perform: { onClick() })
@@ -13,16 +13,13 @@ import Combine

 struct CIVideoView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
    private let chatItem: ChatItem
-    private let image: String
+    private let preview: UIImage?
    @State private var duration: Int
    @State private var progress: Int = 0
    @State private var videoPlaying: Bool = false
    private let maxWidth: CGFloat
-    @Binding private var videoWidth: CGFloat?
-    @State private var scrollProxy: ScrollViewProxy?
-    @State private var preview: UIImage? = nil
+    private var videoWidth: CGFloat?
    @State private var player: AVPlayer?
    @State private var fullPlayer: AVPlayer?
    @State private var url: URL?
@@ -33,13 +30,12 @@ struct CIVideoView: View {
    @State private var fullScreenTimeObserver: Any? = nil
    @State private var publisher: AnyCancellable? = nil

-    init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
+    init(chatItem: ChatItem, preview: UIImage?, duration: Int, maxWidth: CGFloat, videoWidth: CGFloat?) {
        self.chatItem = chatItem
-        self.image = image
+        self.preview = preview
        self._duration = State(initialValue: duration)
        self.maxWidth = maxWidth
-        self._videoWidth = videoWidth
-        self.scrollProxy = scrollProxy
+        self.videoWidth = videoWidth
        if let url = getLoadedVideo(chatItem.file) {
            let decrypted = chatItem.file?.fileSource?.cryptoArgs == nil ? url : chatItem.file?.fileSource?.decryptedGet()
            self._urlDecrypted = State(initialValue: decrypted)
@@ -49,10 +45,6 @@ struct CIVideoView: View {
            }
            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 {
@@ -63,13 +55,12 @@ struct CIVideoView: View {
                    videoView(player, decrypted, file, preview, duration)
                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
                    videoViewEncrypted(file, defaultPreview, duration)
-                } else if let data = Data(base64Encoded: dropImagePrefix(image)),
-                          let uiImage = UIImage(data: data) {
-                    imageView(uiImage)
+                } else if let preview {
+                    imageView(preview)
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation:
+                            case .rcvInvitation, .rcvAborted:
                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -95,7 +86,7 @@ struct CIVideoView: View {
                }
                durationProgress()
            }
-            if let file = file, case .rcvInvitation = file.fileStatus {
+            if let file = file, showDownloadButton(file.fileStatus) {
                Button {
                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                } label: {
@@ -105,6 +96,14 @@ struct CIVideoView: View {
        }
    }

+    private func showDownloadButton(_ fileStatus: CIFileStatus) -> Bool {
+        switch fileStatus {
+        case .rcvInvitation: true
+        case .rcvAborted: true
+        default: false
+        }
+    }
+
    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
@@ -126,7 +125,7 @@ struct CIVideoView: View {
                if !decryptionInProgress {
                    Button {
                        decrypt(file: file) {
-                            if let decrypted = urlDecrypted {
+                            if urlDecrypted != nil {
                                videoPlaying = true
                                player?.play()
                            }
@@ -144,7 +143,6 @@ 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)
@@ -184,7 +182,7 @@ struct CIVideoView: View {
                    .disabled(!canBePlayed)
                }
            }
-            loadingIndicator()
+            fileStatusIcon()
        }
        .onAppear {
            addObserver(player, url)
@@ -243,18 +241,17 @@ struct CIVideoView: View {
    }

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

-    @ViewBuilder private func loadingIndicator() -> some View {
+    @ViewBuilder private func fileStatusIcon() -> some View {
        if let file = chatItem.file {
            switch file.fileStatus {
            case .sndStored:
@@ -271,7 +268,22 @@ struct CIVideoView: View {
                }
            case .sndComplete: fileIcon("checkmark", 10, 13)
            case .sndCancelled: fileIcon("xmark", 10, 13)
-            case .sndError: 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 .rcvInvitation: fileIcon("arrow.down", 10, 13)
            case .rcvAccepted: fileIcon("ellipsis", 14, 11)
            case let .rcvTransfer(rcvProgress, rcvTotal):
@@ -280,10 +292,26 @@ struct CIVideoView: View {
                } else {
                    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 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 .invalid: fileIcon("questionmark", 10, 13)
-            default: EmptyView()
            }
        }
    }
@@ -318,10 +346,10 @@ struct CIVideoView: View {
    }

    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
        Task {
            if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false)
+                await receiveFile(user, file.fileId, false, false)
            }
        }
    }
@@ -11,6 +11,7 @@ import SimpleXChat

 struct CIVoiceView: View {
    @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    let recordingFile: CIFile?
    let duration: Int
@@ -72,7 +73,7 @@ struct CIVoiceView: View {
            playbackState: $playbackState,
            playbackTime: $playbackTime
        )
-        .foregroundColor(.secondary)
+        .foregroundColor(theme.colors.secondary)
    }
    
    private func playbackSlider() -> some View {
@@ -89,10 +90,11 @@ struct CIVoiceView: View {
                    allowMenu = true
                }
            }
+            .tint(theme.colors.primary)
    }

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

@@ -118,7 +120,7 @@ struct VoiceMessagePlayerTime: View {

 struct VoiceMessagePlayer: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    var recordingFile: CIFile?
    var recordingTime: TimeInterval
@@ -134,17 +136,53 @@ struct VoiceMessagePlayer: View {
        ZStack {
            if let recordingFile = recordingFile {
                switch recordingFile.fileStatus {
-                case .sndStored: playbackButton()
-                case .sndTransfer: playbackButton()
+                case .sndStored:
+                    if recordingFile.fileProtocol == .local {
+                        playbackButton()
+                    } else {
+                        loadingIcon()
+                    }
+                case .sndTransfer: loadingIcon()
                case .sndComplete: playbackButton()
                case .sndCancelled: playbackButton()
-                case .sndError: playbackButton()
-                case .rcvInvitation: downloadButton(recordingFile)
+                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 .rcvAccepted: loadingIcon()
                case .rcvTransfer: loadingIcon()
+                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
-                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
+                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 .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                }
            } else {
@@ -180,26 +218,26 @@ struct VoiceMessagePlayer: View {
                    startPlayback(recordingSource)
                }
            } label: {
-                playPauseIcon("play.fill")
+                playPauseIcon("play.fill", theme.colors.primary)
            }
        case .playing:
            Button {
                audioPlayer?.pause()
                playbackState = .paused
            } label: {
-                playPauseIcon("pause.fill")
+                playPauseIcon("pause.fill", theme.colors.primary)
            }
        case .paused:
            Button {
                audioPlayer?.play()
                playbackState = .playing
            } label: {
-                playPauseIcon("play.fill")
+                playPauseIcon("play.fill", theme.colors.primary)
            }
        }
    }

-    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()
@@ -208,7 +246,7 @@ struct VoiceMessagePlayer: View {
                .foregroundColor(color)
                .padding(.leading, image == "play.fill" ? 4 : 0)
                .frame(width: 56, height: 56)
-                .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
+                .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
                .clipShape(Circle())
            if recordingTime > 0 {
                ProgressCircle(length: recordingTime, progress: $playbackTime)
@@ -217,7 +255,7 @@ struct VoiceMessagePlayer: View {
        }
    }

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

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

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

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

@@ -10,21 +10,21 @@ import SwiftUI
 import SimpleXChat

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

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

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

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

 struct FramedCIVoiceView: View {
+    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
    let recordingFile: CIFile?
    let duration: Int
@@ -42,7 +43,7 @@ struct FramedCIVoiceView: View {
                playbackState: $playbackState,
                playbackTime: $playbackTime
            )
-            .foregroundColor(.secondary)
+            .foregroundColor(theme.colors.secondary)
            .frame(width: 50, alignment: .leading)
            if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
                playbackSlider()
@@ -9,25 +9,19 @@
 import SwiftUI
 import SimpleXChat

-let notesChatColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.21)
-let notesChatColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.19)
-let sentColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.12)
-let sentColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.17)
-private let sentQuoteColorLight = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.11)
-private let sentQuoteColorDark = Color(.sRGB, red: 0.27, green: 0.72, blue: 1, opacity: 0.09)
-
 struct FramedItemView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
+    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
+    var preview: UIImage?
    @Binding var revealed: Bool
    var maxWidth: CGFloat = .infinity
-    @State var scrollProxy: ScrollViewProxy? = nil
    @State var msgWidth: CGFloat = 0
-    @State var imgWidth: CGFloat? = nil
-    @State var videoWidth: CGFloat? = nil
-    @State var metaColor = Color.secondary
+    var imgWidth: CGFloat? = nil
+    var videoWidth: CGFloat? = nil
+    @State private var useWhiteMetaColor: Bool = false
    @State var showFullScreenImage = false
    @Binding var allowMenu: Bool
    @State private var showSecrets = false
@@ -58,39 +52,44 @@ struct FramedItemView: View {
                if let qi = chatItem.quotedItem {
                    ciQuoteView(qi)
                        .onTapGesture {
-                            if let proxy = scrollProxy,
-                               let ci = m.reversedChatItems.first(where: { $0.id == qi.itemId }) {
+                            if let ci = m.reversedChatItems.first(where: { $0.id == qi.itemId }) {
                                withAnimation {
-                                    proxy.scrollTo(ci.viewId, anchor: .bottom)
+                                    scrollModel.scrollToItem(id: ci.id)
                                }
                            }
                        }
+                } else if let itemForwarded = chatItem.meta.itemForwarded {
+                    framedItemHeader(icon: "arrowshape.turn.up.forward", caption: Text(itemForwarded.text(chat.chatInfo.chatType)).italic(), pad: true)
                }

                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: framedMsgContentView)
                    .padding(chatItem.content.msgContent != nil ? 0 : 4)
                    .overlay(DetermineWidth())
            }
-            .onPreferenceChange(MetaColorPreferenceKey.self) { metaColor = $0 }

            if chatItem.content.msgContent != nil {
-                CIMetaView(chat: chat, chatItem: chatItem, metaColor: metaColor)
+                CIMetaView(chat: chat, chatItem: chatItem, metaColor: useWhiteMetaColor ? Color.white : theme.colors.secondary)
                    .padding(.horizontal, 12)
                    .padding(.bottom, 6)
                    .overlay(DetermineWidth())
                    .accessibilityLabel("")
            }
        }
-            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, colorScheme))
+            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, theme))
            .cornerRadius(18)
            .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }

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

@@ -107,29 +106,33 @@ struct FramedItemView: View {
            .padding(.bottom, 2)
        } else {
            switch (chatItem.content.msgContent) {
-            case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
+            case let .image(text, _):
+                CIImageView(chatItem: chatItem, preview: preview, maxWidth: maxWidth, imgWidth: imgWidth)
                    .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
                        .frame(width: 0, height: 0)
-                        .preference(
-                            key: MetaColorPreferenceKey.self,
-                            value: .white
-                        )
+                        .onAppear {
+                            useWhiteMetaColor = true
+                        }
+                        .onDisappear {
+                            useWhiteMetaColor = false
+                        }
                } else {
                    ciMsgContentView(chatItem)
                }
-            case let .video(text, image, duration):
-                CIVideoView(chatItem: chatItem, image: image, duration: duration, maxWidth: maxWidth, videoWidth: $videoWidth, scrollProxy: scrollProxy)
+            case let .video(text, _, duration):
+                CIVideoView(chatItem: chatItem, preview: preview, duration: duration, maxWidth: maxWidth, videoWidth: videoWidth)
                .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
                    .frame(width: 0, height: 0)
-                    .preference(
-                        key: MetaColorPreferenceKey.self,
-                        value: .white
-                    )
+                    .onAppear {
+                        useWhiteMetaColor = true
+                    }
+                    .onDisappear {
+                        useWhiteMetaColor = false
+                    }
                } else {
                    ciMsgContentView(chatItem)
                }
@@ -155,15 +158,8 @@ struct FramedItemView: View {
            }
        }
    }
-    
-    private func msgDeliveryError(_ err: LocalizedStringKey) {
-        AlertManager.shared.showAlertMsg(
-            title: "Message delivery error",
-            message: err
-        )
-    }

-    @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text) -> some View {
+    @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text, pad: Bool = false) -> some View {
        let v = HStack(spacing: 6) {
            if let icon = icon {
                Image(systemName: icon)
@@ -175,13 +171,13 @@ struct FramedItemView: View {
                .font(.caption)
                .lineLimit(1)
        }
-        .foregroundColor(.secondary)
+        .foregroundColor(theme.colors.secondary)
        .padding(.horizontal, 12)
        .padding(.top, 6)
-        .padding(.bottom, chatItem.quotedItem == nil ? 6 : 0) // TODO think how to regroup
+        .padding(.bottom, pad || (chatItem.quotedItem == nil && chatItem.meta.itemForwarded == nil) ? 6 : 0)
        .overlay(DetermineWidth())
        .frame(minWidth: msgWidth, alignment: .leading)
-        .background(chatItemFrameContextColor(chatItem, colorScheme))
+        .background(chatItemFrameContextColor(chatItem, theme))
        if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
            v.frame(maxWidth: mediaWidth, alignment: .leading)
        } else {
@@ -233,7 +229,7 @@ struct FramedItemView: View {
            // if enable this always, size of the framed voice message item will be incorrect after end of playback
            .overlay { if case .voice = chatItem.content.msgContent {} else { DetermineWidth() } }
            .frame(minWidth: msgWidth, alignment: .leading)
-            .background(chatItemFrameContextColor(chatItem, colorScheme))
+            .background(chatItemFrameContextColor(chatItem, theme))

        if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
            v.frame(maxWidth: mediaWidth, alignment: .leading)
@@ -246,13 +242,17 @@ struct FramedItemView: View {
        Group {
            if let sender = qi.getSender(membership()) {
                VStack(alignment: .leading, spacing: 2) {
-                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    Text(sender)
+                        .font(.caption)
+                        .foregroundColor(theme.colors.secondary)
+                        .lineLimit(1)
                    ciQuotedMsgTextView(qi, lines: 2)
                }
            } else {
                ciQuotedMsgTextView(qi, lines: 3)
            }
        }
+        .fixedSize(horizontal: false, vertical: true)
        .padding(.top, 6)
        .padding(.horizontal, 12)
    }
@@ -343,38 +343,31 @@ func isRightToLeft(_ s: String) -> Bool {
    return false
 }

-private struct MetaColorPreferenceKey: PreferenceKey {
-    static var defaultValue = Color.secondary
-    static func reduce(value: inout Color, nextValue: () -> Color) {
-        value = nextValue()
-    }
-}
-
 func onlyImageOrVideo(_ ci: ChatItem) -> Bool {
    if case let .image(text, _) = ci.content.msgContent {
-        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && text == ""
+        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && ci.meta.itemForwarded == nil && text == ""
    } else if case let .video(text, _, _) = ci.content.msgContent {
-        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && text == ""
+        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && ci.meta.itemForwarded == nil && text == ""
    }
    return false
 }

-func chatItemFrameColorMaybeImageOrVideo(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameColorMaybeImageOrVideo(_ ci: ChatItem, _ theme: AppTheme) -> Color {
    onlyImageOrVideo(ci)
    ? Color.clear
-    : chatItemFrameColor(ci, colorScheme)
+    : chatItemFrameColor(ci, theme)
 }

-func chatItemFrameColor(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameColor(_ ci: ChatItem, _ theme: AppTheme) -> Color {
    ci.chatDir.sent
-    ? (colorScheme == .light ? sentColorLight : sentColorDark)
-    : Color(uiColor: .tertiarySystemGroupedBackground)
+    ? theme.appColors.sentMessage
+    : theme.appColors.receivedMessage
 }

-func chatItemFrameContextColor(_ ci: ChatItem, _ colorScheme: ColorScheme) -> Color {
+func chatItemFrameContextColor(_ ci: ChatItem, _ theme: AppTheme) -> Color {
    ci.chatDir.sent
-    ? (colorScheme == .light ? sentQuoteColorLight : sentQuoteColorDark)
-    : Color(uiColor: .quaternarySystemFill)
+    ? theme.appColors.sentQuote
+    : theme.appColors.receivedQuote
 }

 struct FramedItemView_Previews: PreviewProvider {
@@ -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,9 +71,7 @@ struct FullScreenMediaView: View {
                let w = abs(t.width)
                if t.height > 60 && t.height > w * 2  {
                    showView = false
-                    if let proxy = scrollProxy {
-                        proxy.scrollTo(chatItem.viewId)
-                    }
+                    scrollModel.scrollToItem(id: chatItem.id)
                } else if w > 60 && w > abs(t.height) * 2 && !scrolling {
                    let previous = t.width > 0
                    scrolling = true
@@ -11,6 +11,7 @@ import SimpleXChat

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

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

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

@@ -62,7 +64,7 @@ struct CIMsgError: View {
            Text(chatItem.content.text)
                .foregroundColor(.red)
                .italic()
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                .padding(.horizontal, 12)
        }
        .padding(.leading, 12)
@@ -11,7 +11,7 @@ import SimpleXChat

 struct MarkedDeletedItemView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    @Binding var revealed: Bool
@@ -19,10 +19,10 @@ struct MarkedDeletedItemView: View {
    var body: some View {
        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
        .font(.caption)
-        .foregroundColor(.secondary)
+        .foregroundColor(theme.colors.secondary)
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, colorScheme))
+        .background(chatItemFrameColor(chatItem, theme))
        .cornerRadius(18)
        .textSelection(.disabled)
    }
@@ -26,6 +26,7 @@ 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
@@ -35,6 +36,8 @@ struct MsgContentView: View {
    @State private var typingIdx = 0
    @State private var timer: Timer?

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

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

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

-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool, secondaryColor: Color) -> Text {
    let s = text
    var res: Text
    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
@@ -100,7 +103,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
    }

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

    if let s = sender {
@@ -0,0 +1,192 @@
+//
+//  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?
+    @State private var hasSimplexLink_: Bool?
+    private let chatsToForwardTo = filterChatsToForwardTo()
+
+    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 foundChat(_ chat: Chat, _ searchStr: String) -> Bool {
+        let cInfo = chat.chatInfo
+        return switch cInfo {
+        case let .direct(contact):
+            viewNameContains(cInfo, searchStr) ||
+            contact.profile.displayName.localizedLowercase.contains(searchStr) ||
+            contact.fullName.localizedLowercase.contains(searchStr)
+        default:
+            viewNameContains(cInfo, searchStr)
+        }
+
+        func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
+            cInfo.chatViewName.localizedLowercase.contains(s)
+        }
+    }
+
+    private func prohibitedByPref(_ chat: Chat) -> Bool {
+        // preference checks should match checks in compose view
+        let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
+        let fileProhibited = (ci.content.msgContent?.isMediaOrFileAttachment ?? false) && !chat.groupFeatureEnabled(.files)
+        let voiceProhibited = (ci.content.msgContent?.isVoice ?? false) && !chat.chatInfo.featureEnabled(.voice)
+        return switch chat.chatInfo {
+        case .direct: voiceProhibited
+        case .group: simplexLinkProhibited || fileProhibited || voiceProhibited
+        case .local: false
+        case .contactRequest: false
+        case .contactConnection: false
+        case .invalidJSON: false
+        }
+    }
+
+    private var hasSimplexLink: Bool {
+        if let hasSimplexLink_ { return hasSimplexLink_ }
+        let r =
+            if let mcText = ci.content.msgContent?.text,
+               let parsedMsg = parseSimpleXMarkdown(mcText) {
+                parsedMsgHasSimplexLink(parsedMsg)
+            } else {
+                false
+            }
+        hasSimplexLink_ = r
+        return r
+    }
+
+    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 = prohibitedByPref(chat)
+        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)
+                    chatModel.chatId = 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)
+        }
+    }
+}
+
+private func filterChatsToForwardTo() -> [Chat] {
+    var filteredChats = ChatModel.shared.chats.filter { c in
+        c.chatInfo.chatType != .local && canForwardToChat(c)
+    }
+    if let privateNotes = ChatModel.shared.chats.first(where: { $0.chatInfo.chatType == .local }) {
+        filteredChats.insert(privateNotes, at: 0)
+    }
+    return filteredChats
+}
+
+private func canForwardToChat(_ chat: Chat) -> Bool {
+    switch chat.chatInfo {
+    case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
+    case let .group(groupInfo): groupInfo.sendMsgEnabled
+    case let .local(noteFolder): noteFolder.sendMsgEnabled
+    case .contactRequest: false
+    case .contactConnection: false
+    case .invalidJSON: false
+    }
+}
+
+#Preview {
+    ChatItemForwardingView(
+        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
+        fromChatInfo: .direct(contact: Contact.sampleData),
+        composeState: Binding.constant(ComposeState(message: "hello"))
+    ).environmentObject(CurrentColors.toAppTheme())
+}
@@ -11,16 +11,20 @@ import SimpleXChat

 struct ChatItemInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var theme: AppTheme
    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
    }

@@ -68,9 +72,20 @@ 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) {
@@ -86,12 +101,22 @@ 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 {
@@ -101,6 +126,7 @@ struct ChatItemInfoView: View {
            }
        } else {
            historyTab()
+            .modifier(ThemedBackground())
        }
    }

@@ -137,6 +163,35 @@ 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()
+                        }
+                    }
+                }
            }
        }
    }
@@ -161,7 +216,7 @@ struct ChatItemInfoView: View {
                    }
                    else {
                        Text("No history")
-                            .foregroundColor(.secondary)
+                            .foregroundColor(theme.colors.secondary)
                            .frame(maxWidth: .infinity)
                    }
                }
@@ -176,7 +231,7 @@ struct ChatItemInfoView: View {
            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, colorScheme))
+                .background(chatItemFrameColor(ci, theme))
                .cornerRadius(18)
                .contextMenu {
                    if itemVersion.msgContent.text != "" {
@@ -207,18 +262,19 @@ struct ChatItemInfoView: View {
        } else {
            Text("no text")
                .italic()
-                .foregroundColor(.secondary)
+                .foregroundColor(theme.colors.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))
+            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary))
        }
    }

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

-    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
+    func quotedMsgFrameColor(_ qi: CIQuote, _ theme: AppTheme) -> Color {
        (qi.chatDir?.sent ?? false)
-        ? (colorScheme == .light ? sentColorLight : sentColorDark)
-        : Color(uiColor: .tertiarySystemGroupedBackground)
+        ? 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 {
+                        chatModel.chatId = 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)
+            }
+        }
    }

    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
@@ -295,35 +419,38 @@ struct ChatItemInfoView: View {
            let mss = membersStatuses(memberDeliveryStatuses)
            if !mss.isEmpty {
                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
                }
            } else {
                Text("No delivery information")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            }
        }
    }

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

-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus, _ sentViaProxy: Bool?) -> some View {
        HStack{
-            ProfileImage(imageStr: member.image)
-                .frame(width: 30, height: 30)
+            ProfileImage(imageStr: member.image, size: 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 {
-                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                if let (icon, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary) {
                    switch status {
                    case .sndRcvd:
                        ZStack(alignment: .trailing) {
@@ -382,8 +509,12 @@ 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("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt)),
+                String.localizedStringWithFormat(NSLocalizedString("Message status: %@", comment: "copied message info"), meta.itemStatus.id)
            ]
+            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,9 +11,9 @@ 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?
@@ -24,7 +24,6 @@ struct ChatItemView: View {
        chatItem: ChatItem,
        showMember: Bool = false,
        maxWidth: CGFloat = .infinity,
-        scrollProxy: ScrollViewProxy? = nil,
        revealed: Binding<Bool>,
        allowMenu: Binding<Bool> = .constant(false),
        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
@@ -34,7 +33,6 @@ struct ChatItemView: View {
        self.chat = chat
        self.chatItem = chatItem
        self.maxWidth = maxWidth
-        _scrollProxy = .init(initialValue: scrollProxy)
        _revealed = revealed
        _allowMenu = allowMenu
        _audioPlayer = audioPlayer
@@ -46,7 +44,7 @@ struct ChatItemView: 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.itemDeleted == nil && !ci.meta.isLive {
+        } else if ci.quotedItem == nil && ci.meta.itemForwarded == 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 {
@@ -62,12 +60,43 @@ struct ChatItemView: View {
    }

    private func framedItemView() -> some View {
-        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        let preview = chatItem.content.msgContent
+            .flatMap {
+                switch $0 {
+                case let .image(_, image): image
+                case let .video(_, image, _): image
+                default: nil
+                }
+            }
+            .map { dropImagePrefix($0) }
+            .flatMap { Data(base64Encoded: $0) }
+            .flatMap { UIImage(data: $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,
+            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
@@ -97,14 +126,14 @@ struct ChatItemContentView<Content: View>: View {
        case .sndGroupEvent: eventItemView()
        case .rcvConnEvent: eventItemView()
        case .sndConnEvent: eventItemView()
-        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
-        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
+        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 .rcvChatPreference(feature, allowed, param):
            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
        case let .sndChatPreference(feature, _, _):
-            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)
+            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))
        case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
        case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
        case .sndModerated: deletedItemView()
@@ -127,29 +156,29 @@ struct ChatItemContentView<Content: View>: View {
    }

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

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

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

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

    private var mergedGroupEventText: Text? {
@@ -179,7 +208,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(.secondary)
+            .foregroundColor(theme.colors.secondary)
            .fontWeight(.light)
        : e2eeInfoNoPQText()
    }
@@ -187,24 +216,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(.secondary)
+            .foregroundColor(theme.colors.secondary)
            .fontWeight(.light)
    }
 }

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

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

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

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

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

 struct ComposeImageView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    let images: [String]
    let cancelImage: (() -> Void)
    let cancelEnabled: Bool
@@ -48,7 +48,7 @@ struct ComposeImageView: View {
        }
        .padding(.vertical, 1)
        .padding(.trailing, 12)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
        .frame(maxWidth: .infinity)
        .padding(.top, 8)
    }
@@ -40,7 +40,7 @@ func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
 }

 struct ComposeLinkView: View {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    let linkPreview: LinkPreview?
    var cancelPreview: (() -> Void)? = nil
    let cancelEnabled: Bool
@@ -62,7 +62,7 @@ struct ComposeLinkView: View {
        }
        .padding(.vertical, 1)
        .padding(.trailing, 12)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
        .frame(maxWidth: .infinity)
        .padding(.top, 8)
    }
@@ -82,7 +82,7 @@ struct ComposeLinkView: View {
                Text(linkPreview.uri.absoluteString)
                    .font(.caption)
                    .lineLimit(1)
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            }
            .padding(.vertical, 5)
            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
@@ -23,6 +23,7 @@ enum ComposeContextItem {
    case noContextItem
    case quotedItem(chatItem: ChatItem)
    case editingItem(chatItem: ChatItem)
+    case forwardingItem(chatItem: ChatItem, fromChatInfo: ChatInfo)
 }

 enum VoiceMessageRecordingState {
@@ -72,6 +73,13 @@ 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,
@@ -102,12 +110,19 @@ 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 || liveMessage != nil
+        default: return !message.isEmpty || forwarding || liveMessage != nil
        }
    }

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

    var attachmentDisabled: Bool {
-        if editing || liveMessage != nil || inProgress { return true }
+        if editing || forwarding || liveMessage != nil || inProgress { return true }
        switch preview {
        case .noPreview: return false
        case .linkPreview: return false
@@ -161,6 +176,16 @@ 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
    }
@@ -229,11 +254,13 @@ 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> = []
@@ -260,6 +287,17 @@ struct ComposeView: View {
            if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                ContextInvitingContactMemberView()
            }
+            // 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")
+            } else if fileProhibited {
+                msgNotAllowedView("Files and media not allowed", icon: "doc")
+            } else if voiceProhibited {
+                msgNotAllowedView("Voice messages not allowed", icon: "mic")
+            }
            contextItemView()
            switch (composeState.editing, composeState.preview) {
            case (true, .filePreview): EmptyView()
@@ -277,8 +315,9 @@ 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 {
+                   !g.fullGroupPreferences.files.on(for: g.membership) {
                    b.disabled(true).onTapGesture {
                        AlertManager.shared.showAlertMsg(
                            title: "Files and media prohibited!",
@@ -303,6 +342,7 @@ struct ComposeView: View {
                        },
                        nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                        voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
+                        disableSendButton: simplexLinkProhibited || fileProhibited || voiceProhibited,
                        showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                        startVoiceMessageRecording: {
                            Task {
@@ -316,16 +356,16 @@ struct ComposeView: View {
                        keyboardVisible: $keyboardVisible,
                        sendButtonColor: chat.chatInfo.incognito
                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : .accentColor
+                            : theme.colors.primary
                    )
                    .padding(.trailing, 12)
-                    .background(.background)
+                    .background(theme.colors.background)
                    .disabled(!chat.userCanSend)

                    if chat.userIsObserver {
                        Text("you are observer")
                            .italic()
-                            .foregroundColor(.secondary)
+                            .foregroundColor(theme.colors.secondary)
                            .padding(.horizontal, 12)
                            .onTapGesture {
                                AlertManager.shared.showAlertMsg(
@@ -337,13 +377,18 @@ struct ComposeView: View {
                }
            }
        }
-        .onChange(of: composeState.message) { _ in
+        .onChange(of: composeState.message) { msg in
            if composeState.linkPreviewAllowed {
-                if composeState.message.count > 0 {
-                    showLinkPreview(composeState.message)
+                if msg.count > 0 {
+                    showLinkPreview(msg)
                } else {
                    resetLinkPreview()
+                    hasSimplexLink = false
                }
+            } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
+                (_, hasSimplexLink) = parseMessage(msg)
+            } else {
+                hasSimplexLink = false
            }
        }
        .onChange(of: chat.userCanSend) { canSend in
@@ -610,6 +655,18 @@ struct ComposeView: View {
        }
    }

+    private func msgNotAllowedView(_ reason: LocalizedStringKey, icon: String) -> some View {
+        HStack {
+            Image(systemName: icon).foregroundColor(theme.colors.secondary)
+            Text(reason).italic()
+        }
+        .padding(12)
+        .frame(minHeight: 50)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .padding(.top, 8)
+    }
+
    @ViewBuilder private func contextItemView() -> some View {
        switch composeState.contextItem {
        case .noContextItem:
@@ -628,6 +685,14 @@ struct ComposeView: View {
                contextIcon: "pencil",
                cancelContextItem: { clearState() }
            )
+        case let .forwardingItem(chatItem: forwardedItem, _):
+            ContextItemView(
+                chat: chat,
+                contextItem: forwardedItem,
+                contextIcon: "arrowshape.turn.up.forward",
+                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) },
+                showSender: false
+            )
        }
    }

@@ -649,6 +714,11 @@ 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 {
@@ -694,7 +764,15 @@ struct ComposeView: View {
                }
            }
        }
-        await MainActor.run { clearState(live: live) }
+        await MainActor.run {
+            let wasForwarding = composeState.forwarding
+            clearState(live: live)
+            if wasForwarding,
+               chatModel.draftChatId == chat.chatInfo.id,
+               let draft = chatModel.draft {
+                composeState = draft
+            }
+        }
        return sent

        func sending() async {
@@ -815,10 +893,27 @@ 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),
+                if let url = parseMessage(msgText).url,
                   let linkPreview = linkPreview,
                   url == linkPreview.uri {
                    return .link(text: msgText, preview: linkPreview)
@@ -947,7 +1042,7 @@ struct ComposeView: View {

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

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

    private func isSimplexLink(_ link: String) -> Bool {
@@ -1009,6 +1108,10 @@ struct ComposeView: View {
    }
 }

+func parsedMsgHasSimplexLink(_ parsedMsg: [FormattedText]) -> Bool {
+    parsedMsg.contains(where: { ft in ft.format?.isSimplexLink ?? false })
+}
+
 struct ComposeView_Previews: PreviewProvider {
    static var previews: some View {
        let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
@@ -25,7 +25,7 @@ func voiceMessageTime_(_ time: TimeInterval?) -> String {

 struct ComposeVoiceView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
    var recordingFileName: String
    @Binding var recordingTime: TimeInterval?
    @Binding var recordingState: VoiceMessageRecordingState
@@ -50,7 +50,7 @@ struct ComposeVoiceView: View {
        }
        .padding(.vertical, 1)
        .frame(height: ComposeVoiceView.previewHeight)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .background(theme.appColors.sentMessage)
        .frame(maxWidth: .infinity)
        .padding(.top, 8)
    }
@@ -80,7 +80,7 @@ struct ComposeVoiceView: View {
                    Button {
                        startPlayback()
                    } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon("play.fill", theme.colors.primary)
                    }
                    Text(voiceMessageTime_(recordingTime))
                case .playing:
@@ -88,7 +88,7 @@ struct ComposeVoiceView: View {
                        audioPlayer?.pause()
                        playbackState = .paused
                    } label: {
-                        playPauseIcon("pause.fill")
+                        playPauseIcon("pause.fill", theme.colors.primary)
                    }
                    Text(voiceMessageTime_(playbackTime))
                case .paused:
@@ -96,7 +96,7 @@ struct ComposeVoiceView: View {
                        audioPlayer?.play()
                        playbackState = .playing
                    } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon("play.fill", theme.colors.primary)
                    }
                    Text(voiceMessageTime_(playbackTime))
                }
@@ -131,7 +131,7 @@ struct ComposeVoiceView: View {
        }
    }

-    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color) -> some View {
        Image(systemName: image)
            .resizable()
            .aspectRatio(contentMode: .fit)
@@ -147,9 +147,11 @@ 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
@@ -158,10 +160,12 @@ 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?

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

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

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

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

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

    private func msgContentView(lines: Int) -> some View {
-        MsgContentView(
-            chat: chat,
-            text: contextItem.text,
-            formattedText: contextItem.formattedText,
-            showSecrets: false
-        )
-        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-        .lineLimit(lines)
+        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(" ")
+        }
    }
 }

@@ -16,7 +16,6 @@ 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
@@ -29,14 +28,18 @@ struct NativeTextEditor: UIViewRepresentable {
    
    func makeUIView(context: Context) -> UITextView {
        let field = CustomUITextField(height: _height)
+        field.backgroundColor = .clear
        field.text = text
-        field.textAlignment = alignment == .leading ? .left : .right
+        field.textAlignment = alignment(text)
        field.autocapitalizationType = .sentences
        field.setOnTextChangedListener { newText, images in
            if !disableEditing {
-                // Speed up the process of updating layout, reduce jumping content on screen
-                if !isShortEmoji(newText) { updateHeight(field) }
                text = newText
+                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
            } else {
                field.text = text
            }
@@ -53,10 +56,12 @@ struct NativeTextEditor: UIViewRepresentable {
    }
    
    func updateUIView(_ field: UITextView, context: Context) {
-        field.text = text
-        field.textAlignment = alignment == .leading ? .left : .right
-        updateFont(field)
-        updateHeight(field)
+        if field.markedTextRange == nil && field.text != text {
+            field.text = text
+            field.textAlignment = alignment(text)
+            updateFont(field)
+            updateHeight(field)
+        }
    }

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

    private func updateFont(_ field: UITextView) {
-        field.font = isShortEmoji(field.text)
+        let newFont = 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
@@ -205,7 +217,6 @@ 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,6 +13,7 @@ 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
@@ -20,6 +21,7 @@ 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
@@ -48,18 +50,16 @@ struct SendMessageView: View {
                        Text("Voice message…")
                            .font(teFont.italic())
                            .multilineTextAlignment(.leading)
-                            .foregroundColor(.secondary)
+                            .foregroundColor(theme.colors.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)
@@ -109,6 +109,7 @@ struct SendMessageView: View {
        } else if showVoiceMessageButton
            && composeState.message.isEmpty
            && !composeState.editing
+            && !composeState.forwarding
            && composeState.liveMessage == nil
            && ((composeState.noPreview && vmrs == .noRecording)
                || (vmrs == .recording && holdingVMR)) {
@@ -184,7 +185,8 @@ struct SendMessageView: View {
            !composeState.sendEnabled ||
            composeState.inProgress ||
            (!voiceMessageAllowed && composeState.voicePreview) ||
-            composeState.endLiveDisabled
+            composeState.endLiveDisabled ||
+            disableSendButton
        )
        .frame(width: 29, height: 29)
        .contextMenu{
@@ -246,6 +248,7 @@ struct SendMessageView: View {
    }

    private struct RecordVoiceMessageButton: View {
+        @EnvironmentObject var theme: AppTheme
        var startVoiceMessageRecording: (() -> Void)?
        var finishVoiceMessageRecording: (() -> Void)?
        @Binding var holdingVMR: Bool
@@ -255,7 +258,7 @@ struct SendMessageView: View {
        var body: some View {
            Button(action: {}) {
                Image(systemName: "mic.fill")
-                    .foregroundColor(.accentColor)
+                    .foregroundColor(theme.colors.primary)
            }
            .disabled(disabled)
            .frame(width: 29, height: 29)
@@ -308,7 +311,7 @@ struct SendMessageView: View {
            }
        } label: {
            Image(systemName: "mic")
-                .foregroundColor(.secondary)
+                .foregroundColor(theme.colors.secondary)
        }
        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
@@ -322,7 +325,7 @@ struct SendMessageView: View {
            Image(systemName: "multiply")
                .resizable()
                .scaledToFit()
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                .frame(width: 15, height: 15)
        }
        .frame(width: 29, height: 29)
@@ -339,7 +342,7 @@ struct SendMessageView: View {
            Image(systemName: "bolt.fill")
                .resizable()
                .scaledToFit()
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
                .frame(width: 20, height: 20)
        }
        .frame(width: 29, height: 29)
@@ -382,7 +385,7 @@ struct SendMessageView: View {
            }
            Task {
                _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
-                while composeState.liveMessage != nil {
+                while await composeState.liveMessage != nil {
                    await update()
                    _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
                }
@@ -393,7 +396,7 @@ struct SendMessageView: View {
    private func finishVoiceMessageRecordingButton() -> some View {
        Button(action: { finishVoiceMessageRecording?() }) {
            Image(systemName: "stop.fill")
-                .foregroundColor(.accentColor)
+                .foregroundColor(theme.colors.primary)
        }
        .disabled(composeState.inProgress)
        .frame(width: 29, height: 29)
@@ -12,6 +12,7 @@ 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
@@ -66,8 +67,8 @@ struct ContactPreferencesView: View {
            .frame(height: 36)
            infoRow("Contact allows", pref.contactPreference.allow.text)
        }
-        header: { featureHeader(feature, enabled) }
-        footer: { featureFooter(feature, enabled) }
+        header: { featureHeader(feature, enabled).foregroundColor(theme.colors.secondary) }
+        footer: { featureFooter(feature, enabled).foregroundColor(theme.colors.secondary) }
    }

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

    private func featureHeader(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
@@ -21,6 +21,7 @@ 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
@@ -70,7 +71,7 @@ struct AddGroupMembersViewCommon: View {

                if (membersToAdd.isEmpty) {
                    Text("No contacts to add")
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                        .padding()
                        .frame(maxWidth: .infinity, alignment: .center)
                        .listRowBackground(Color.clear)
@@ -90,16 +91,18 @@ 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)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.primary, theme.colors.secondary)
                            .padding(.leading, 2)
                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                        let members = s == "" ? membersToAdd : membersToAdd.filter { $0.chatViewName.localizedLowercase.contains(s) }
@@ -125,6 +128,7 @@ struct AddGroupMembersViewCommon: View {
        .onChange(of: selectedContacts) { _ in
            searchFocussed = false
        }
+        .modifier(ThemedBackground(grouped: true))
    }

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

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

@@ -13,6 +13,7 @@ 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
@@ -62,7 +63,7 @@ struct GroupChatInfoView: View {
        NavigationView {
            let members = chatModel.groupMembers
                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
-                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
+                .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }

            List {
                groupInfoHeader()
@@ -81,13 +82,19 @@ 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("\(members.count + 1) members") {
+                Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
                    if groupInfo.canAddMembers {
                        groupLinkButton()
                        if (chat.chatInfo.incognito) {
@@ -99,7 +106,7 @@ struct GroupChatInfoView: View {
                        }
                    }
                    if members.count > 8 {
-                        searchFieldView(text: $searchText, focussed: $searchFocussed)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
                            .padding(.leading, 8)
                    }
                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
@@ -129,12 +136,13 @@ struct GroupChatInfoView: View {
                }

                if developerTools {
-                    Section(header: Text("For console")) {
+                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
                        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)
@@ -172,8 +180,7 @@ struct GroupChatInfoView: View {
    private func groupInfoHeader() -> some View {
        VStack {
            let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
-                .frame(width: 192, height: 192)
+            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
                .padding(.top, 12)
                .padding()
            Text(cInfo.displayName)
@@ -211,25 +218,25 @@ struct GroupChatInfoView: View {
    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{
-                ProfileImage(imageStr: member.image)
-                    .frame(width: 38, height: 38)
+                ProfileImage(imageStr: member.image, size: 38)
                    .padding(.trailing, 2)
                // TODO server connection status
                VStack(alignment: .leading) {
-                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
+                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)
                    (member.verified ? memberVerifiedShield + t : t)
                        .lineLimit(1)
                    let s = Text(member.memberStatus.shortText)
                    (user ? Text ("you: ") + s : s)
                        .lineLimit(1)
                        .font(.caption)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                }
                Spacer()
                memberInfo(member)
@@ -262,12 +269,12 @@ struct GroupChatInfoView: View {
        @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
            if member.blocked {
                Text("blocked")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            } else {
                let role = member.memberRole
                if [.owner, .admin, .observer].contains(role) {
                    Text(member.memberRole.text)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                }
            }
        }
@@ -278,13 +285,13 @@ struct GroupChatInfoView: View {
                    Button {
                        alert = .blockMemberAlert(mem: member)
                    } label: {
-                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
+                        Label("Block member", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
                    }
                } else {
                    Button {
                        alert = .unblockMemberAlert(mem: member)
                    } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
                    }
                }
            }
@@ -296,13 +303,13 @@ struct GroupChatInfoView: View {
                    Button {
                        alert = .unblockForAllAlert(mem: member)
                    } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
                    }
                } else {
                    Button {
                        alert = .blockForAllAlert(mem: member)
                    } label: {
-                        Label("Block for all", systemImage: "hand.raised").foregroundColor(.secondary)
+                        Label("Block for all", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
                    }
                }
            }
@@ -318,6 +325,14 @@ 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 {
@@ -335,6 +350,7 @@ struct GroupChatInfoView: View {
                creatingGroup: false
            )
            .navigationBarTitle("Group link")
+            .modifier(ThemedBackground(grouped: true))
            .navigationBarTitleDisplayMode(.large)
        } label: {
            if groupLink == nil {
@@ -352,6 +368,7 @@ struct GroupChatInfoView: View {
                groupProfile: groupInfo.groupProfile
            )
            .navigationBarTitle("Group profile")
+            .modifier(ThemedBackground())
            .navigationBarTitleDisplayMode(.large)
        } label: {
            Label("Edit group profile", systemImage: "pencil")
@@ -366,6 +383,7 @@ struct GroupChatInfoView: View {
                welcomeText: groupInfo.groupProfile.description ?? ""
            )
            .navigationTitle("Welcome message")
+            .modifier(ThemedBackground(grouped: true))
            .navigationBarTitleDisplayMode(.large)
        } label: {
            groupInfo.groupProfile.description == nil
@@ -520,6 +538,7 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
            creatingGroup: creatingGroup
        )
        .navigationBarTitle("Group preferences")
+        .modifier(ThemedBackground(grouped: true))
        .navigationBarTitleDisplayMode(.large)
    } label: {
        if creatingGroup {
@@ -530,14 +549,6 @@ 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!"),
@@ -133,6 +133,7 @@ struct GroupLinkView: View {
                shouldCreate = false
            }
        }
+        .modifier(ThemedBackground(grouped: true))
    }

    private func createGroupLink() {
@@ -11,6 +11,7 @@ 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
@@ -35,6 +36,7 @@ struct GroupMemberInfoView: View {
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
        case planAndConnectAlert(alert: PlanAndConnectAlert)
+        case queueInfo(info: String)
        case error(title: LocalizedStringKey, error: LocalizedStringKey)

        var id: String {
@@ -49,6 +51,7 @@ 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 .error(title, _): return "error \(title)"
            }
        }
@@ -83,7 +86,7 @@ struct GroupMemberInfoView: View {
                        Section {
                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
                                knownDirectChatButton(chat)
-                            } else if groupInfo.fullGroupPreferences.directMessages.on {
+                            } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                                if let contactId = member.memberContactId {
                                    newDirectChatButton(contactId)
                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
@@ -110,7 +113,7 @@ struct GroupMemberInfoView: View {
                                Label("Share address", systemImage: "square.and.arrow.up")
                            }
                            if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                                    connectViaAddressButton(contactLink)
                                }
                            } else {
@@ -118,12 +121,14 @@ struct GroupMemberInfoView: View {
                            }
                        } 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("Member") {
+                    Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
                        infoRow("Group", groupInfo.displayName)

                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
@@ -145,7 +150,7 @@ struct GroupMemberInfoView: View {
                    }

                    if let connStats = connectionStats {
-                        Section("Servers") {
+                        Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
                            // TODO network connection status
                            Button("Change receiving address") {
                                alert = .switchAddressAlert
@@ -163,8 +168,8 @@ struct GroupMemberInfoView: View {
                                    || connStats.ratchetSyncSendProhibited
                                )
                            }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                        }
                    }

@@ -175,9 +180,21 @@ struct GroupMemberInfoView: View {
                    }

                    if developerTools {
-                        Section("For console") {
+                        Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
                            infoRow("Local name", member.localDisplayName)
                            infoRow("Database ID", "\(member.groupMemberId)")
+                            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) }
+                                    }
+                                }
+                            }
                        }
                    }
                }
@@ -223,6 +240,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 .error(title, error): return Alert(title: Text(title), message: Text(error))
                }
            }
@@ -232,6 +250,7 @@ struct GroupMemberInfoView: View {
                ProgressView().scaleEffect(2)
            }
        }
+        .modifier(ThemedBackground(grouped: true))
    }

    func connectViaAddressButton(_ contactLink: String) -> some View {
@@ -305,14 +324,13 @@ struct GroupMemberInfoView: View {

    private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
        VStack {
-            ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))
-                .frame(width: 192, height: 192)
+            ProfileImage(imageStr: mem.image, size: 192, color: Color(uiColor: .tertiarySystemFill))
                .padding(.top, 12)
                .padding()
            if mem.verified {
                (
                    Text(Image(systemName: "checkmark.shield"))
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                        .font(.title2)
                    + Text(" ")
                    + Text(mem.displayName)
@@ -360,6 +378,7 @@ struct GroupMemberInfoView: View {
            )
            .navigationBarTitleDisplayMode(.inline)
            .navigationTitle("Security code")
+            .modifier(ThemedBackground())
        } label: {
            Label(
                member.verified ? "View security code" : "Verify security code",
@@ -409,7 +428,7 @@ struct GroupMemberInfoView: View {
        Section {
            if mem.blockedByAdmin {
                Label("Blocked by admin", systemImage: "hand.raised")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            } else if mem.memberSettings.showMessages {
                blockMemberButton(mem)
            } else {
@@ -9,9 +9,16 @@
 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
@@ -24,10 +31,11 @@ struct GroupPreferencesView: View {
            List {
                featureSection(.timedMessages, $preferences.timedMessages.enable)
                featureSection(.fullDelete, $preferences.fullDelete.enable)
-                featureSection(.directMessages, $preferences.directMessages.enable)
+                featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
                featureSection(.reactions, $preferences.reactions.enable)
-                featureSection(.voice, $preferences.voice.enable)
-                featureSection(.files, $preferences.files.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(.history, $preferences.history.enable)

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

-    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>) -> some View {
+    private func featureSection(_ feature: GroupFeature, _ enableFeature: Binding<GroupFeatureEnabled>, _ enableForRole: Binding<GroupMemberRole?>? = nil) -> some View {
        Section {
-            let color: Color = enableFeature.wrappedValue == .on ? .green : .secondary
+            let color: Color = enableFeature.wrappedValue == .on ? .green : theme.colors.secondary
            let icon = enableFeature.wrappedValue == .on ? feature.iconFilled : feature.icon
            let timedOn = feature == .timedMessages && enableFeature.wrappedValue == .on
            if groupInfo.canEdit {
@@ -87,6 +95,14 @@ 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)
@@ -94,9 +110,26 @@ 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,6 +11,7 @@ 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
@@ -57,7 +58,7 @@ struct GroupWelcomeView: View {
    }

    private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
+        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false, secondaryColor: theme.colors.secondary)
            .frame(minHeight: 130, alignment: .topLeading)
            .frame(maxWidth: .infinity, alignment: .leading)
    }
@@ -70,7 +71,7 @@ struct GroupWelcomeView: View {
                        Group {
                            if welcomeText.isEmpty {
                                TextEditor(text: Binding.constant(NSLocalizedString("Enter welcome message…", comment: "placeholder")))
-                                    .foregroundColor(.secondary)
+                                    .foregroundColor(theme.colors.secondary)
                                    .disabled(true)
                            }
                            TextEditor(text: $welcomeText)
@@ -0,0 +1,271 @@
+//
+//  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: .zero, 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 = .zero
+        private var bag = Set<AnyCancellable>()
+
+        init(representer: ReverseList) {
+            self.representer = representer
+            super.init(style: .plain)
+
+            // 1. Style
+            tableView.separatorStyle = .none
+            tableView.transform = .verticalFlip
+
+            // 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, .zero)
+                        .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
+                )
+        }
+        
+        /// 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) {
+            if let index {
+                var animated = false
+                if #available(iOS 16.0, *) {
+                    animated = true
+                }
+                tableView.scrollToRow(
+                    at: IndexPath(row: index, section: .zero),
+                    at: position,
+                    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 != .zero && abs(items.count - itemCount) == 1
+            )
+            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.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()
+    }
+}
@@ -10,6 +10,7 @@ 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
@@ -30,7 +31,7 @@ struct VerifyCodeView: View {
                    HStack {
                        if connectionVerified {
                            Image(systemName: "checkmark.shield")
-                                .foregroundColor(.secondary)
+                                .foregroundColor(theme.colors.secondary)
                            Text("\(displayName) is verified")
                        } else {
                            Text("\(displayName) is not verified")
@@ -66,6 +67,7 @@ struct VerifyCodeView: View {
                                ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
                                    .navigationBarTitleDisplayMode(.large)
                                    .navigationTitle("Scan code")
+                                    .modifier(ThemedBackground())
                            } label: {
                                Label("Scan code", systemImage: "qrcode")
                            }
@@ -122,5 +124,6 @@ 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())
    }
 }
@@ -26,6 +26,7 @@ private let rowHeights: [DynamicTypeSize: CGFloat] = [

 struct ChatListNavLink: View {
    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @Environment(\.dynamicTypeSize) private var dynamicTypeSize
    @ObservedObject var chat: Chat
    @State private var showContactRequestDialog = false
@@ -92,7 +93,7 @@ struct ChatListNavLink: View {
                .swipeActions(edge: .leading, allowsFullSwipe: true) {
                    markReadButton()
                    toggleFavoriteButton()
-                    toggleNtfsButton(chat)
+                    ToggleNtfsButton(chat: chat)
                }
                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                    if !chat.chatItems.isEmpty {
@@ -181,7 +182,7 @@ struct ChatListNavLink: View {
            .swipeActions(edge: .leading, allowsFullSwipe: true) {
                markReadButton()
                toggleFavoriteButton()
-                toggleNtfsButton(chat)
+                ToggleNtfsButton(chat: chat)
            }
            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                if !chat.chatItems.isEmpty {
@@ -224,7 +225,7 @@ struct ChatListNavLink: View {
        } label: {
            Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
        }
-        .tint(chat.chatInfo.incognito ? .indigo : .accentColor)
+        .tint(chat.chatInfo.incognito ? .indigo : theme.colors.primary)
    }

    @ViewBuilder private func markReadButton() -> some View {
@@ -234,14 +235,14 @@ struct ChatListNavLink: View {
            } label: {
                Label("Read", systemImage: "checkmark")
            }
-            .tint(Color.accentColor)
+            .tint(theme.colors.primary)
        } else {
            Button {
                Task { await markChatUnread(chat) }
            } label: {
                Label("Unread", systemImage: "circlebadge.fill")
            }
-            .tint(Color.accentColor)
+            .tint(theme.colors.primary)
        }

    }
@@ -306,7 +307,7 @@ struct ChatListNavLink: View {
            Button {
                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
            } label: { Label("Accept", systemImage: "checkmark") }
-                .tint(.accentColor)
+                .tint(theme.colors.primary)
            Button {
                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
            } label: {
@@ -346,13 +347,16 @@ struct ChatListNavLink: View {
            } label: {
                Label("Name", systemImage: "pencil")
            }
-            .tint(.accentColor)
+            .tint(theme.colors.primary)
        }
        .frame(height: rowHeights[dynamicTypeSize])
-        .sheet(isPresented: $showContactConnectionInfo) {
-            if case let .contactConnection(contactConnection) = chat.chatInfo {
-                ContactConnectionInfo(contactConnection: contactConnection)
-                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
+        .appSheet(isPresented: $showContactConnectionInfo) {
+            Group {
+                if case let .contactConnection(contactConnection) = chat.chatInfo {
+                    ContactConnectionInfo(contactConnection: contactConnection)
+                        .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
+                        .modifier(ThemedBackground(grouped: true))
+                }
            }
        }
        .onTapGesture {
@@ -467,7 +471,7 @@ struct ChatListNavLink: View {
            .padding(4)
            .frame(height: rowHeights[dynamicTypeSize])
            .onTapGesture { showInvalidJSON = true }
-            .sheet(isPresented: $showInvalidJSON) {
+            .appSheet(isPresented: $showInvalidJSON) {
                invalidJSONView(json)
                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
@@ -11,6 +11,7 @@ import SimpleXChat

 struct ChatListView: View {
    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @Binding var showSettings: Bool
    @State private var searchMode = false
    @FocusState private var searchFocussed
@@ -86,14 +87,14 @@ struct ChatListView: View {
            ))
        }
        .listStyle(.plain)
+        .background(theme.colors.background)
        .navigationBarTitleDisplayMode(.inline)
        .navigationBarHidden(searchMode)
        .toolbar {
            ToolbarItem(placement: .navigationBarLeading) {
                let user = chatModel.currentUser ?? User.sampleData
                ZStack(alignment: .topTrailing) {
-                    ProfileImage(imageStr: user.image, color: Color(uiColor: .quaternaryLabel))
-                        .frame(width: 32, height: 32)
+                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
                        .padding(.trailing, 4)
                    let allRead = chatModel.users
                        .filter { u in !u.user.activeUser && !u.user.hidden }
@@ -116,9 +117,7 @@ struct ChatListView: View {
                HStack(spacing: 4) {
                    Text("Chats")
                        .font(.headline)
-                    if chatModel.chats.count > 0 {
-                        toggleFilterButton()
-                    }
+                    SubsStatusIndicator()
                }
                .frame(maxWidth: .infinity, alignment: .center)
            }
@@ -132,15 +131,6 @@ struct ChatListView: View {
        }
    }

-    private func toggleFilterButton() -> some View {
-        Button {
-            showUnreadAndFavorites = !showUnreadAndFavorites
-        } label: {
-            Image(systemName: "line.3.horizontal.decrease.circle" + (showUnreadAndFavorites ? ".fill" : ""))
-                .foregroundColor(.accentColor)
-        }
-    }
-
    @ViewBuilder private var chatList: some View {
        let cs = filteredChats()
        ZStack {
@@ -155,12 +145,14 @@ struct ChatListView: View {
                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
                        )
                        .listRowSeparator(.hidden)
+                        .listRowBackground(Color.clear)
                        .frame(maxWidth: .infinity)
                    }
                    ForEach(cs, id: \.viewId) { chat in
                        ChatListNavLink(chat: chat)
                            .padding(.trailing, -16)
                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                            .listRowBackground(Color.clear)
                    }
                    .offset(x: -8)
                }
@@ -172,7 +164,7 @@ struct ChatListView: View {
                }
            }
            if cs.isEmpty && !chatModel.chats.isEmpty {
-                Text("No filtered chats").foregroundColor(.secondary)
+                Text("No filtered chats").foregroundColor(theme.colors.secondary)
            }
        }
    }
@@ -180,7 +172,7 @@ struct ChatListView: View {
    private func unreadBadge(_ text: Text? = Text(" "), size: CGFloat = 18) -> some View {
        Circle()
            .frame(width: size, height: size)
-            .foregroundColor(.accentColor)
+            .foregroundColor(theme.colors.primary)
    }

    private func onboardingButtons() -> some View {
@@ -191,7 +183,7 @@ struct ChatListView: View {
                p.addLine(to: CGPoint(x: 0, y: 10))
                p.addLine(to: CGPoint(x: 8, y: 0))
            }
-            .fill(Color.accentColor)
+            .fill(theme.colors.primary)
            .frame(width: 20, height: 10)
            .padding(.trailing, 12)

@@ -201,7 +193,7 @@ struct ChatListView: View {

            Spacer()
            Text("You have no chats")
-                .foregroundColor(.secondary)
+                .foregroundColor(theme.colors.secondary)
                .frame(maxWidth: .infinity)
        }
        .padding(.trailing, 6)
@@ -214,16 +206,14 @@ struct ChatListView: View {
                .padding(.vertical, 10)
                .padding(.horizontal, 20)
        }
-        .background(Color.accentColor)
+        .background(theme.colors.primary)
        .foregroundColor(.white)
        .clipShape(RoundedRectangle(cornerRadius: 16))
    }

    @ViewBuilder private func chatView() -> some View {
        if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
-            ChatView(chat: chat).onAppear {
-                loadChat(chat: chat)
-            }
+            ChatView(chat: chat)
        }
    }

@@ -275,17 +265,87 @@ struct ChatListView: View {
    }
 }

+struct SubsStatusIndicator: View {
+    @State private var subs: SMPServerSubs = SMPServerSubs.newSMPServerSubs
+    @State private var sess: ServerSessions = ServerSessions.newServerSessions
+    @State private var timer: Timer? = nil
+    @State private var timerCounter = 0
+    @State private var showServersSummary = false
+
+    @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false
+
+    // Constants for the intervals
+    let initialInterval: TimeInterval = 1.0
+    let regularInterval: TimeInterval = 3.0
+    let initialPhaseDuration: TimeInterval = 10.0 // Duration for initial phase in seconds
+
+    var body: some View {
+        Button {
+            showServersSummary = true
+        } label: {
+            HStack(spacing: 4) {
+                SubscriptionStatusIndicatorView(subs: subs, sess: sess)
+                if showSubscriptionPercentage {
+                    SubscriptionStatusPercentageView(subs: subs, sess: sess)
+                }
+            }
+        }
+        .onAppear {
+            startInitialTimer()
+        }
+        .onDisappear {
+            stopTimer()
+        }
+        .sheet(isPresented: $showServersSummary) {
+            ServersSummaryView()
+        }
+    }
+
+    private func startInitialTimer() {
+        timer = Timer.scheduledTimer(withTimeInterval: initialInterval, repeats: true) { _ in
+            getServersSummary()
+            timerCounter += 1
+            // Switch to the regular timer after the initial phase
+            if timerCounter * Int(initialInterval) >= Int(initialPhaseDuration) {
+                switchToRegularTimer()
+            }
+        }
+    }
+
+    func switchToRegularTimer() {
+        timer?.invalidate()
+        timer = Timer.scheduledTimer(withTimeInterval: regularInterval, repeats: true) { _ in
+            getServersSummary()
+        }
+    }
+
+    func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+
+    private func getServersSummary() {
+        do {
+            let summ = try getAgentServersSummary()
+            (subs, sess) = (summ.allUsersSMP.smpTotals.subs, summ.allUsersSMP.smpTotals.sessions)
+        } catch let error {
+            logger.error("getAgentServersSummary error: \(responseError(error))")
+        }
+    }
+}
+
 struct ChatListSearchBar: View {
    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @Binding var searchMode: Bool
    @FocusState.Binding var searchFocussed: Bool
    @Binding var searchText: String
    @Binding var searchShowingSimplexLink: Bool
    @Binding var searchChatFilteredBySimplexLink: String?
    @State private var ignoreSearchTextChange = false
-    @State private var showScanCodeSheet = false
    @State private var alert: PlanAndConnectAlert?
    @State private var sheet: PlanAndConnectActionSheet?
+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false

    var body: some View {
        VStack(spacing: 12) {
@@ -293,7 +353,7 @@ struct ChatListSearchBar: View {
                HStack(spacing: 4) {
                    Image(systemName: "magnifyingglass")
                    TextField("Search or paste SimpleX link", text: $searchText)
-                        .foregroundColor(searchShowingSimplexLink ? .secondary : .primary)
+                        .foregroundColor(searchShowingSimplexLink ? theme.colors.secondary : theme.colors.onBackground)
                        .disabled(searchShowingSimplexLink)
                        .focused($searchFocussed)
                        .frame(maxWidth: .infinity)
@@ -302,48 +362,26 @@ struct ChatListSearchBar: View {
                            .onTapGesture {
                                searchText = ""
                            }
-                    } else if !searchFocussed {
-                        HStack(spacing: 24) {
-                            if m.pasteboardHasStrings {
-                                Image(systemName: "doc")
-                                    .onTapGesture {
-                                        if let str = UIPasteboard.general.string {
-                                            searchText = str
-                                        }
-                                    }
-                            }
-
-                            Image(systemName: "qrcode")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 20, height: 20)
-                                .onTapGesture {
-                                    showScanCodeSheet = true
-                                }
-                        }
-                        .padding(.trailing, 2)
                    }
                }
                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
-                .foregroundColor(.secondary)
+                .foregroundColor(theme.colors.secondary)
                .background(Color(.tertiarySystemFill))
                .cornerRadius(10.0)

                if searchFocussed {
                    Text("Cancel")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                        .onTapGesture {
                            searchText = ""
                            searchFocussed = false
                        }
+                } else if m.chats.count > 0 {
+                    toggleFilterButton()
                }
            }
            Divider()
        }
-        .sheet(isPresented: $showScanCodeSheet) {
-            NewChatView(selection: .connect, showQRCodeScanner: true)
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
-        }
        .onChange(of: searchFocussed) { sf in
            withAnimation { searchMode = sf }
        }
@@ -377,6 +415,21 @@ struct ChatListSearchBar: View {
        }
    }

+    private func toggleFilterButton() -> some View {
+        ZStack {
+            Color.clear
+                .frame(width: 22, height: 22)
+            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
+                .resizable()
+                .scaledToFit()
+                .foregroundColor(showUnreadAndFavorites ? theme.colors.primary : theme.colors.secondary)
+                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
+                .onTapGesture {
+                    showUnreadAndFavorites = !showUnreadAndFavorites
+                }
+        }
+    }
+
    private func connect(_ link: String) {
        planAndConnect(
            link,
@@ -11,10 +11,10 @@ import SimpleXChat

 struct ChatPreviewView: View {
    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
    @Binding var progressByTimeout: Bool
    @State var deleting: Bool = false
-    @Environment(\.colorScheme) var colorScheme
    var darkGreen = Color(red: 0, green: 0.5, blue: 0)

    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
@@ -23,8 +23,7 @@ struct ChatPreviewView: View {
        let cItem = chat.chatItems.last
        return HStack(spacing: 8) {
            ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat)
-                    .frame(width: 63, height: 63)
+                ChatInfoImage(chat: chat, size: 63)
                chatPreviewImageOverlayIcon()
                    .padding([.bottom, .trailing], 1)
            }
@@ -37,7 +36,7 @@ struct ChatPreviewView: View {
                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
                        .font(.subheadline)
                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                        .padding(.top, 4)
                }
                .padding(.bottom, 4)
@@ -95,9 +94,9 @@ struct ChatPreviewView: View {
        case let .group(groupInfo):
            let v = previewTitle(t)
            switch (groupInfo.membership.memberStatus) {
-            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : .accentColor)
-            case .memAccepted: v.foregroundColor(.secondary)
-            default: if deleting  { v.foregroundColor(.secondary) } else { v }
+            case .memInvited: v.foregroundColor(deleting ? theme.colors.secondary : chat.chatInfo.incognito ? .indigo : theme.colors.primary)
+            case .memAccepted: v.foregroundColor(theme.colors.secondary)
+            default: if deleting  { v.foregroundColor(theme.colors.secondary) } else { v }
            }
        default: previewTitle(t)
        }
@@ -109,7 +108,7 @@ struct ChatPreviewView: View {

    private var verifiedIcon: Text {
        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-            .foregroundColor(.secondary)
+            .foregroundColor(theme.colors.secondary)
            .baselineOffset(1)
            .kerning(-2)
    }
@@ -134,11 +133,11 @@ struct ChatPreviewView: View {
                    .foregroundColor(.white)
                    .padding(.horizontal, 4)
                    .frame(minWidth: 18, minHeight: 18)
-                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? Color.accentColor : Color.secondary)
+                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
                    .cornerRadius(10)
            } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
                Image(systemName: "speaker.slash.fill")
-                    .foregroundColor(.secondary)
+                    .foregroundColor(theme.colors.secondary)
            } else if chat.chatInfo.chatSettings?.favorite ?? false {
                Image(systemName: "star.fill")
                    .resizable()
@@ -152,9 +151,9 @@ struct ChatPreviewView: View {

    private func messageDraft(_ draft: ComposeState) -> Text {
        let msg = draft.message
-        return image("rectangle.and.pencil.and.ellipsis", color: .accentColor)
+        return image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
                + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false)
+                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)

        func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
            Text(Image(systemName: s)).foregroundColor(color) + Text(" ")
@@ -173,7 +172,7 @@ struct ChatPreviewView: View {
    func chatItemPreview(_ cItem: ChatItem) -> Text {
        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
        let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)
+        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)

        // same texts are in markedDeletedText in MarkedDeletedItemView, but it returns LocalizedStringKey;
        // can be refactored into a single function if functions calling these are changed to return same type
@@ -207,7 +206,7 @@ struct ChatPreviewView: View {
            case let .direct(contact):
                if contact.activeConn == nil && contact.profile.contactLink != nil {
                    chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                } else if !contact.ready && contact.activeConn != nil {
                    if contact.nextSendGrpInv {
                        chatPreviewInfoText("send direct message")
@@ -241,14 +240,14 @@ struct ChatPreviewView: View {

    private func itemStatusMark(_ cItem: ChatItem) -> Text {
        switch cItem.meta.itemStatus {
-        case .sndErrorAuth:
+        case .sndErrorAuth, .sndError:
            return Text(Image(systemName: "multiply"))
                .font(.caption)
                .foregroundColor(.red) + Text(" ")
-        case .sndError:
+        case .sndWarning:
            return Text(Image(systemName: "exclamationmark.triangle.fill"))
                .font(.caption)
-                .foregroundColor(.yellow) + Text(" ")
+                .foregroundColor(.orange) + Text(" ")
        default: return Text("")
        }
    }
@@ -258,38 +257,38 @@ struct ChatPreviewView: View {
        case let .direct(contact):
            if contact.active && contact.activeConn != nil {
                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito)
+                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
                case .error:
                    Image(systemName: "exclamationmark.circle")
                        .resizable()
                        .scaledToFit()
                        .frame(width: 17, height: 17)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                default:
                    ProgressView()
                }
            } else {
-                incognitoIcon(chat.chatInfo.incognito)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
            }
        case .group:
            if progressByTimeout {
                ProgressView()
            } else {
-                incognitoIcon(chat.chatInfo.incognito)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
            }
        default:
-            incognitoIcon(chat.chatInfo.incognito)
+            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
        }
    }
 }

-@ViewBuilder func incognitoIcon(_ incognito: Bool) -> some View {
+@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color) -> some View {
    if incognito {
        Image(systemName: "theatermasks")
            .resizable()
            .scaledToFit()
            .frame(width: 22, height: 22)
-            .foregroundColor(.secondary)
+            .foregroundColor(secondaryColor)
    } else {
        EmptyView()
    }
@@ -11,6 +11,7 @@ import SimpleXChat

 struct ContactConnectionInfo: View {
    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
    @State var contactConnection: PendingContactConnection
    @State private var alert: CCInfoAlert?
@@ -48,7 +49,7 @@ struct ContactConnectionInfo: View {

                Section {
                    if contactConnection.groupLinkId == nil {
-                        settingsRow("pencil") {
+                        settingsRow("pencil", color: theme.colors.secondary) {
                            TextField("Set contact name…", text: $localAlias)
                                .autocapitalization(.none)
                                .autocorrectionDisabled(true)
@@ -63,14 +64,15 @@ struct ContactConnectionInfo: View {
                       let connReqInv = contactConnection.connReqInv {
                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
                        incognitoEnabled()
-                        shareLinkButton(connReqInv)
-                        oneTimeLinkLearnMoreButton()
+                        shareLinkButton(connReqInv, theme.colors.secondary)
+                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
                    } else {
                        incognitoEnabled()
-                        oneTimeLinkLearnMoreButton()
+                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
                    }
                } footer: {
                    sharedProfileInfo(contactConnection.incognito)
+                        .foregroundColor(theme.colors.secondary)
                }

                Section {
@@ -82,6 +84,7 @@ struct ContactConnectionInfo: View {
                    }
                }
            }
+            .modifier(ThemedBackground(grouped: true))
            if #available(iOS 16, *) {
                v
            } else {
@@ -149,7 +152,7 @@ struct ContactConnectionInfo: View {
                HStack(spacing: 6) {
                    Text("Incognito")
                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                        .font(.system(size: 14))
                }
                .onTapGesture {
@@ -164,23 +167,24 @@ struct ContactConnectionInfo: View {
    }
 }

-private func shareLinkButton(_ connReqInvitation: String) -> some View {
+private func shareLinkButton(_ connReqInvitation: String, _ secondaryColor: Color) -> some View {
    Button {
        showShareSheet(items: [simplexChatLink(connReqInvitation)])
    } label: {
-        settingsRow("square.and.arrow.up") {
+        settingsRow("square.and.arrow.up", color: secondaryColor) {
            Text("Share 1-time link")
        }
    }
 }

-private func oneTimeLinkLearnMoreButton() -> some View {
+private func oneTimeLinkLearnMoreButton(_ secondaryColor: Color) -> some View {
    NavigationLink {
        AddContactLearnMore(showTitle: false)
            .navigationTitle("One-time invitation link")
+            .modifier(ThemedBackground())
            .navigationBarTitleDisplayMode(.large)
    } label: {
-        settingsRow("info.circle") {
+        settingsRow("info.circle", color: secondaryColor) {
            Text("Learn more")
        }
    }
@@ -12,6 +12,7 @@ import SimpleXChat
 struct ContactConnectionView: View {
    @EnvironmentObject var m: ChatModel
    @ObservedObject var chat: Chat
+    @EnvironmentObject var theme: AppTheme
    @State private var localAlias = ""
    @FocusState private var aliasTextFieldFocused: Bool
    @State private var showContactConnectionInfo = false
@@ -29,7 +30,7 @@ struct ContactConnectionView: View {
                    .resizable()
                    .scaledToFill()
                    .frame(width: 48, height: 48)
-                    .foregroundColor(Color(uiColor: .secondarySystemBackground))
+                    .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground).asAnotherColorFromSecondaryVariant(theme))
                    .onTapGesture { showContactConnectionInfo = true }
            }
            .frame(width: 63, height: 63)
@@ -41,7 +42,7 @@ struct ContactConnectionView: View {
                        .font(.title3)
                        .bold()
                        .allowsTightening(false)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                        .padding(.horizontal, 8)
                        .padding(.top, 1)
                        .padding(.bottom, 0.5)
@@ -54,14 +55,14 @@ struct ContactConnectionView: View {
                        .padding(.trailing, 8)
                        .padding(.vertical, 4)
                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                }
                .padding(.bottom, 2)

                ZStack(alignment: .topTrailing) {
                    Text(contactConnection.description)
                        .frame(maxWidth: .infinity, alignment: .leading)
-                    incognitoIcon(contactConnection.incognito)
+                    incognitoIcon(contactConnection.incognito, theme.colors.secondary)
                        .padding(.top, 26)
                        .frame(maxWidth: .infinity, alignment: .trailing)
                }
@@ -11,20 +11,20 @@ import SimpleXChat

 struct ContactRequestView: View {
    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
    var contactRequest: UserContactRequest
    @ObservedObject var chat: Chat

    var body: some View {
        HStack(spacing: 8) {
-            ChatInfoImage(chat: chat)
-                .frame(width: 63, height: 63)
+            ChatInfoImage(chat: chat, size: 63)
                .padding(.leading, 4)
            VStack(alignment: .leading, spacing: 0) {
                HStack(alignment: .top) {
                    Text(contactRequest.chatViewName)
                        .font(.title3)
                        .fontWeight(.bold)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(theme.colors.primary)
                        .padding(.leading, 8)
                        .frame(alignment: .topLeading)
                    Spacer()
@@ -33,7 +33,7 @@ struct ContactRequestView: View {
                        .padding(.trailing, 8)
                        .padding(.top, 4)
                        .frame(minWidth: 60, alignment: .trailing)
-                        .foregroundColor(.secondary)
+                        .foregroundColor(theme.colors.secondary)
                }
                .padding(.bottom, 2)

--- a/Show More
+++ b/Show More