core: api to load all chat items

2024-12-17 17:20:21 +01:00 · 2022-11-20 21:38:42 +00:00
613 changed files with 14210 additions and 135240 deletions
@@ -5,7 +5,7 @@ on:
    branches:
      - master
      - stable
-      - users
+      - sqlcipher
    tags:
      - "v*"
  pull_request:
@@ -91,10 +91,6 @@ jobs:
          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
          echo "    flags: +openssl"                                        >> cabal.project.local

-      - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest'
-        run: brew install pkg-config
-
      - name: Unix prepare cabal.project.local for Ubuntu
        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04'
        shell: bash
@@ -113,7 +109,7 @@ jobs:

      - name: Unix test
        if: matrix.os != 'windows-latest' && matrix.os != 'ubuntu-20.04'
-        timeout-minutes: 20
+        timeout-minutes: 10
        shell: bash
        run: cabal test --test-show-details=direct

@@ -42,15 +42,12 @@ stack.yaml.lock

 # Temporary test files
 tests/tmp
-tests/tmp*
 logs/

-*.devcontainer
+
 # for website
 website/node_modules/
 website/src/blog/
-website/translations.json
-website/src/_data/supported_languages.json
 website/src/img/images/
 website/src/images/
 # Generated files
@@ -75,4 +72,3 @@ website/package-lock.json
 # Ignore test files
 website/.cache
 website/test/stubs-layout-cache/_includes/*.js
-apps/android/app/release
@@ -1,7 +1,7 @@
 FROM ubuntu:focal AS build

 # Install curl and simplex-chat-related dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev libssl-dev
+RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev

 # Install ghcup
 RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
@@ -21,9 +21,6 @@ WORKDIR /project
 # Adjust PATH
 ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"

-# Adjust build
-RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
-
 # Compile simplex-chat
 RUN cabal update
 RUN cabal install
@@ -1,28 +1,12 @@
-[![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
-[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
-[![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
-[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
-[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
-
-| 19/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
-
 <img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">

 # SimpleX - the first messaging platform that has no user identifiers of any kind - 100% private by design!

-[<img src="./images/trail-of-bits.jpg" height="100">](http://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html) &nbsp;&nbsp;&nbsp; [<img src="./images/privacy-guides.jpg" height="80">](https://www.privacyguides.org/en/real-time-communication/#simplex-chat) &nbsp;&nbsp;&nbsp; [<img src="./images/kuketz-blog.jpg" height="80">](https://www.kuketz-blog.de/simplex-eindruecke-vom-messenger-ohne-identifier/)
-
-## Welcome to SimpleX Chat!
-
-1. 📲 [Install the app](#install-the-app).
-2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
-3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
-4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
-
-[Learn more about SimpleX Chat](#contents).
-
-## Install the app
+[![build](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/simplex-chat/simplex-chat/actions/workflows/build.yml)
+[![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
+[![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
+[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/SimpleXChat)
+[![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)

 [<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
 &nbsp;
@@ -38,87 +22,9 @@
 - 🔐 Double ratchet end-to-end encryption, with additional encryption layer.
 - 📱 Mobile apps for Android ([Google Play](https://play.google.com/store/apps/details?id=chat.simplex.app), [APK](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk)) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084).
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
- 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
+- 🖥 Available as a terminal (console) app / CLI on Linux, MacOS, Windows.

-## Connect to the team via the app
-
- to ask any questions
- to suggest any improvements
- to share anything relevant
-
-## Join user groups
-
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-2](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FQP8zaGjjmlXV-ix_Er4JgJ0lNPYGS1KX%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEApAgBkRZ3x12ayZ7sHrjHQWNMvqzZpWUgM_fFCUdLXwo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xWpPXEZZsQp_F7vwAcAYDw%3D%3D%22%7D)
-
-There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
-
-[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
-
-You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
-
-## Make a private connection
-
-You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
-
-The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
-
-<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app1.png" alt="Make a private connection" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app2.png" alt="Conversation" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/arrow.png" height="360"> <img src="https://github.com/simplex-chat/.github/blob/master/profile/images/app3.png" alt="Video call" height="360">
-
-After you connect, you can [verify connection security code](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md#connection-security-verification).
-
-## Help translating SimpleX Chat
-
-Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps, website and documents are translated to many other languages.
-
-Join our translators to help SimpleX grow!
-
-|locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
-|:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
-|🇬🇧 en|English   | |✓|✓|✓|✓|
-|🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
-|🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
-|🇪🇸 es|Español   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|||
-|🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi_sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
-|🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
-|🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)|||
-
-Languages in progress: Arabic, Hindi, Japanese, Spanish and [many others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
-
-## Contribute
-
-We would love to have you join the development! You can help us with:
-
- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
- contributing to SimpleX Chat knowledge-base.
- developing features - please connect to us via chat so we can help you get started.
-
-## Help us with donations
-
-Huge thank you to everybody who donated to SimpleX Chat!
-
-We are prioritizing users privacy and security - it would be impossible without your support.
-
-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.
-
-It is possible to donate via:
-
- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
-
-Thank you,
-
-Evgeny
-
-SimpleX Chat founder
+**NEW**: Security audit by [Trail of Bits](https://www.trailofbits.com/about), the [new website](https://simplex.chat) and v4.2 released! [See the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md)

 ## Contents

@@ -130,11 +36,15 @@ SimpleX Chat founder
  - [Users own SimpleX network](#users-own-simplex-network)
 - [Frequently asked questions](#frequently-asked-questions)
 - [News and updates](#news-and-updates)
+- [Make a private connection](#make-a-private-connection)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
 - [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
+- [Join a user group](#join-a-user-group)
+- [Contribute](#contribute)
+- [Help us with donations](#help-us-with-donations)
 - [Disclaimers, Security contact, License](#disclaimers)

 ## Why privacy matters
@@ -165,28 +75,36 @@ You can use SimpleX with your own servers and still communicate with people usin

 ## Frequently asked questions

-1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release announcement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.
+1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release annoucement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.

-2. _Why should I not just use Signal?_ Signal is a centralized platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.
+2. _Why should I not just use Signal?_ Signal is a centralised platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.

-3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identities?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.
+3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identites?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.

 ## News and updates

 Recent updates:

-[Feb 04, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
+[Nov 08, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md)

-[Jan 03, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
+[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md)

-[Dec 06, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
+[Sep 1, 2022. v3.2: incognito mode, support .onion server hostnames, setting contact names, changing color scheme, etc. Implementation audit is arranged for October!](./blog/20220901-simplex-chat-v3.2-incognito-mode.md)

-[Nov 08, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+[Aug 8, 2022. v3.1: secret chat groups, access via Tor, reduced battery and traffic usage, advanced network settings, etc.](./blog/20220808-simplex-chat-v3.1-chat-groups.md)

-[Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
+[Jul 11, 2022. v3.0: instant push notifications for iOS, e2e encrypted WebRTC audio/video calls, chat database export/import, privacy and performance improvements](./blog/20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.md)

 [All updates](./blog)

+## Make a private connection
+
+You need to share a link or scan a QR code (in person or during a video call) to make a connection and start messaging.
+
+The channel through which you share the link does not have to be secure - it is enough that you can confirm who sent you the message and that your SimpleX connection is established.
+
+<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/conversation.png" alt="Make a private connection" width="594" height="360">
+
 ## :zap: Quick installation of a terminal app

 ```sh
@@ -219,7 +137,7 @@ SimpleX Chat is a work in progress – we are releasing improvements as they are

 What is already implemented:

-1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses pairwise per-queue identifiers (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
+1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses pairwise per-queue identifiers (2 addresses for each unidirectional message queue, with an optional 3rd address for push notificaitons on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
 2. End-to-end encryption in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
 3. [Double ratchet](https://signal.org/docs/specifications/doubleratchet/) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with forward secrecy (each message is encrypted by its own ephemeral key), break-in recovery (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial key agreement, initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
 4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
@@ -229,11 +147,10 @@ What is already implemented:
 8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
-11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.

 We plan to add soon:

-1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+1. Message queue rotation. Currently the queues created between two users are used until the contact is deleted, providing a long-term pairwise identifiers of the conversation. We are planning to add queue rotation to make these identifiers termporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
 2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`.
 3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.

@@ -243,7 +160,7 @@ You can:

 - use SimpleX Chat library to integrate chat functionality into your mobile apps.
 - create chat bots and services in Haskell - see [simple](./apps/simplex-bot/) and more [advanced chat bot example](./apps/simplex-bot-advanced/).
- create chat bots and services in any language running SimpleX Chat terminal CLI as a local WebSocket server. See [TypeScript SimpleX Chat client](./packages/simplex-chat-client/) and [JavaScript chat bot example](./packages/simplex-chat-client/typescript/examples/squaring-bot.js).
+- create chat bots and services in any language running SimpleX Chat terminal CLI as a local WebSocket server. See [TypeScript SimpleX Chat client](./packages/simplex-chat-client/) and [JavaScipt chat bot example](./packages/simplex-chat-client/typescript/examples/squaring-bot.js).
 - run [simplex-chat terminal CLI](./docs/CLI.md) to execute individual chat commands, e.g. to send messages as part of shell script execution.

 If you are considering developing with SimpleX platform please get in touch for any advice and support.
@@ -270,29 +187,21 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ Chat database encryption.
 - ✅ Automatic chat history deletion.
 - ✅ Links to join groups and improve groups stability.
- ✅ Voice messages (with recipient opt-out per contact).
- ✅ Basic authentication for SMP servers (to authorize creating new queues).
- ✅ View deleted messages, full message deletion by sender (with recipient opt-in per contact).
- ✅ Block screenshots and view in recent apps.
- ✅ Advanced server configuration.
- ✅ Disappearing messages (with recipient opt-in per-contact).
- ✅ "Live" messages.
- ✅ Contact verification via a separate out-of-band channel.
- ✅ Multiple user profiles in the same chat database.
- ✅ Optionally avoid re-using the same TCP session for multiple connections.
- ✅ Preserve message drafts.
- 🏗 File server to optimize for efficient and private sending of large files.
- 🏗 Improved audio & video calls.
 - 🏗 SMP queue redundancy and rotation (manual is supported).
- 🏗 Reduced battery and traffic usage in large groups.
- 🏗 Support older Android OS and 32-bit CPUs.
- Ephemeral/disappearing/OTR conversations with the existing contacts.
+- 🏗 Voice messages (with recipient opt-out per contact).
+- 🏗 Basic authentication for SMP servers (to authorize creating new queues).
+- View deleted messages, full message deletion by sender (with recipient opt-in per contact).
+- Block screenshots and view in recent apps.
+- Optionally avoid re-using the same TCP session for multiple connections.
 - Access password/pin (with optional alternative access password).
- Local app files encryption.
+- Ephemeral/disappearing/OTR conversations with the existing contacts.
+- Media server to optimize sending large files to groups.
 - Video messages.
- Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
 - Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
+- Multiple user profiles in the same chat database.
+- Advanced server configuration.
 - Feeds/broadcasts.
+- Unconfirmed: disappearing messages (with recipient opt-in per-contact).
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
 - Supporting the same profile on multiple devices.
@@ -300,9 +209,52 @@ If you are considering developing with SimpleX platform please get in touch for
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
  - keep all your contacts and groups even if you lose the domain.
  - the server doesn't have information about your contacts and groups.
- Hosting server for large groups, communities and public channels.
- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
- High capacity multi-node SMP relays.
+- Channels server for large groups and broadcast channels.
+
+## Join a user group
+
+You can join a general group with more than 100 members: [#SimpleX-Group](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FWHV0YU1sYlU7NqiEHkHDB6gxO1ofTync%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAWbebOqVYuBXaiqHcXYjEHCpYi6VzDlu6CVaijDTmsQU%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22mL-7Divb94GGmGmRBef5Dg%3D%3D%22%7D).
+
+You can also join smaller groups by countries/languages: [\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FmIorjTDPG24jdLKXwutS6o9hdQQRZwfQ%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA9N0BZaECrAw3we3S1Wq4QO7NERBuPt9447immrB50wo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22S8aISlOgkTMytSox9gAM2Q%3D%3D%22%7D) (German), [\#SimpleX-US](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FlTWmQplLEaoJyHnEL1-B3f2PtDsikcTs%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA-hMBlsQjNxK2vaVhqW_UyAVtuoYqgYTigK4B9dJ9CGc%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22G0UtRHIn0TmPoo08h_cbTA%3D%3D%22%7D) (US/English), [\#SimpleX-France](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F11r6XyjwVMj0WDIUMbmNDXO996M_EN_1%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAXDmc2Lrj9WQOjEcWa0DeQHF3HcYOp9b68s8M_BJ7gEk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22EZCeSYpeIBkaQwCcpcF00w%3D%3D%22%7D), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FZSYM278L5WoZiApx3925EAjSXcsAVNVu%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA7RJ2wfT8zdfOLyE5OtWLEAPowj-q6F2HB0ExbATw8Gk%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22fsVoklNGptt7n-droqJYUQ%3D%3D%22%7D) (Russian), [#SimpleX-NL](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FmP0LbswSbfxoVkkxiWE2NYnBCgZ9Snvj%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAVwZuSsw4Mf52EaBNdNI3RebsLm0jg65ZIkcmH9E5uy8%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22M9xIULUNZx51Wsa5Kdb0Sg%3D%3D%22%7D) (Netherlands/Dutch), [#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FaZ_wjh6QAYHB-LjyGtp8bllkzoq880u-%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA-_Wulzc3j16i7t77XJ5wgwxeW8_Ea8GxetMo7K4MgjI%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22QWmXdrFzIeMd2OoEPMFkBQ%3D%3D%22%7D) (Italian).
+
+You can join these groups either by opening these links in the app or by opening them in a desktop browser and scanning QR code.
+
+Let us know if you'd like to add some other countries to the list.
+
+Join via the app to share what's going on and ask any questions!
+
+## Contribute
+
+We would love to have you join the development! You can contribute to SimpleX Chat with:
+
+- developing features - please connect to us via chat so we can help you get started.
+- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
+- translate UI to some language - we are currently setting up the UI to simplify it, please get in touch and let us know if you would be able to support and update the translations.
+- translate website homepage - there is a lot of content we would like to share, it would help to bring the new users.
+
+## Help us with donations
+
+Huge thank you to everybody who donated to SimpleX Chat!
+
+We are prioritizing users privacy and security - it would be impossible without your support.
+
+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.
+
+It is possible to donate via:
+
+- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
+- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
+- Monero wallet: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin wallet: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- please let us know, via GitHub issue or chat, if you want to create a donation in some other cryptocurrency - we will add the address to the list.
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder

 ## Disclaimers

@@ -9,12 +9,15 @@ android {

    defaultConfig {
        applicationId "chat.simplex.app"
-        minSdk 26
+        minSdk 29
        targetSdk 32
-        versionCode 107
-        versionName "4.6"
+        versionCode 69
+        versionName "4.3-beta.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        ndk {
+            abiFilters 'arm64-v8a'
+        }
        vectorDrawables {
            useSupportLibrary true
        }
@@ -73,28 +76,6 @@ android {
        }
        jniLibs.useLegacyPackaging = compression_level != "0"
    }
-    def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-    def isBundle = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("bundle") }) != null
-//    if (isRelease) {
-        // Comma separated list of languages that will be included in the apk
-    android.defaultConfig.resConfigs("en", "cs", "de", "es", "fr", "it", "nl", "ru", "zh-rCN")
-//    }
-    if (isBundle) {
-        defaultConfig.ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
-    } else {
-        splits {
-            abi {
-                enable true
-                reset()
-                if (isRelease) {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                } else {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                    universalApk false
-                }
-            }
-        }
-    }
 }

 dependencies {
@@ -210,8 +191,6 @@ tasks.register("compressApk") {

        if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') {
            new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk"))
-            new File(outputDir, "app-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk"))
-            new File(outputDir, "app-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk"))
        }

        // View all gradle properties set
@@ -24,14 +24,11 @@
  <application
      android:name="SimplexApp"
      android:allowBackup="true"
-      android:fullBackupOnly="true"
-      android:backupAgent="BackupAgent"
      android:icon="@mipmap/icon"
      android:label="${app_name}"
      android:extractNativeLibs="${extract_native_libs}"
      android:supportsRtl="true"
      android:theme="@style/Theme.SimpleX">
-    <!--      android:localeConfig="@xml/locales_config"-->

    <!-- Main activity -->
    <activity
@@ -105,9 +102,7 @@


    <activity android:name=".views.call.IncomingCallActivity"
-        android:showOnLockScreen="true"
-        android:exported="false"
-        android:launchMode="singleTask"/>
+        android:showOnLockScreen="true"/>

    <provider
        android:name="androidx.core.content.FileProvider"
@@ -22,12 +22,10 @@ var TransformOperation;
    TransformOperation["Decrypt"] = "decrypt";
 })(TransformOperation || (TransformOperation = {}));
 let activeCall;
-let answerTimeout = 30000;
 const processCommand = (function () {
    const defaultIceServers = [
        { urls: ["stun:stun.simplex.im:443"] },
-        { urls: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
-        { urls: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
+        { urls: ["turn:turn.simplex.im:443"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
    ];
    function getCallConfig(encodedInsertableStreams, iceServers, relay) {
        return {
@@ -102,16 +100,9 @@ const processCommand = (function () {
        const iceCandidates = getIceCandidates(pc, config);
        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey, useWorker };
        await setupMediaStreams(call);
-        let connectionTimeout = setTimeout(connectionHandler, answerTimeout);
        pc.addEventListener("connectionstatechange", connectionStateChange);
        return call;
        async function connectionStateChange() {
-            // "failed" means the second party did not answer in time (15 sec timeout in Chrome WebView)
-            // See https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/p2p/base/p2p_constants.cc;l=70)
-            if (pc.connectionState !== "failed")
-                connectionHandler();
-        }
-        async function connectionHandler() {
            sendMessageToNative({
                resp: {
                    type: "connection",
@@ -124,7 +115,6 @@ const processCommand = (function () {
                },
            });
            if (pc.connectionState == "disconnected" || pc.connectionState == "failed") {
-                clearConnectionTimeout();
                pc.removeEventListener("connectionstatechange", connectionStateChange);
                if (activeCall) {
                    setTimeout(() => sendMessageToNative({ resp: { type: "ended" } }), 0);
@@ -132,7 +122,6 @@ const processCommand = (function () {
                endCall();
            }
            else if (pc.connectionState == "connected") {
-                clearConnectionTimeout();
                const stats = (await pc.getStats());
                for (const stat of stats.values()) {
                    const { type, state } = stat;
@@ -152,12 +141,6 @@ const processCommand = (function () {
                }
            }
        }
-        function clearConnectionTimeout() {
-            if (connectionTimeout) {
-                clearTimeout(connectionTimeout);
-                connectionTimeout = undefined;
-            }
-        }
    }
    function serialize(x) {
        return LZString.compressToBase64(JSON.stringify(x));
@@ -53,6 +53,10 @@ add_library( support SHARED IMPORTED )
 set_target_properties( support PROPERTIES IMPORTED_LOCATION
    ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libsupport.so)

+add_library( crypto SHARED IMPORTED )
+set_target_properties( crypto PROPERTIES IMPORTED_LOCATION
+    ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libcrypto.so)
+
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
@@ -60,7 +64,7 @@ set_target_properties( support PROPERTIES IMPORTED_LOCATION
 target_link_libraries( # Specifies the target library.
    app-lib

-    simplex support
+    simplex support crypto

    # Links the target library to the log library
    # included in the NDK.
@@ -7,17 +7,6 @@ void hs_init(int * argc, char **argv[]);
 void setLineBuffering(void);
 int pipe_std_to_socket(const char * name);

-extern void __svfscanf(void){};
-extern void __vfwscanf(void){};
-extern void __memset_chk_fail(void){};
-extern void __strcpy_chk_generic(void){};
-extern void __strcat_chk_generic(void){};
-extern void __libc_globals(void){};
-extern void __rel_iplt_start(void){};
-
-// Android 9 only, not 13
-extern void reallocarray(void){};
-
 JNIEXPORT jint JNICALL
 Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
    const char *name = (*env)->GetStringUTFChars(env, socket_name, JNI_FALSE);
@@ -40,8 +29,6 @@ extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
 extern char *chat_recv_msg(chat_ctrl ctrl); // deprecated
 extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
 extern char *chat_parse_markdown(const char *str);
-extern char *chat_parse_server(const char *str);
-extern char *chat_password_hash(const char *pwd, const char *salt);

 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey) {
@@ -89,21 +76,3 @@ Java_chat_simplex_app_SimplexAppKt_chatParseMarkdown(JNIEnv *env, __unused jclas
    (*env)->ReleaseStringUTFChars(env, str, _str);
    return res;
 }
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatParseServer(JNIEnv *env, __unused jclass clazz, jstring str) {
-    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_parse_server(_str));
-    (*env)->ReleaseStringUTFChars(env, str, _str);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatPasswordHash(JNIEnv *env, __unused jclass clazz, jstring pwd, jstring salt) {
-    const char *_pwd = (*env)->GetStringUTFChars(env, pwd, JNI_FALSE);
-    const char *_salt = (*env)->GetStringUTFChars(env, salt, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_password_hash(_pwd, _salt));
-    (*env)->ReleaseStringUTFChars(env, pwd, _pwd);
-    (*env)->ReleaseStringUTFChars(env, salt, _salt);
-    return res;
-}
@@ -1,18 +0,0 @@
-package chat.simplex.app
-
-import android.app.backup.BackupAgentHelper
-import android.app.backup.FullBackupDataOutput
-import android.content.Context
-import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.model.AppPreferences.Companion.SHARED_PREFS_PRIVACY_FULL_BACKUP
-
-class BackupAgent: BackupAgentHelper() {
-  override fun onFullBackup(data: FullBackupDataOutput?) {
-    if (applicationContext
-        .getSharedPreferences(AppPreferences.SHARED_PREFS_ID, Context.MODE_PRIVATE)
-        .getBoolean(SHARED_PREFS_PRIVACY_FULL_BACKUP, true)
-    ) {
-      super.onFullBackup(data)
-    }
-  }
-}
@@ -3,10 +3,10 @@ package chat.simplex.app
 import android.app.Application
 import android.content.Intent
 import android.net.Uri
-import android.os.*
+import android.os.Bundle
+import android.os.Parcelable
 import android.os.SystemClock.elapsedRealtime
 import android.util.Log
-import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.animation.core.*
@@ -27,7 +27,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.*
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.NtfManager
-import chat.simplex.app.model.NtfManager.Companion.getUserIdFromIntent
 import chat.simplex.app.ui.theme.SimpleButton
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.SplashView
@@ -39,8 +38,10 @@ import chat.simplex.app.views.database.DatabaseErrorView
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.onboarding.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.launch

 class MainActivity: FragmentActivity() {
  companion object {
@@ -65,7 +66,6 @@ class MainActivity: FragmentActivity() {
    super.onCreate(savedInstanceState)
    // testJson()
    val m = vm.chatModel
-    applyAppLocale(m.controller.appPrefs.appLanguage)
    // When call ended and orientation changes, it re-process old intent, it's unneeded.
    // Only needed to be processed on first creation of activity
    if (savedInstanceState == null) {
@@ -73,13 +73,6 @@ class MainActivity: FragmentActivity() {
      processIntent(intent, m)
      processExternalIntent(intent, m)
    }
-    if (m.controller.appPrefs.privacyProtectScreen.get()) {
-      Log.d(TAG, "onCreate: set FLAG_SECURE")
-      window.setFlags(
-        WindowManager.LayoutParams.FLAG_SECURE,
-        WindowManager.LayoutParams.FLAG_SECURE
-      )
-    }
    setContent {
      SimpleXTheme {
        Surface(
@@ -108,8 +101,8 @@ class MainActivity: FragmentActivity() {
    processExternalIntent(intent, vm.chatModel)
  }

-  override fun onResume() {
-    super.onResume()
+  override fun onStart() {
+    super.onStart()
    val enteredBackgroundVal = enteredBackground.value
    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= 30_000) {
      runAuthenticate()
@@ -132,15 +125,7 @@ class MainActivity: FragmentActivity() {
  }

  override fun onBackPressed() {
-    if (
-      onBackPressedDispatcher.hasEnabledCallbacks() // Has something to do in a backstack
-      || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R // Android 11 or above
-      || isTaskRoot // there are still other tasks after we reach the main (home) activity
-    ) {
-      // https://medium.com/mobile-app-development-publication/the-risk-of-android-strandhogg-security-issue-and-how-it-can-be-mitigated-80d2ddb4af06
-      super.onBackPressed()
-    }
-
+    super.onBackPressed()
    if (!onBackPressedDispatcher.hasEnabledCallbacks() && vm.chatModel.controller.appPrefs.performLA.get()) {
      // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
      clearAuthState()
@@ -159,31 +144,25 @@ class MainActivity: FragmentActivity() {
    } else {
      userAuthorized.value = false
      ModalManager.shared.closeModals()
-      // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
-      CoroutineScope(Dispatchers.Default).launch {
-        delay(50)
-        withContext(Dispatchers.Main) {
-          authenticate(
-            generalGetString(R.string.auth_unlock),
-            generalGetString(R.string.auth_log_in_using_credential),
-            this@MainActivity,
-            completed = { laResult ->
-              when (laResult) {
-                LAResult.Success ->
-                  userAuthorized.value = true
-                is LAResult.Error, LAResult.Failed ->
-                  laFailed.value = true
-                LAResult.Unavailable -> {
-                  userAuthorized.value = true
-                  m.performLA.value = false
-                  m.controller.appPrefs.performLA.set(false)
-                  laUnavailableTurningOffAlert()
-                }
-              }
+      authenticate(
+        generalGetString(R.string.auth_unlock),
+        generalGetString(R.string.auth_log_in_using_credential),
+        this@MainActivity,
+        completed = { laResult ->
+          when (laResult) {
+            LAResult.Success ->
+              userAuthorized.value = true
+            is LAResult.Error, LAResult.Failed ->
+              laFailed.value = true
+            LAResult.Unavailable -> {
+              userAuthorized.value = true
+              m.performLA.value = false
+              m.controller.appPrefs.performLA.set(false)
+              laUnavailableTurningOffAlert()
            }
-          )
+          }
        }
-      }
+      )
    }
  }

@@ -266,6 +245,14 @@ fun MainPage(
  setPerformLA: (Boolean) -> Unit,
  showLANotice: () -> Unit
 ) {
+  // this with LaunchedEffect(userAuthorized.value) fixes bottom sheet visibly collapsing after authentication
+  var chatsAccessAuthorized by rememberSaveable { mutableStateOf(false) }
+  LaunchedEffect(userAuthorized.value) {
+    if (chatModel.controller.appPrefs.performLA.get()) {
+      delay(500L)
+    }
+    chatsAccessAuthorized = userAuthorized.value == true
+  }
  var showChatDatabaseError by rememberSaveable {
    mutableStateOf(chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null)
  }
@@ -324,7 +311,7 @@ fun MainPage(
        }
      }
      onboarding == null || userCreated == null -> SplashView()
-      userAuthorized.value != true -> {
+      !chatsAccessAuthorized -> {
        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
          authView()
        } else {
@@ -370,6 +357,22 @@ fun MainPage(
                    .collect {
                      if (it != null) currentChatId = it
                      else onComposed()
+
+                      // Deletes files that were not sent but already stored in files directory.
+                      // Currently, it's voice records only
+                      if (it == null && chatModel.filesToDelete.isNotEmpty()) {
+                        chatModel.filesToDelete.forEach { it.delete() }
+                        chatModel.filesToDelete.clear()
+                      }
+                    }
+                }
+                launch {
+                  snapshotFlow { chatModel.sharedContent.value }
+                    .distinctUntilChanged()
+                    .filter { it != null }
+                    .collect {
+                      chatModel.chatId.value = null
+                      currentChatId = null
                    }
                }
              }
@@ -383,8 +386,7 @@ fun MainPage(
        }
      }
      onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
-      onboarding == OnboardingStage.Step3_SetNotificationsMode -> SetNotificationsMode(chatModel)
+      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel)
    }
    ModalManager.shared.showInView()
    val invitation = chatModel.activeCallInvitation.value
@@ -394,31 +396,20 @@ fun MainPage(
 }

 fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
-  val userId = getUserIdFromIntent(intent)
  when (intent?.action) {
    NtfManager.OpenChatAction -> {
      val chatId = intent.getStringExtra("chatId")
      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
      if (chatId != null) {
-        withBGApi {
-          if (userId != null && userId != chatModel.currentUser.value?.userId) {
-            chatModel.controller.changeActiveUser(userId, null)
-          }
-          val cInfo = chatModel.getChat(chatId)?.chatInfo
-          chatModel.clearOverlays.value = true
-          if (cInfo != null) openChat(cInfo, chatModel)
-        }
+        val cInfo = chatModel.getChat(chatId)?.chatInfo
+        chatModel.clearOverlays.value = true
+        if (cInfo != null) withApi { openChat(cInfo, chatModel) }
      }
    }
    NtfManager.ShowChatsAction -> {
      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
-      withBGApi {
-        if (userId != null && userId != chatModel.currentUser.value?.userId) {
-          chatModel.controller.changeActiveUser(userId, null)
-        }
-        chatModel.chatId.value = null
-        chatModel.clearOverlays.value = true
-      }
+      chatModel.chatId.value = null
+      chatModel.clearOverlays.value = true
    }
    NtfManager.AcceptCallAction -> {
      val chatId = intent.getStringExtra("chatId")
@@ -479,6 +470,7 @@ fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
 fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
  if (chatModel.currentUser.value == null) {
+    // TODO open from chat list view
    chatModel.appOpenUrl.value = uri
  } else {
    withUriAction(uri) { linkType ->
@@ -11,7 +11,8 @@ import chat.simplex.app.views.onboarding.OnboardingStage
 import chat.simplex.app.views.usersettings.NotificationsMode
 import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
-import java.io.*
+import java.io.BufferedReader
+import java.io.InputStreamReader
 import java.util.*
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
@@ -31,18 +32,12 @@ external fun chatSendCmd(ctrl: ChatCtrl, msg: String): String
 external fun chatRecvMsg(ctrl: ChatCtrl): String
 external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
 external fun chatParseMarkdown(str: String): String
-external fun chatParseServer(str: String): String
-external fun chatPasswordHash(pwd: String, salt: String): String

 class SimplexApp: Application(), LifecycleEventObserver {
  lateinit var chatController: ChatController

-  var isAppOnForeground: Boolean = false
-
-  val defaultLocale: Locale = Locale.getDefault()
-
  fun initChatController(useKey: String? = null, startChat: Boolean = true) {
-    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
+    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey() ?: ""
    val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePathPrefix, dbKey)
    val res: DBMigrationResult = kotlin.runCatching {
@@ -93,7 +88,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
    context = this
    initChatController()
    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-    context.getDir("temp", MODE_PRIVATE).deleteRecursively()
  }

  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
@@ -101,27 +95,14 @@ class SimplexApp: Application(), LifecycleEventObserver {
    withApi {
      when (event) {
        Lifecycle.Event.ON_START -> {
-          isAppOnForeground = true
          if (chatModel.chatRunning.value == true) {
            kotlin.runCatching {
-              val currentUserId = chatModel.currentUser.value?.userId
-              val chats = ArrayList(chatController.apiGetChats())
-              /** Active user can be changed in background while [ChatController.apiGetChats] is executing */
-              if (chatModel.currentUser.value?.userId == currentUserId) {
-                val currentChatId = chatModel.chatId.value
-                val oldStats = if (currentChatId != null) chatModel.getChat(currentChatId)?.chatStats else null
-                if (oldStats != null) {
-                  val indexOfCurrentChat = chats.indexOfFirst { it.id == currentChatId }
-                  /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
-                  if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
-                }
-                chatModel.updateChats(chats)
-              }
+              val chats = chatController.apiGetChats()
+              chatModel.updateChats(chats)
            }.onFailure { Log.e(TAG, it.stackTraceToString()) }
          }
        }
        Lifecycle.Event.ON_RESUME -> {
-          isAppOnForeground = true
          if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
            chatController.showBackgroundServiceNoticeIfNeeded()
          }
@@ -130,14 +111,10 @@ class SimplexApp: Application(), LifecycleEventObserver {
           * after calling [ChatController.showBackgroundServiceNoticeIfNeeded] notification mode in prefs can be changed.
           * It can happen when app was started and a user enables battery optimization while app in background
           * */
-          if (chatModel.chatRunning.value != false &&
-            chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete &&
-            appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name
-          ) {
+          if (chatModel.chatRunning.value != false && appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name)
            SimplexService.start(applicationContext)
-          }
        }
-        else -> isAppOnForeground = false
+        else -> {}
      }
    }
  }
@@ -191,18 +168,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
      val s = Semaphore(0)
      thread(name="stdout/stderr pipe") {
        Log.d(TAG, "starting server")
-        var server: LocalServerSocket? = null
-        for (i in 0..100) {
-          try {
-            server = LocalServerSocket(socketName + i)
-            break
-          } catch (e: IOException) {
-            Log.e(TAG, e.stackTraceToString())
-          }
-        }
-        if (server == null) {
-          throw Error("Unable to setup local server socket. Contact developers")
-        }
+        val server = LocalServerSocket(socketName)
        Log.d(TAG, "started server")
        s.release()
        val receiver = server.accept()
@@ -3,11 +3,9 @@ package chat.simplex.app.model
 import android.app.*
 import android.content.*
 import android.graphics.BitmapFactory
-import android.hardware.display.DisplayManager
 import android.media.AudioAttributes
 import android.net.Uri
 import android.util.Log
-import android.view.Display
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import chat.simplex.app.*
@@ -25,18 +23,12 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    const val ShowChatsAction: String = "chat.simplex.app.SHOW_CHATS"

    // DO NOT change notification channel settings / names
-    const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_1"
+    const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION"
+    const val LockScreenCallChannel: String = "chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION"
    const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
-    const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
    const val CallNotificationId: Int = -1

-    private const val UserIdKey: String = "userId"
    private const val ChatIdKey: String = "chatId"
-
-    fun getUserIdFromIntent(intent: Intent?): Long? {
-      val userId = intent?.getLongExtra(UserIdKey, -1L)
-      return if (userId == -1L || userId == null) null else userId
-    }
  }

  private val manager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -44,26 +36,25 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
  private val msgNtfTimeoutMs = 30000L

  init {
-    if (manager.areNotificationsEnabled()) createNtfChannelsMaybeShowAlert()
+    manager.createNotificationChannel(NotificationChannel(MessageChannel, generalGetString(R.string.ntf_channel_messages), NotificationManager.IMPORTANCE_HIGH))
+    manager.createNotificationChannel(NotificationChannel(LockScreenCallChannel, generalGetString(R.string.ntf_channel_calls_lockscreen), NotificationManager.IMPORTANCE_HIGH))
+    manager.createNotificationChannel(callNotificationChannel())
  }

  enum class NotificationAction {
    ACCEPT_CONTACT_REQUEST
  }

-  private fun callNotificationChannel(channelId: String, channelName: String): NotificationChannel {
-    val callChannel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH)
+  private fun callNotificationChannel(): NotificationChannel {
+    val callChannel = NotificationChannel(CallChannel, generalGetString(R.string.ntf_channel_calls), NotificationManager.IMPORTANCE_HIGH)
    val attrs = AudioAttributes.Builder()
      .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-      .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+      .setUsage(AudioAttributes.USAGE_NOTIFICATION)
      .build()
    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
    Log.d(TAG,"callNotificationChannel sound: $soundUri")
    callChannel.setSound(soundUri, attrs)
    callChannel.enableVibration(true)
-    // the numbers below are explained here: https://developer.android.com/reference/android/os/Vibrator
-    // (wait, vibration duration, wait till off, wait till on again = ringtone mp3 duration - vibration duration - ~50ms lost somewhere)
-    callChannel.vibrationPattern = longArrayOf(250, 250, 0, 2600)
    return callChannel
  }

@@ -79,9 +70,8 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    }
  }

-  fun notifyContactRequestReceived(user: User, cInfo: ChatInfo.ContactRequest) {
-    displayNotification(
-      user = user,
+  fun notifyContactRequestReceived(cInfo: ChatInfo.ContactRequest) {
+    notifyMessageReceived(
      chatId = cInfo.id,
      displayName = cInfo.displayName,
      msgText = generalGetString(R.string.notification_new_contact_request),
@@ -90,22 +80,21 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    )
  }

-  fun notifyContactConnected(user: User, contact: Contact) {
-    displayNotification(
-      user = user,
+  fun notifyContactConnected(contact: Contact) {
+    notifyMessageReceived(
      chatId = contact.id,
      displayName = contact.displayName,
      msgText = generalGetString(R.string.notification_contact_connected)
    )
  }

-  fun notifyMessageReceived(user: User, cInfo: ChatInfo, cItem: ChatItem) {
+  fun notifyMessageReceived(cInfo: ChatInfo, cItem: ChatItem) {
    if (!cInfo.ntfsEnabled) return
-    displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+
+    notifyMessageReceived(chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
  }

-  fun displayNotification(user: User, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
-    if (!user.showNotifications) return
+  fun notifyMessageReceived(chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
    Log.d(TAG, "notifyMessageReceived $chatId")
    val now = Clock.System.now().toEpochMilliseconds()
    val recentNotification = (now - prevNtfTime.getOrDefault(chatId, 0) < msgNtfTimeoutMs)
@@ -130,14 +119,13 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
      .setColor(0x88FFFF)
      .setAutoCancel(true)
      .setVibrate(if (actions.isEmpty()) null else longArrayOf(0, 250, 250, 250))
-      .setContentIntent(chatPendingIntent(OpenChatAction, user.userId, chatId))
+      .setContentIntent(chatPendingIntent(OpenChatAction, chatId))
      .setSilent(if (actions.isEmpty()) recentNotification else false)

    for (action in actions) {
      val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
      val actionIntent = Intent(SimplexApp.context, NtfActionReceiver::class.java)
      actionIntent.action = action.name
-      actionIntent.putExtra(UserIdKey, user.userId)
      actionIntent.putExtra(ChatIdKey, chatId)
      val actionPendingIntent: PendingIntent = PendingIntent.getBroadcast(SimplexApp.context, 0, actionIntent, flags)
      val actionButton = when (action) {
@@ -152,7 +140,7 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
      .setGroup(MessageGroup)
      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
      .setGroupSummary(true)
-      .setContentIntent(chatPendingIntent(ShowChatsAction, null))
+      .setContentIntent(chatPendingIntent(ShowChatsAction))
      .build()

    with(NotificationManagerCompat.from(context)) {
@@ -163,34 +151,24 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
  }

  fun notifyCallInvitation(invitation: RcvCallInvitation) {
-    val keyguardManager = getKeyguardManager(context)
-    Log.d(TAG,
-      "notifyCallInvitation pre-requests: " +
-          "keyguard locked ${keyguardManager.isKeyguardLocked}, " +
-          "callOnLockScreen ${appPreferences.callOnLockScreen.get()}, " +
-          "onForeground ${SimplexApp.context.isAppOnForeground}"
-    )
-    if (SimplexApp.context.isAppOnForeground) return
+    if (isAppOnForeground(context)) return
    val contactId = invitation.contact.id
    Log.d(TAG, "notifyCallInvitation $contactId")
+    val keyguardManager = getKeyguardManager(context)
    val image = invitation.contact.image
-    val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-    val screenOff = displayManager.displays.all { it.state != Display.STATE_ON }
    var ntfBuilder =
-      if ((keyguardManager.isKeyguardLocked || screenOff) && appPreferences.callOnLockScreen.get() != CallOnLockScreen.DISABLE) {
+      if (keyguardManager.isDeviceLocked && appPreferences.callOnLockScreen.get() != CallOnLockScreen.DISABLE) {
        val fullScreenIntent = Intent(context, IncomingCallActivity::class.java)
        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-        NotificationCompat.Builder(context, CallChannel)
+        NotificationCompat.Builder(context, LockScreenCallChannel)
          .setFullScreenIntent(fullScreenPendingIntent, true)
          .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+          .setSilent(true)
      } else {
        val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
-        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, Intent(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
        NotificationCompat.Builder(context, CallChannel)
-          .setContentIntent(chatPendingIntent(OpenChatAction, invitation.user.userId, invitation.contact.id))
-          .addAction(R.drawable.ntf_icon, generalGetString(R.string.accept), chatPendingIntent(AcceptCallAction, invitation.user.userId, contactId))
-          .addAction(R.drawable.ntf_icon, generalGetString(R.string.reject), chatPendingIntent(RejectCallAction, invitation.user.userId, contactId, true))
-          .setFullScreenIntent(fullScreenPendingIntent, true)
+          .setContentIntent(chatPendingIntent(OpenChatAction, invitation.contact.id))
+          .addAction(R.drawable.ntf_icon, generalGetString(R.string.accept), chatPendingIntent(AcceptCallAction, contactId))
          .setSound(soundUri)
      }
    val text = generalGetString(
@@ -219,11 +197,8 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
      .setLargeIcon(largeIcon)
      .setColor(0x88FFFF)
      .setAutoCancel(true)
-    val notification = ntfBuilder.build()
-    // This makes notification sound and vibration repeat endlessly
-    notification.flags = notification.flags or NotificationCompat.FLAG_INSISTENT
    with(NotificationManagerCompat.from(context)) {
-      notify(CallNotificationId, notification)
+      notify(CallNotificationId, ntfBuilder.build())
    }
  }

@@ -231,80 +206,49 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    manager.cancel(CallNotificationId)
  }

-  fun hasNotificationsForChat(chatId: String): Boolean = manager.activeNotifications.any { it.id == chatId.hashCode() }
-
  private fun hideSecrets(cItem: ChatItem) : String {
    val md = cItem.formattedText
-    return if (md != null) {
+    return if (md == null) {
+      if (cItem.content.text != "") {
+        cItem.content.text
+      } else {
+        if (cItem.content.msgContent is MsgContent.MCVoice) generalGetString(R.string.voice_message) else cItem.file?.fileName ?: ""
+      }
+    } else {
      var res = ""
      for (ft in md) {
        res += if (ft.format is Format.Secret) "..." else ft.text
      }
      res
-    } else {
-      cItem.text
    }
  }

-  private fun chatPendingIntent(intentAction: String, userId: Long?, chatId: String? = null, broadcast: Boolean = false): PendingIntent {
+  private fun chatPendingIntent(intentAction: String, chatId: String? = null): PendingIntent {
    Log.d(TAG, "chatPendingIntent for $intentAction")
    val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
-    var intent = Intent(context, if (!broadcast) MainActivity::class.java else NtfActionReceiver::class.java)
+    var intent = Intent(context, MainActivity::class.java)
      .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
      .setAction(intentAction)
-      .putExtra(UserIdKey, userId)
    if (chatId != null) intent = intent.putExtra(ChatIdKey, chatId)
-    return if (!broadcast) {
-      TaskStackBuilder.create(context).run {
-        addNextIntentWithParentStack(intent)
-        getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)
-      }
-    } else {
-      PendingIntent.getBroadcast(SimplexApp.context, uniqueInt, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+    return TaskStackBuilder.create(context).run {
+      addNextIntentWithParentStack(intent)
+      getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)
    }
  }

-  /**
-   * This function creates notifications channels. On Android 13+ calling it for the first time will trigger system alert,
-   * The alert asks a user to allow or disallow to show notifications for the app. That's why it should be called only when the user
-   * already saw such alert or when you want to trigger showing the alert.
-   * On the first app launch the channels will be created after user profile is created. Subsequent calls will create new channels and delete
-   * old ones if needed
-   * */
-  fun createNtfChannelsMaybeShowAlert() {
-    manager.createNotificationChannel(NotificationChannel(MessageChannel, generalGetString(R.string.ntf_channel_messages), NotificationManager.IMPORTANCE_HIGH))
-    manager.createNotificationChannel(callNotificationChannel(CallChannel, generalGetString(R.string.ntf_channel_calls)))
-    // Remove old channels since they can't be edited
-    manager.deleteNotificationChannel("chat.simplex.app.CALL_NOTIFICATION")
-    manager.deleteNotificationChannel("chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION")
-  }
-
  /**
   * Processes every action specified by [NotificationCompat.Builder.addAction] that comes with [NotificationAction]
   * and [ChatInfo.id] as [ChatIdKey] in extra
   * */
  class NtfActionReceiver: BroadcastReceiver() {
    override fun onReceive(context: Context?, intent: Intent?) {
-      val userId = getUserIdFromIntent(intent)
      val chatId = intent?.getStringExtra(ChatIdKey) ?: return
-      val m = SimplexApp.context.chatModel
+      val cInfo = SimplexApp.context.chatModel.getChat(chatId)?.chatInfo
      when (intent.action) {
        NotificationAction.ACCEPT_CONTACT_REQUEST.name -> {
-          val isCurrentUser = m.currentUser.value?.userId == userId
-          val cInfo: ChatInfo.ContactRequest? = if (isCurrentUser) {
-            (m.getChat(chatId)?.chatInfo as? ChatInfo.ContactRequest) ?: return
-          } else {
-            null
-          }
-          val apiId = chatId.replace("<@", "").toLongOrNull() ?: return
-          acceptContactRequest(apiId, cInfo, isCurrentUser, m)
-          m.controller.ntfManager.cancelNotificationsForChat(chatId)
-        }
-        RejectCallAction -> {
-          val invitation = m.callInvitations[chatId]
-          if (invitation != null) {
-            m.callManager.endCall(invitation = invitation)
-          }
+          if (cInfo !is ChatInfo.ContactRequest) return
+          acceptContactRequest(cInfo, SimplexApp.context.chatModel)
+          SimplexApp.context.chatModel.controller.ntfManager.cancelNotificationsForChat(chatId)
        }
        else -> {
          Log.e(TAG, "Unknown action. Make sure you provide action from NotificationAction enum")
@@ -17,7 +17,6 @@ enum class DefaultTheme {
 val DEFAULT_PADDING = 16.dp
 val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
-val DEFAULT_BOTTOM_PADDING = 48.dp

 val DarkColorPalette = darkColors(
  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
@@ -1,21 +1,29 @@
 package chat.simplex.app.views

+import android.content.Context
 import android.content.res.Configuration
+import android.os.SystemClock
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Lock
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.fragment.app.FragmentActivity
+import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
@@ -23,18 +31,70 @@ import chat.simplex.app.views.helpers.*
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsWithImePadding

+private val lastSuccessfulAuth: MutableState<Long?> = mutableStateOf(null)
+
@Composable
 fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }
+  val lastSuccessfulAuth = remember { lastSuccessfulAuth }
  BackHandler(onBack = {
+    lastSuccessfulAuth.value = null
    close()
  })
+  val authorized = remember { !chatModel.controller.appPrefs.performLA.get() }
+  val context = LocalContext.current
+  LaunchedEffect(lastSuccessfulAuth.value) {
+    if (!authorized && !authorizedPreviously(lastSuccessfulAuth)) {
+      runAuth(lastSuccessfulAuth, context)
+    }
+  }
+  if (authorized || authorizedPreviously(lastSuccessfulAuth)) {
+    LaunchedEffect(Unit) {
+      // Update auth each time user visits this screen in authenticated state just to prolong authorized time
+      lastSuccessfulAuth.value = SystemClock.elapsedRealtime()
+    }
    TerminalLayout(
-      remember { chatModel.terminalItems },
+      chatModel.terminalItems,
      composeState,
      sendCommand = { sendCommand(chatModel, composeState) },
      close
    )
+  } else {
+    Surface(Modifier.fillMaxSize()) {
+      Column(Modifier.background(MaterialTheme.colors.background)) {
+        CloseSheetBar(close)
+        Box(
+          Modifier.fillMaxSize(),
+          contentAlignment = Alignment.Center
+        ) {
+          SimpleButton(
+            stringResource(R.string.auth_unlock),
+            icon = Icons.Outlined.Lock,
+            click = {
+              runAuth(lastSuccessfulAuth, context)
+            }
+          )
+        }
+      }
+    }
+  }
+}
+
+private fun authorizedPreviously(lastSuccessfulAuth: State<Long?>): Boolean =
+  lastSuccessfulAuth.value?.let { SystemClock.elapsedRealtime() - it < 30_000 } ?: false
+
+private fun runAuth(lastSuccessfulAuth: MutableState<Long?>, context: Context) {
+  authenticate(
+    generalGetString(R.string.auth_open_chat_console),
+    generalGetString(R.string.auth_log_in_using_credential),
+    context as FragmentActivity,
+    completed = { laResult ->
+      lastSuccessfulAuth.value = when (laResult) {
+        LAResult.Success, LAResult.Unavailable -> SystemClock.elapsedRealtime()
+        is LAResult.Error, LAResult.Failed -> null
+      }
+    }
+  )
 }

 private fun sendCommand(chatModel: ChatModel, composeState: MutableState<ComposeState>) {
@@ -42,9 +102,9 @@ private fun sendCommand(chatModel: ChatModel, composeState: MutableState<Compose
  val prefPerformLA = chatModel.controller.appPrefs.performLA.get()
  val s = composeState.value.message
  if (s.startsWith("/sql") && (!prefPerformLA || !developerTools)) {
-    val resp = CR.ChatCmdError(null, ChatError.ChatErrorChat(ChatErrorType.СommandError("Failed reading: empty")))
-    chatModel.addTerminalItem(TerminalItem.cmd(CC.Console(s)))
-    chatModel.addTerminalItem(TerminalItem.resp(resp))
+    val resp = CR.ChatCmdError(ChatError.ChatErrorChat(ChatErrorType.СommandError("Failed reading: empty")))
+    chatModel.terminalItems.add(TerminalItem.cmd(CC.Console(s)))
+    chatModel.terminalItems.add(TerminalItem.resp(resp))
    composeState.value = ComposeState(useLinkPreviews = false)
  } else {
    withApi {
@@ -75,23 +135,7 @@ fun TerminalLayout(
      topBar = { CloseSheetBar(close) },
      bottomBar = {
        Box(Modifier.padding(horizontal = 8.dp)) {
-          SendMsgView(
-            composeState = composeState,
-            showVoiceRecordIcon = false,
-            recState = remember { mutableStateOf(RecordingState.NotStarted) },
-            isDirectChat = false,
-            liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
-            needToAllowVoiceToContact = false,
-            allowedVoiceByPrefs = false,
-            userIsObserver = false,
-            userCanSend = true,
-            allowVoiceToContact = {},
-            sendMessage = sendCommand,
-            sendLiveMessage = null,
-            updateLiveMessage = null,
-            onMessageChange = ::onMessageChange,
-            textStyle = textStyle
-          )
+          SendMsgView(composeState, false, sendCommand, ::onMessageChange, { _, _, _ -> }, textStyle)
        }
      },
      modifier = Modifier.navigationBarsWithImePadding()
@@ -116,8 +160,7 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
  DisposableEffect(Unit) {
    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
  }
-  val reversedTerminalItems by remember { derivedStateOf { terminalItems.reversed().toList() } }
-  val context = LocalContext.current
+  val reversedTerminalItems by remember { derivedStateOf { terminalItems.reversed() } }
  LazyColumn(state = listState, reverseLayout = true) {
    items(reversedTerminalItems) { item ->
      Text(
@@ -128,7 +171,7 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
        modifier = Modifier
          .fillMaxWidth()
          .clickable {
-            ModalManager.shared.showModal(endButtons = { ShareButton { shareText(context, item.details) } }) {
+            ModalManager.shared.showModal {
              SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
                Text(item.details, modifier = Modifier.padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
              }
@@ -21,8 +21,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
 import chat.simplex.app.R
+import chat.simplex.app.SimplexService
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
 import chat.simplex.app.ui.theme.*
@@ -38,7 +38,7 @@ fun isValidDisplayName(name: String) : Boolean {
 }

@Composable
-fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
+fun CreateProfilePanel(chatModel: ChatModel) {
  val displayName = remember { mutableStateOf("") }
  val fullName = remember { mutableStateOf("") }
  val focusRequester = remember { FocusRequester() }
@@ -72,12 +72,10 @@ fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
      ProfileNameField(fullName)
      Spacer(Modifier.fillMaxHeight().weight(1f))
      Row {
-        if (chatModel.users.isEmpty()) {
-          SimpleButton(
-            text = stringResource(R.string.about_simplex),
-            icon = Icons.Outlined.ArrowBackIosNew
-          ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
-        }
+        SimpleButton(
+          text = stringResource(R.string.about_simplex),
+          icon = Icons.Outlined.ArrowBackIosNew
+        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }

        Spacer(Modifier.fillMaxWidth().weight(1f))

@@ -85,7 +83,7 @@ fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
        val createModifier: Modifier
        val createColor: Color
        if (enabled) {
-          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
+          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value) }.padding(8.dp)
          createColor = MaterialTheme.colors.primary
        } else {
          createModifier = Modifier.padding(8.dp)
@@ -107,23 +105,15 @@ fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
  }
 }

-fun createProfile(chatModel: ChatModel, displayName: String, fullName: String, close: () -> Unit) {
+fun createProfile(chatModel: ChatModel, displayName: String, fullName: String) {
  withApi {
    val user = chatModel.controller.apiCreateActiveUser(
      Profile(displayName, fullName, null)
-    ) ?: return@withApi
-    chatModel.currentUser.value = user
-    if (chatModel.users.isEmpty()) {
-      chatModel.controller.startChat(user)
-      chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
-      SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
-    } else {
-      val users = chatModel.controller.listUsers()
-      chatModel.users.clear()
-      chatModel.users.addAll(users)
-      chatModel.controller.getUserChatData()
-      close()
-    }
+    )
+    chatModel.controller.startChat(user)
+    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
+    SimplexService.start(chatModel.controller.appContext)
+    chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
  }
 }

@@ -13,14 +13,12 @@ class CallManager(val chatModel: ChatModel) {
    Log.d(TAG, "CallManager.reportNewIncomingCall")
    with (chatModel) {
      callInvitations[invitation.contact.id] = invitation
-      if (invitation.user.showNotifications) {
-        if (Clock.System.now() - invitation.callTs <= 3.minutes) {
-          activeCallInvitation.value = invitation
-          controller.ntfManager.notifyCallInvitation(invitation)
-        } else {
-          val contact = invitation.contact
-          controller.ntfManager.displayNotification(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
-        }
+      if (Clock.System.now() - invitation.callTs <= 3.minutes) {
+        activeCallInvitation.value = invitation
+        controller.ntfManager.notifyCallInvitation(invitation)
+      } else {
+        val contact = invitation.contact
+        controller.ntfManager.notifyMessageReceived(chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
      }
    }
  }
@@ -3,12 +3,11 @@ package chat.simplex.app.views.call
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.*
+import android.content.Context
 import android.content.pm.ActivityInfo
-import android.media.*
+import android.media.AudioDeviceInfo
+import android.media.AudioManager
 import android.os.Build
-import android.os.PowerManager
-import android.os.PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK
 import android.util.Log
 import android.view.ViewGroup
 import android.webkit.*
@@ -20,7 +19,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -39,7 +37,7 @@ import androidx.webkit.WebViewClientCompat
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.ProfileImage
 import chat.simplex.app.views.helpers.withApi
 import chat.simplex.app.views.usersettings.NotificationsMode
@@ -55,7 +53,6 @@ fun ActiveCallView(chatModel: ChatModel) {
    val call = chatModel.activeCall.value
    if (call != null) withApi { chatModel.callManager.endCall(call) }
  })
-  val audioViaBluetooth = rememberSaveable { mutableStateOf(false) }
  val ntfModeService = remember { chatModel.controller.appPrefs.notificationsMode.get() == NotificationsMode.SERVICE.name }
  LaunchedEffect(Unit) {
    // Start service when call happening since it's not already started.
@@ -63,48 +60,17 @@ fun ActiveCallView(chatModel: ChatModel) {
    if (!ntfModeService) SimplexService.start(SimplexApp.context)
  }
  DisposableEffect(Unit) {
-    val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-    var btDeviceCount = 0
-    val audioCallback = object: AudioDeviceCallback() {
-      override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
-        Log.d(TAG, "Added audio devices: ${addedDevices.map { it.type }}")
-        super.onAudioDevicesAdded(addedDevices)
-        val addedCount = addedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-        btDeviceCount += addedCount
-        audioViaBluetooth.value = btDeviceCount > 0
-        if (addedCount > 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
-          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
-          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
-        }
-      }
-      override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
-        Log.d(TAG, "Removed audio devices: ${removedDevices.map { it.type }}")
-        super.onAudioDevicesRemoved(removedDevices)
-        val removedCount = removedDevices.count { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-        btDeviceCount -= removedCount
-        audioViaBluetooth.value = btDeviceCount > 0
-        if (btDeviceCount == 0 && chatModel.activeCall.value?.callState == CallState.Connected) {
-          // Setting params in Connected state makes sure that Bluetooth will NOT be broken on Android < 12
-          setCallSound(chatModel.activeCall.value?.soundSpeaker ?: return, audioViaBluetooth)
-        }
-      }
-    }
-    am.registerAudioDeviceCallback(audioCallback, null)
-    val pm = (SimplexApp.context.getSystemService(Context.POWER_SERVICE) as PowerManager)
-    val proximityLock = if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, SimplexApp.context.packageName + ":proximityLock")
-    } else {
-      null
-    }
-    proximityLock?.acquire()
    onDispose {
      // Stop it when call ended
      if (!ntfModeService) SimplexService.safeStopService(SimplexApp.context)
-      dropAudioManagerOverrides()
-      am.unregisterAudioDeviceCallback(audioCallback)
-      proximityLock?.release()
+      // Clear selected communication device to default value after we changed it in call
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        am.clearCommunicationDevice()
+      }
    }
  }
+  val cxt = LocalContext.current
  val scope = rememberCoroutineScope()
  Box(Modifier.fillMaxSize()) {
    WebRTCView(chatModel.callCommand) { apiMsg ->
@@ -134,7 +100,6 @@ fun ActiveCallView(chatModel: ChatModel) {
              val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
              if (callStatus == WebRTCCallStatus.Connected) {
                chatModel.activeCall.value = call.copy(callState = CallState.Connected)
-                setCallSound(call.soundSpeaker, audioViaBluetooth)
              }
              withApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
            } catch (e: Error) {
@@ -143,7 +108,8 @@ fun ActiveCallView(chatModel: ChatModel) {
          is WCallResponse.Connected -> {
            chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
            scope.launch {
-              setCallSound(call.soundSpeaker, audioViaBluetooth)
+              delay(2000L)
+              setCallSound(cxt, call)
            }
          }
          is WCallResponse.Ended -> {
@@ -177,18 +143,15 @@ fun ActiveCallView(chatModel: ChatModel) {
      }
    }
    val call = chatModel.activeCall.value
-    if (call != null)  ActiveCallOverlay(call, chatModel, audioViaBluetooth)
+    if (call != null)  ActiveCallOverlay(call, chatModel)
  }

  val context = LocalContext.current
  DisposableEffect(Unit) {
    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val prevVolumeControlStream = activity.volumeControlStream
-    activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
    // Lock orientation to portrait in order to have good experience with calls
    activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
    onDispose {
-      activity.volumeControlStream = prevVolumeControlStream
      // Unlock orientation
      activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
    }
@@ -196,10 +159,10 @@ fun ActiveCallView(chatModel: ChatModel) {
 }

@Composable
-private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetooth: MutableState<Boolean>) {
+private fun ActiveCallOverlay(call: Call, chatModel: ChatModel) {
+  var cxt = LocalContext.current
  ActiveCallOverlayLayout(
    call = call,
-    speakerCanBeEnabled = !audioViaBluetooth.value,
    dismiss = { withApi { chatModel.callManager.endCall(call) } },
    toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
    toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
@@ -208,55 +171,38 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetoot
      if (call != null) {
        call = call.copy(soundSpeaker = !call.soundSpeaker)
        chatModel.activeCall.value = call
-        setCallSound(call.soundSpeaker, audioViaBluetooth)
+        setCallSound(cxt, call)
      }
    },
    flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
  )
 }

-private fun setCallSound(speaker: Boolean, audioViaBluetooth: MutableState<Boolean>) {
-  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-  Log.d(TAG, "setCallSound: set audio mode, speaker enabled: $speaker")
-  am.mode = AudioManager.MODE_IN_COMMUNICATION
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-    val btDevice = am.availableCommunicationDevices.lastOrNull { it.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO }
-    val preferredSecondaryDevice = if (speaker) AudioDeviceInfo.TYPE_BUILTIN_SPEAKER else AudioDeviceInfo.TYPE_BUILTIN_EARPIECE
-    if (btDevice != null) {
-      am.setCommunicationDevice(btDevice)
-    } else if (am.communicationDevice?.type != preferredSecondaryDevice) {
-      am.availableCommunicationDevices.firstOrNull { it.type == preferredSecondaryDevice }?.let {
+private fun setCallSound(cxt: Context, call: Call) {
+  Log.d(TAG, "setCallSound: set audio mode")
+  val am = cxt.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  if (call.soundSpeaker) {
+    am.mode = AudioManager.MODE_NORMAL
+    am.isSpeakerphoneOn = true
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      am.availableCommunicationDevices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER }?.let {
        am.setCommunicationDevice(it)
      }
    }
  } else {
-    if (audioViaBluetooth.value) {
-      am.isSpeakerphoneOn = false
-      am.startBluetoothSco()
-    } else {
-      am.stopBluetoothSco()
-      am.isSpeakerphoneOn = speaker
-    }
-    am.isBluetoothScoOn = am.isBluetoothScoAvailableOffCall && audioViaBluetooth.value
-  }
-}
-
-private fun dropAudioManagerOverrides() {
-  val am = SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-  am.mode = AudioManager.MODE_NORMAL
-  // Clear selected communication device to default value after we changed it in call
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-    am.clearCommunicationDevice()
-  } else {
+    am.mode = AudioManager.MODE_IN_CALL
    am.isSpeakerphoneOn = false
-    am.stopBluetoothSco()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      am.availableCommunicationDevices.firstOrNull { it.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE }?.let {
+        am.setCommunicationDevice(it)
+      }
+    }
  }
 }

@Composable
 private fun ActiveCallOverlayLayout(
  call: Call,
-  speakerCanBeEnabled: Boolean,
  dismiss: () -> Unit,
  toggleAudio: () -> Unit,
  toggleVideo: () -> Unit,
@@ -294,7 +240,7 @@ private fun ActiveCallOverlayLayout(
          CallInfoView(call, alignment = Alignment.CenterHorizontally)
        }
        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
+        Box(Modifier.fillMaxWidth().padding(bottom = 48.dp), contentAlignment = Alignment.CenterStart) {
          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
            IconButton(onClick = dismiss) {
              Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
@@ -305,7 +251,7 @@ private fun ActiveCallOverlayLayout(
          }
          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
            Box(Modifier.padding(end = 32.dp)) {
-              ToggleSoundButton(call, speakerCanBeEnabled, toggleSound)
+              ToggleSoundButton(call, toggleSound)
            }
          }
        }
@@ -315,10 +261,10 @@ private fun ActiveCallOverlayLayout(
 }

@Composable
-private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit, enabled: Boolean = true) {
+private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit) {
  if (call.hasMedia) {
-    IconButton(onClick = action, enabled = enabled) {
-      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else HighOrLowlight, modifier = Modifier.size(40.dp))
+    IconButton(onClick = action) {
+      Icon(icon, stringResource(iconText), tint = Color(0xFFFFFFD8), modifier = Modifier.size(40.dp))
    }
  } else {
    Spacer(Modifier.size(40.dp))
@@ -335,11 +281,11 @@ private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
 }

@Composable
-private fun ToggleSoundButton(call: Call, enabled: Boolean, toggleSound: () -> Unit) {
+private fun ToggleSoundButton(call: Call, toggleSound: () -> Unit) {
  if (call.soundSpeaker) {
-    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound, enabled)
+    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound)
  } else {
-    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound, enabled)
+    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound)
  }
 }

@@ -351,10 +297,10 @@ fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
    InfoText(call.contact.chatViewName, style = MaterialTheme.typography.h2)
    InfoText(call.callState.text)

-    val connInfo = call.connectionInfo
-//    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text}, ${connInfo.protocolText})"
-    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text})"
-    InfoText(call.encryptionStatus + connInfoText)
+    val connInfo =
+      if (call.connectionInfo == null) ""
+      else " (${call.connectionInfo.text})"
+    InfoText(call.encryptionStatus + connInfo)
  }
 }

@@ -534,12 +480,8 @@ fun PreviewActiveCallOverlayVideo() {
        callState = CallState.Negotiated,
        localMedia = CallMediaType.Video,
        peerMedia = CallMediaType.Video,
-        connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null),
-          RTCIceCandidate(RTCIceCandidateType.Host, "tcp", null)
-        )
+        connectionInfo = ConnectionInfo(RTCIceCandidate(RTCIceCandidateType.Host), RTCIceCandidate(RTCIceCandidateType.Host))
      ),
-      speakerCanBeEnabled = true,
      dismiss = {},
      toggleAudio = {},
      toggleVideo = {},
@@ -559,12 +501,8 @@ fun PreviewActiveCallOverlayAudio() {
        callState = CallState.Negotiated,
        localMedia = CallMediaType.Audio,
        peerMedia = CallMediaType.Audio,
-        connectionInfo = ConnectionInfo(
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null),
-          RTCIceCandidate(RTCIceCandidateType.Host, "udp", null)
-        )
+        connectionInfo = ConnectionInfo(RTCIceCandidate(RTCIceCandidateType.Host), RTCIceCandidate(RTCIceCandidateType.Host))
      ),
-      speakerCanBeEnabled = true,
      dismiss = {},
      toggleAudio = {},
      toggleVideo = {},
@@ -1,6 +1,5 @@
 package chat.simplex.app.views.call

-import android.app.Activity
 import android.app.KeyguardManager
 import android.content.Context
 import android.content.Intent
@@ -44,7 +43,8 @@ class IncomingCallActivity: ComponentActivity() {

  override fun onCreate(savedInstanceState: Bundle?) {
    super.onCreate(savedInstanceState)
-    setContent { IncomingCallActivityView(vm.chatModel) }
+    val activity = this
+    setContent { IncomingCallActivityView(vm.chatModel, activity) }
    unlockForIncomingCall()
  }

@@ -83,12 +83,11 @@ fun getKeyguardManager(context: Context): KeyguardManager =
  context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager

@Composable
-fun IncomingCallActivityView(m: ChatModel) {
+fun IncomingCallActivityView(m: ChatModel, activity: IncomingCallActivity) {
  val switchingCall = m.switchingCall.value
  val invitation = m.activeCallInvitation.value
  val call = m.activeCall.value
  val showCallView = m.showCallView.value
-  val activity = LocalContext.current as Activity
  LaunchedEffect(invitation, call, switchingCall, showCallView) {
    if (!switchingCall && invitation == null && (!showCallView || call == null)) {
      Log.d(TAG, "IncomingCallActivityView: finishing activity")
@@ -106,43 +105,36 @@ fun IncomingCallActivityView(m: ChatModel) {
          if (invitation != null) IncomingCallAlertView(invitation, m)
        }
      } else if (invitation != null) {
-        IncomingCallLockScreenAlert(invitation, m)
+        IncomingCallLockScreenAlert(invitation, m, activity)
      }
    }
  }
 }

@Composable
-fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatModel) {
+fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatModel, activity: IncomingCallActivity) {
  val cm = chatModel.callManager
-  val callOnLockScreen by remember { mutableStateOf(chatModel.controller.appPrefs.callOnLockScreen.get()) }
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    onDispose {
-      // Cancel notification whatever happens next since otherwise sound from notification and from inside the app can co-exist
-      chatModel.controller.ntfManager.cancelCallNotification()
-    }
-  }
+  val cxt = LocalContext.current
+  val scope = rememberCoroutineScope()
+  var callOnLockScreen by remember { mutableStateOf(chatModel.controller.appPrefs.callOnLockScreen.get()) }
+  LaunchedEffect(true) { SoundPlayer.shared.start(cxt, scope, sound = true) }
+  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
  IncomingCallLockScreenAlertLayout(
    invitation,
    callOnLockScreen,
-    chatModel,
    rejectCall = { cm.endCall(invitation = invitation) },
-    ignoreCall = {
-      chatModel.activeCallInvitation.value = null
-      chatModel.controller.ntfManager.cancelCallNotification()
-    },
+    ignoreCall = { chatModel.activeCallInvitation.value = null },
    acceptCall = { cm.acceptIncomingCall(invitation = invitation) },
    openApp = {
-      val intent = Intent(context, MainActivity::class.java)
+      SoundPlayer.shared.stop()
+      var intent = Intent(activity, MainActivity::class.java)
        .setAction(OpenChatAction)
-        .putExtra("userId", invitation.user.userId)
        .putExtra("chatId", invitation.contact.id)
-      context.startActivity(intent)
+      activity.startActivity(intent)
+      activity.finish()
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        getKeyguardManager(context).requestDismissKeyguard((context as Activity), null)
+        getKeyguardManager(activity).requestDismissKeyguard(activity, null)
      }
-      (context as Activity).finish()
    }
  )
 }
@@ -151,7 +143,6 @@ fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatMo
 fun IncomingCallLockScreenAlertLayout(
  invitation: RcvCallInvitation,
  callOnLockScreen: CallOnLockScreen?,
-  chatModel: ChatModel,
  rejectCall: () -> Unit,
  ignoreCall: () -> Unit,
  acceptCall: () -> Unit,
@@ -163,7 +154,7 @@ fun IncomingCallLockScreenAlertLayout(
      .fillMaxSize(),
    horizontalAlignment = Alignment.CenterHorizontally
  ) {
-    IncomingCallInfo(invitation, chatModel)
+    IncomingCallInfo(invitation)
    Spacer(Modifier.fillMaxHeight().weight(1f))
    if (callOnLockScreen == CallOnLockScreen.ACCEPT) {
      ProfileImage(size = 192.dp, image = invitation.contact.profile.image)
@@ -220,14 +211,12 @@ fun PreviewIncomingCallLockScreenAlert() {
        .fillMaxSize()) {
      IncomingCallLockScreenAlertLayout(
        invitation = RcvCallInvitation(
-          user = User.sampleData,
          contact = Contact.sampleData,
          callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
          sharedKey = null,
          callTs = Clock.System.now()
        ),
        callOnLockScreen = null,
-        chatModel = SimplexApp.context.chatModel,
        rejectCall = {},
        ignoreCall = {},
        acceptCall = {},
@@ -17,10 +17,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.*
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.Contact
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.ProfileImage
 import chat.simplex.app.views.usersettings.ProfilePreview
 import kotlinx.datetime.Clock

@@ -33,12 +32,8 @@ fun IncomingCallAlertView(invitation: RcvCallInvitation, chatModel: ChatModel) {
  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
  IncomingCallAlertLayout(
    invitation,
-    chatModel,
    rejectCall = { cm.endCall(invitation = invitation) },
-    ignoreCall = {
-      chatModel.activeCallInvitation.value = null
-      chatModel.controller.ntfManager.cancelCallNotification()
-    },
+    ignoreCall = { chatModel.activeCallInvitation.value = null },
    acceptCall = { cm.acceptIncomingCall(invitation = invitation) }
  )
 }
@@ -46,14 +41,13 @@ fun IncomingCallAlertView(invitation: RcvCallInvitation, chatModel: ChatModel) {
@Composable
 fun IncomingCallAlertLayout(
  invitation: RcvCallInvitation,
-  chatModel: ChatModel,
  rejectCall: () -> Unit,
  ignoreCall: () -> Unit,
  acceptCall: () -> Unit
 ) {
  val color = if (isInDarkTheme()) IncomingCallDark else IncomingCallLight
  Column(Modifier.fillMaxWidth().background(color).padding(top = 16.dp, bottom = 16.dp, start = 16.dp, end = 8.dp)) {
-    IncomingCallInfo(invitation, chatModel)
+    IncomingCallInfo(invitation)
    Spacer(Modifier.height(8.dp))
    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
      Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) {
@@ -69,13 +63,9 @@ fun IncomingCallAlertLayout(
 }

@Composable
-fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
+fun IncomingCallInfo(invitation: RcvCallInvitation) {
  @Composable fun CallIcon(icon: ImageVector, descr: String) = Icon(icon, descr, tint = SimplexGreen)
-  Row(verticalAlignment = Alignment.CenterVertically) {
-    if (chatModel.users.size > 1) {
-      ProfileImage(size = 32.dp, image = invitation.user.profile.image, color = MaterialTheme.colors.secondary)
-      Spacer(Modifier.width(4.dp))
-    }
+  Row {
    if (invitation.callType.media == CallMediaType.Video) CallIcon(Icons.Filled.Videocam, stringResource(R.string.icon_descr_video_call))
    else CallIcon(Icons.Filled.Phone, stringResource(R.string.icon_descr_audio_call))
    Spacer(Modifier.width(4.dp))
@@ -108,13 +98,11 @@ fun PreviewIncomingCallAlertLayout() {
  SimpleXTheme {
    IncomingCallAlertLayout(
      invitation = RcvCallInvitation(
-        user = User.sampleData,
        contact = Contact.sampleData,
        callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
        sharedKey = null,
        callTs = Clock.System.now()
      ),
-      chatModel = SimplexApp.context.chatModel,
      rejectCall = {},
      ignoreCall = {},
      acceptCall = {}
@@ -1,19 +1,15 @@
 package chat.simplex.app.views.call

-import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.toUpperCase
-import chat.simplex.app.*
+import chat.simplex.app.R
+import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.Contact
-import chat.simplex.app.model.User
 import chat.simplex.app.views.helpers.generalGetString
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.net.URI
-import java.util.*
-import kotlin.collections.ArrayList

 data class Call(
  val contact: Contact,
@@ -65,39 +61,39 @@ enum class CallState {
  }
 }

-@Serializable data class WVAPICall(val corrId: Int? = null, val command: WCallCommand)
-@Serializable data class WVAPIMessage(val corrId: Int? = null, val resp: WCallResponse, val command: WCallCommand? = null)
+@Serializable class WVAPICall(val corrId: Int? = null, val command: WCallCommand)
+@Serializable class WVAPIMessage(val corrId: Int? = null, val resp: WCallResponse, val command: WCallCommand? = null)

@Serializable
 sealed class WCallCommand {
  @Serializable @SerialName("capabilities") object Capabilities: WCallCommand()
-  @Serializable @SerialName("start") data class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
-  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
-  @Serializable @SerialName("answer") data class Answer (val answer: String, val iceCandidates: String): WCallCommand()
-  @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallCommand()
-  @Serializable @SerialName("media") data class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
-  @Serializable @SerialName("camera") data class Camera(val camera: VideoCamera): WCallCommand()
+  @Serializable @SerialName("start") class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
+  @Serializable @SerialName("offer") class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
+  @Serializable @SerialName("answer") class Answer (val answer: String, val iceCandidates: String): WCallCommand()
+  @Serializable @SerialName("ice") class Ice(val iceCandidates: String): WCallCommand()
+  @Serializable @SerialName("media") class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
+  @Serializable @SerialName("camera") class Camera(val camera: VideoCamera): WCallCommand()
  @Serializable @SerialName("end") object End: WCallCommand()
 }

@Serializable
 sealed class WCallResponse {
-  @Serializable @SerialName("capabilities") data class Capabilities(val capabilities: CallCapabilities): WCallResponse()
-  @Serializable @SerialName("offer") data class Offer(val offer: String, val iceCandidates: String, val capabilities: CallCapabilities): WCallResponse()
-  @Serializable @SerialName("answer") data class Answer(val answer: String, val iceCandidates: String): WCallResponse()
-  @Serializable @SerialName("ice") data class Ice(val iceCandidates: String): WCallResponse()
-  @Serializable @SerialName("connection") data class Connection(val state: ConnectionState): WCallResponse()
-  @Serializable @SerialName("connected") data class Connected(val connectionInfo: ConnectionInfo): WCallResponse()
+  @Serializable @SerialName("capabilities") class Capabilities(val capabilities: CallCapabilities): WCallResponse()
+  @Serializable @SerialName("offer") class Offer(val offer: String, val iceCandidates: String, val capabilities: CallCapabilities): WCallResponse()
+  @Serializable @SerialName("answer") class Answer(val answer: String, val iceCandidates: String): WCallResponse()
+  @Serializable @SerialName("ice") class Ice(val iceCandidates: String): WCallResponse()
+  @Serializable @SerialName("connection") class Connection(val state: ConnectionState): WCallResponse()
+  @Serializable @SerialName("connected") class Connected(val connectionInfo: ConnectionInfo): WCallResponse()
  @Serializable @SerialName("ended") object Ended: WCallResponse()
  @Serializable @SerialName("ok") object Ok: WCallResponse()
-  @Serializable @SerialName("error") data class Error(val message: String): WCallResponse()
+  @Serializable @SerialName("error") class Error(val message: String): WCallResponse()
 }

-@Serializable data class WebRTCCallOffer(val callType: CallType, val rtcSession: WebRTCSession)
-@Serializable data class WebRTCSession(val rtcSession: String, val rtcIceCandidates: String)
-@Serializable data class WebRTCExtraInfo(val rtcIceCandidates: String)
-@Serializable data class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
-@Serializable data class RcvCallInvitation(val user: User, val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant) {
+@Serializable class WebRTCCallOffer(val callType: CallType, val rtcSession: WebRTCSession)
+@Serializable class WebRTCSession(val rtcSession: String, val rtcIceCandidates: String)
+@Serializable class WebRTCExtraInfo(val rtcIceCandidates: String)
+@Serializable class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
+@Serializable class RcvCallInvitation(val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant) {
  val callTypeText: String get() = generalGetString(when(callType.media) {
    CallMediaType.Video -> if (sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
    CallMediaType.Audio -> if (sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
@@ -107,32 +103,19 @@ sealed class WCallResponse {
    CallMediaType.Audio -> R.string.incoming_audio_call
  })
 }
-@Serializable data class CallCapabilities(val encryption: Boolean)
-@Serializable data class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
-  val text: String @Composable get() {
-    val local = localCandidate?.candidateType
-    val remote = remoteCandidate?.candidateType
-    return when {
-      local == RTCIceCandidateType.Host && remote == RTCIceCandidateType.Host ->
-        stringResource(R.string.call_connection_peer_to_peer)
-      local == RTCIceCandidateType.Relay && remote == RTCIceCandidateType.Relay ->
-        stringResource(R.string.call_connection_via_relay)
-      else ->
-        "${local?.value ?: "unknown"} / ${remote?.value ?: "unknown"}"
-    }
-  }
-
-  val protocolText: String get() {
-    val local = localCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localRelay = localCandidate?.relayProtocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val remote = remoteCandidate?.protocol?.uppercase(Locale.ROOT) ?: "unknown"
-    val localText = if (localRelay == local || localCandidate?.relayProtocol == null) local else "$local ($localRelay)"
-    return if (local == remote) localText else "$localText / $remote"
+@Serializable class CallCapabilities(val encryption: Boolean)
+@Serializable class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
+  val text: String @Composable get() = when {
+    localCandidate?.candidateType == RTCIceCandidateType.Host && remoteCandidate?.candidateType == RTCIceCandidateType.Host ->
+      stringResource(R.string.call_connection_peer_to_peer)
+    localCandidate?.candidateType == RTCIceCandidateType.Relay && remoteCandidate?.candidateType == RTCIceCandidateType.Relay ->
+      stringResource(R.string.call_connection_via_relay)
+    else ->
+      "${localCandidate?.candidateType?.value ?: "unknown"} / ${remoteCandidate?.candidateType?.value ?: "unknown"}"
  }
 }
-
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
-@Serializable data class RTCIceCandidate(val candidateType: RTCIceCandidateType?, val protocol: String?, val relayProtocol: String?)
+@Serializable class RTCIceCandidate(val candidateType: RTCIceCandidateType?)
 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceServer
@Serializable data class RTCIceServer(val urls: List<String>, val username: String? = null, val credential: String? = null)

@@ -167,7 +150,7 @@ enum class VideoCamera {
 }

@Serializable
-data class ConnectionState(
+class ConnectionState(
  val connectionState: String,
  val iceConnectionState: String,
  val iceGatheringState: String,
@@ -175,22 +158,20 @@ data class ConnectionState(
 )

 // the servers are expected in this format:
-// stun:stun.simplex.im:443?transport=tcp
-// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
+// stun:stun.simplex.im:443
+// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443
 fun parseRTCIceServer(str: String): RTCIceServer? {
  var s = replaceScheme(str, "stun:")
  s = replaceScheme(s, "turn:")
-  s = replaceScheme(s, "turns:")
  val u = runCatching { URI(s) }.getOrNull()
  if (u != null) {
    val scheme = u.scheme
    val host = u.host
    val port = u.port
-    if (u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")) {
+    if (u.path == "" && (scheme == "stun" || scheme == "turn")) {
      val userInfo = u.userInfo?.split(":")
-      val query = if (u.query == null || u.query == "") "" else "?${u.query}"
      return RTCIceServer(
-        urls = listOf("$scheme:$host:$port$query"),
+        urls = listOf("$scheme:$host:$port"),
        username = userInfo?.getOrNull(0),
        credential = userInfo?.getOrNull(1)
      )
@@ -35,10 +35,9 @@ import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*
+import chat.simplex.app.views.usersettings.SettingsActionItem
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
-import kotlinx.datetime.Clock

@Composable
 fun ChatInfoView(
@@ -47,65 +46,26 @@ fun ChatInfoView(
  connStats: ConnectionStats?,
  customUserProfile: Profile?,
  localAlias: String,
-  connectionCode: String?,
  close: () -> Unit,
 ) {
  BackHandler(onBack = close)
  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
  val developerTools = chatModel.controller.appPrefs.developerTools.get()
  if (chat != null) {
-    val contactNetworkStatus = remember(chatModel.networkStatuses.toMap()) {
-      mutableStateOf(chatModel.contactNetworkStatus(contact))
-    }
    ChatInfoLayout(
      chat,
      contact,
      connStats,
-      contactNetworkStatus.value,
      customUserProfile,
      localAlias,
-      connectionCode,
      developerTools,
      onLocalAliasChanged = {
        setContactAlias(chat.chatInfo.apiId, it, chatModel)
      },
-      openPreferences = {
-        ModalManager.shared.showCustomModal { close ->
-          val user = chatModel.currentUser.value
-          if (user != null) {
-            ContactPreferencesView(chatModel, user, contact.contactId, close)
-          }
-        }
-      },
      deleteContact = { deleteContactDialog(chat.chatInfo, chatModel, close) },
      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
      switchContactAddress = {
        showSwitchContactAddressAlert(chatModel, contact.contactId)
-      },
-      verifyClicked = {
-        ModalManager.shared.showModalCloseable { close ->
-          remember { derivedStateOf { (chatModel.getContactChat(contact.contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }.value?.let { ct ->
-            VerifyCodeView(
-              ct.displayName,
-              connectionCode,
-              ct.verified,
-              verify = { code ->
-                chatModel.controller.apiVerifyContact(ct.contactId, code)?.let { r ->
-                  val (verified, existingCode) = r
-                  chatModel.updateContact(
-                    ct.copy(
-                      activeConn = ct.activeConn.copy(
-                        connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
-                      )
-                    )
-                  )
-                  r
-                }
-              },
-              close,
-            )
-          }
-        }
      }
    )
  }
@@ -153,17 +113,13 @@ fun ChatInfoLayout(
  chat: Chat,
  contact: Contact,
  connStats: ConnectionStats?,
-  contactNetworkStatus: NetworkStatus,
  customUserProfile: Profile?,
  localAlias: String,
-  connectionCode: String?,
  developerTools: Boolean,
  onLocalAliasChanged: (String) -> Unit,
-  openPreferences: () -> Unit,
  deleteContact: () -> Unit,
  clearChat: () -> Unit,
  switchContactAddress: () -> Unit,
-  verifyClicked: () -> Unit,
 ) {
  Column(
    Modifier
@@ -187,27 +143,20 @@ fun ChatInfoLayout(
      }
    }

-    SectionSpacer()
-    SectionView {
-      if (connectionCode != null) {
-        VerifyCodeButton(contact.verified, verifyClicked)
-        SectionDivider()
-      }
-      ContactPreferencesButton(openPreferences)
-    }
-
    SectionSpacer()

    SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchContactAddress)
-      SectionDivider()
+      if (developerTools) {
+        SwitchAddressButton(switchContactAddress)
+        SectionDivider()
+      }
      if (connStats != null) {
        SectionItemView({
          AlertManager.shared.showAlertMsg(
            generalGetString(R.string.network_status),
-            contactNetworkStatus.statusExplanation
+            chat.serverInfo.networkStatus.statusExplanation
          )}) {
-          NetworkStatusRow(contactNetworkStatus)
+          NetworkStatusRow(chat.serverInfo.networkStatus)
        }
        val rcvServers = connStats.rcvServers
        if (rcvServers != null && rcvServers.isNotEmpty()) {
@@ -247,17 +196,13 @@ fun ChatInfoHeader(cInfo: ChatInfo, contact: Contact) {
    horizontalAlignment = Alignment.CenterHorizontally
  ) {
    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Row(Modifier.padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) {
-      if (contact.verified) {
-        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = HighOrLowlight)
-      }
-      Text(
-        contact.profile.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-      )
-    }
+    Text(
+      contact.profile.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
+      color = MaterialTheme.colors.onBackground,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+      modifier = Modifier.padding(bottom = 8.dp)
+    )
    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName) {
      Text(
        cInfo.fullName, style = MaterialTheme.typography.h2,
@@ -319,7 +264,7 @@ fun LocalAliasEditor(
 }

@Composable
-private fun NetworkStatusRow(networkStatus: NetworkStatus) {
+fun NetworkStatusRow(networkStatus: Chat.NetworkStatus) {
  Row(
    Modifier.fillMaxSize(),
    horizontalArrangement = Arrangement.SpaceBetween,
@@ -351,14 +296,14 @@ private fun NetworkStatusRow(networkStatus: NetworkStatus) {
 }

@Composable
-private fun ServerImage(networkStatus: NetworkStatus) {
+fun ServerImage(networkStatus: Chat.NetworkStatus) {
  Box(Modifier.size(18.dp)) {
    when (networkStatus) {
-      is NetworkStatus.Connected ->
+      is Chat.NetworkStatus.Connected ->
        Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-      is NetworkStatus.Disconnected ->
+      is Chat.NetworkStatus.Disconnected ->
        Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
-      is NetworkStatus.Error ->
+      is Chat.NetworkStatus.Error ->
        Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
      else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
    }
@@ -382,25 +327,6 @@ fun SwitchAddressButton(onClick: () -> Unit) {
  }
 }

-@Composable
-fun VerifyCodeButton(contactVerified: Boolean, onClick: () -> Unit) {
-  SettingsActionItem(
-    if (contactVerified) Icons.Outlined.VerifiedUser else Icons.Outlined.Shield,
-    stringResource(if (contactVerified) R.string.view_security_code else R.string.verify_security_code),
-    click = onClick,
-    iconColor = HighOrLowlight,
-  )
-}
-
-@Composable
-private fun ContactPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.contact_preferences),
-    click = onClick
-  )
-}
-
@Composable
 fun ClearChatButton(onClick: () -> Unit) {
  SettingsActionItem(
@@ -413,7 +339,7 @@ fun ClearChatButton(onClick: () -> Unit) {
 }

@Composable
-private fun DeleteContactButton(onClick: () -> Unit) {
+fun DeleteContactButton(onClick: () -> Unit) {
  SettingsActionItem(
    Icons.Outlined.Delete,
    stringResource(R.string.button_delete_contact),
@@ -451,21 +377,18 @@ fun PreviewChatInfoLayout() {
    ChatInfoLayout(
      chat = Chat(
        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf()
+        chatItems = arrayListOf(),
+        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
      ),
      Contact.sampleData,
      localAlias = "",
-      connectionCode = "123",
      developerTools = false,
      connStats = null,
-      contactNetworkStatus = NetworkStatus.Connected(),
      onLocalAliasChanged = {},
      customUserProfile = null,
-      openPreferences = {},
      deleteContact = {},
      clearChat = {},
      switchContactAddress = {},
-      verifyClicked = {},
    )
  }
 }
@@ -3,7 +3,6 @@ package chat.simplex.app.views.chat
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.net.Uri
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.*
@@ -13,7 +12,8 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
@@ -56,13 +56,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
  val user = chatModel.currentUser.value
  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
  val composeState = rememberSaveable(saver = ComposeState.saver()) {
-    mutableStateOf(
-      if (chatModel.draftChatId.value == chatId && chatModel.draft.value != null) {
-        chatModel.draft.value ?: ComposeState(useLinkPreviews = useLinkPreviews)
-      } else {
-        ComposeState(useLinkPreviews = useLinkPreviews)
-      }
-    )
+    mutableStateOf(ComposeState(useLinkPreviews = useLinkPreviews))
  }
  val attachmentOption = rememberSaveable { mutableStateOf<AttachmentOption?>(null) }
  val attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
@@ -83,23 +77,16 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
        }
    }
    launch {
-      snapshotFlow {
-        /**
-         * It's possible that in some cases concurrent modification can happen on [ChatModel.chats] list.
-         * In this case only error log will be printed here (no crash).
-         * TODO: Re-write [ChatModel.chats] logic to a new list assignment instead of changing content of mutableList to prevent that
-         * */
-        try {
-          chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }
-        } catch (e: ConcurrentModificationException) {
-          Log.e(TAG, e.stackTraceToString())
-          null
-        }
-      }
+      // .toList() is important for making observation working
+      snapshotFlow { chatModel.chats.toList() }
        .distinctUntilChanged()
-        // Only changed chatInfo is important thing. Other properties can be skipped for reducing recompositions
-        .filter { it?.chatInfo != activeChat.value?.chatInfo && it != null }
-        .collect { activeChat.value = it }
+        .collect { chats ->
+          chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }.let {
+            // Only changed chatInfo is important thing. Other properties can be skipped for reducing recompositions
+            if (it?.chatInfo != activeChat.value?.chatInfo) {
+              activeChat.value = it
+          }}
+        }
    }
  }
  val view = LocalView.current
@@ -132,7 +119,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
      chatModel.chatItems,
      searchText,
      useLinkPreviews = useLinkPreviews,
-      linkMode = chatModel.simplexLinkMode.value,
      chatModelIncognito = chatModel.incognito.value,
      back = {
        hideKeyboard(view)
@@ -142,24 +128,16 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
      info = {
        hideKeyboard(view)
        withApi {
-          if (chat.chatInfo is ChatInfo.Direct) {
-            val contactInfo = chatModel.controller.apiContactInfo(chat.chatInfo.apiId)
-            val (_, code) = chatModel.controller.apiGetContactCode(chat.chatInfo.apiId)
+          val cInfo = chat.chatInfo
+          if (cInfo is ChatInfo.Direct) {
+            val contactInfo = chatModel.controller.apiContactInfo(cInfo.apiId)
            ModalManager.shared.showModalCloseable(true) { close ->
-              remember { derivedStateOf { (chatModel.getContactChat(chat.chatInfo.apiId)?.chatInfo as? ChatInfo.Direct)?.contact } }.value?.let { ct ->
-                ChatInfoView(chatModel, ct, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
-              }
+              ChatInfoView(chatModel, cInfo.contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, close)
            }
-          } else if (chat.chatInfo is ChatInfo.Group) {
-            setGroupMembers(chat.chatInfo.groupInfo, chatModel)
-            val link = chatModel.controller.apiGetGroupLink(chat.chatInfo.groupInfo.groupId)
-            var groupLink = link?.first
-            var groupLinkMemberRole = link?.second
+          } else if (cInfo is ChatInfo.Group) {
+            setGroupMembers(cInfo.groupInfo, chatModel)
            ModalManager.shared.showModalCloseable(true) { close ->
-              GroupChatInfoView(chatModel, groupLink, groupLinkMemberRole, {
-                groupLink = it.first;
-                groupLinkMemberRole = it.second
-              }, close)
+              GroupChatInfoView(chatModel, close)
            }
          }
        }
@@ -168,21 +146,8 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
        hideKeyboard(view)
        withApi {
          val stats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
-          val (_, code) = if (member.memberActive) {
-            try {
-              chatModel.controller.apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId)
-            } catch (e: Exception) {
-              Log.e(TAG, e.stackTraceToString())
-              member to null
-            }
-          } else {
-            member to null
-          }
-          setGroupMembers(groupInfo, chatModel)
          ModalManager.shared.showModalCloseable(true) { close ->
-            remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-              GroupMemberInfoView(groupInfo, mem, stats, code, chatModel, close, close)
-            }
+            GroupMemberInfoView(groupInfo, member, stats, chatModel, close, close)
          }
        }
      },
@@ -198,42 +163,17 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
      deleteMessage = { itemId, mode ->
        withApi {
          val cInfo = chat.chatInfo
-          val toDeleteItem = chatModel.chatItems.firstOrNull { it.id == itemId }
-          val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
-          val groupInfo = toModerate?.first
-          val groupMember = toModerate?.second
-          val deletedChatItem: ChatItem?
-          val toChatItem: ChatItem?
-          if (mode == CIDeleteMode.cidmBroadcast && groupInfo != null && groupMember != null) {
-            val r = chatModel.controller.apiDeleteMemberChatItem(
-              groupId = groupInfo.groupId,
-              groupMemberId = groupMember.groupMemberId,
-              itemId = itemId
-            )
-            deletedChatItem = r?.first
-            toChatItem = r?.second
-          } else {
-            val r = chatModel.controller.apiDeleteChatItem(
-              type = cInfo.chatType,
-              id = cInfo.apiId,
-              itemId = itemId,
-              mode = mode
-            )
-            deletedChatItem = r?.deletedChatItem?.chatItem
-            toChatItem = r?.toChatItem?.chatItem
-          }
-          if (toChatItem == null && deletedChatItem != null) {
-            chatModel.removeChatItem(cInfo, deletedChatItem)
-          } else if (toChatItem != null) {
-            chatModel.upsertChatItem(cInfo, toChatItem)
-          }
+          val toItem = chatModel.controller.apiDeleteChatItem(
+            type = cInfo.chatType,
+            id = cInfo.apiId,
+            itemId = itemId,
+            mode = mode
+          )
+          if (toItem != null) chatModel.removeChatItem(cInfo, toItem.chatItem)
        }
      },
      receiveFile = { fileId ->
-        val user = chatModel.currentUser.value
-        if (user != null) {
-          withApi { chatModel.controller.receiveFile(user, fileId) }
-        }
+        withApi { chatModel.controller.receiveFile(fileId) }
      },
      joinGroup = { groupId ->
        withApi { chatModel.controller.apiJoinGroup(groupId) }
@@ -255,24 +195,19 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
          chatModel.callManager.acceptIncomingCall(invitation = invitation)
        }
      },
-      acceptFeature = { contact, feature, param ->
-        withApi {
-          chatModel.controller.allowFeatureToContact(contact, feature, param)
-        }
-      },
      addMembers = { groupInfo ->
        hideKeyboard(view)
        withApi {
          setGroupMembers(groupInfo, chatModel)
          ModalManager.shared.showModalCloseable(true) { close ->
-              AddGroupMembersView(groupInfo, false, chatModel, close)
+              AddGroupMembersView(groupInfo, chatModel, close)
          }
        }
      },
      markRead = { range, unreadCountAfter ->
        chatModel.markChatItemsRead(chat.chatInfo, range, unreadCountAfter)
        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
-        withBGApi {
+        withApi {
          chatModel.controller.apiChatRead(
            chat.chatInfo.chatType,
            chat.chatInfo.apiId,
@@ -305,7 +240,6 @@ fun ChatLayout(
  chatItems: List<ChatItem>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
-  linkMode: SimplexLinkMode,
  chatModelIncognito: Boolean,
  back: () -> Unit,
  info: () -> Unit,
@@ -316,7 +250,6 @@ fun ChatLayout(
  joinGroup: (Long) -> Unit,
  startCall: (CallMediaType) -> Unit,
  acceptCall: (Contact) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
  addMembers: (GroupInfo) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
@@ -356,8 +289,8 @@ fun ChatLayout(
          BoxWithConstraints(Modifier.fillMaxHeight().padding(contentPadding)) {
            ChatItemsList(
              chat, unreadCount, composeState, chatItems, searchValue,
-              useLinkPreviews, linkMode, chatModelIncognito, showMemberInfo, loadPrevMessages, deleteMessage,
-              receiveFile, joinGroup, acceptCall, acceptFeature, markRead, setFloatingButton, onComposed,
+              useLinkPreviews, chatModelIncognito, showMemberInfo, loadPrevMessages, deleteMessage,
+              receiveFile, joinGroup, acceptCall, markRead, setFloatingButton, onComposed,
            )
          }
        }
@@ -480,15 +413,10 @@ fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Colo
      Modifier.padding(start = 8.dp),
      horizontalAlignment = Alignment.CenterHorizontally
    ) {
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        if ((cInfo as? ChatInfo.Direct)?.contact?.verified == true) {
-          ContactVerifiedShield()
-        }
-        Text(
-          cInfo.displayName, fontWeight = FontWeight.SemiBold,
-          maxLines = 1, overflow = TextOverflow.Ellipsis
-        )
-      }
+      Text(
+        cInfo.displayName, fontWeight = FontWeight.SemiBold,
+        maxLines = 1, overflow = TextOverflow.Ellipsis
+      )
      if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.localAlias.isEmpty()) {
        Text(
          cInfo.fullName,
@@ -499,11 +427,6 @@ fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Colo
  }
 }

-@Composable
-private fun ContactVerifiedShield() {
-  Icon(Icons.Outlined.VerifiedUser, null, Modifier.size(18.dp).padding(end = 3.dp, top = 1.dp), tint = HighOrLowlight)
-}
-
 data class CIListState(val scrolled: Boolean, val itemCount: Int, val keyboardState: KeyboardState)

 val CIListStateSaver = run {
@@ -524,7 +447,6 @@ fun BoxWithConstraintsScope.ChatItemsList(
  chatItems: List<ChatItem>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
-  linkMode: SimplexLinkMode,
  chatModelIncognito: Boolean,
  showMemberInfo: (GroupInfo, GroupMember) -> Unit,
  loadPrevMessages: (ChatInfo) -> Unit,
@@ -532,14 +454,13 @@ fun BoxWithConstraintsScope.ChatItemsList(
  receiveFile: (Long) -> Unit,
  joinGroup: (Long) -> Unit,
  acceptCall: (Contact) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
  setFloatingButton: (@Composable () -> Unit) -> Unit,
  onComposed: () -> Unit,
 ) {
  val listState = rememberLazyListState()
  val scope = rememberCoroutineScope()
-  ScrollToBottom(chat.id, listState, chatItems)
+  ScrollToBottom(chat.id, listState)
  var prevSearchEmptiness by rememberSaveable { mutableStateOf(searchValue.value.isEmpty()) }
  // Scroll to bottom when search value changes from something to nothing and back
  LaunchedEffect(searchValue.value.isEmpty()) {
@@ -558,7 +479,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
  }

  Spacer(Modifier.size(8.dp))
-  val reversedChatItems by remember { derivedStateOf { chatItems.reversed().toList() } }
+  val reversedChatItems by remember { derivedStateOf { chatItems.reversed() } }
  val maxHeightRounded = with(LocalDensity.current) { maxHeight.roundToPx() }
  val scrollToItem: (Long) -> Unit = { itemId: Long ->
    val index = reversedChatItems.indexOfFirst { it.id == itemId }
@@ -577,7 +498,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
      }
  }
  LazyColumn(Modifier.align(Alignment.BottomCenter), state = listState, reverseLayout = true) {
-    itemsIndexed(reversedChatItems, key = { _, item -> item.id}) { i, cItem ->
+    itemsIndexed(reversedChatItems) { i, cItem ->
      CompositionLocalProvider(
        // Makes horizontal and vertical scrolling to coexist nicely.
        // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
@@ -597,7 +518,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
            scope.launch {
              if (composeState.value.editing) {
                composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-              } else if (cItem.id != ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+              } else {
                composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
              }
            }
@@ -638,11 +559,11 @@ fun BoxWithConstraintsScope.ChatItemsList(
              } else {
                Spacer(Modifier.size(42.dp))
              }
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, scrollToItem = scrollToItem)
            }
          } else {
            Box(Modifier.padding(start = 104.dp, end = 12.dp).then(swipeableModifier)) {
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall, scrollToItem = scrollToItem)
            }
          }
        } else { // direct message
@@ -653,7 +574,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
              end = if (sent) 12.dp else 76.dp,
            ).then(swipeableModifier)
          ) {
-            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = joinGroup, acceptCall = acceptCall, scrollToItem = scrollToItem)
          }
        }

@@ -672,7 +593,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
 }

@Composable
-private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems: List<ChatItem>) {
+private fun ScrollToBottom(chatId: ChatId, listState: LazyListState) {
  val scope = rememberCoroutineScope()
  // Helps to scroll to bottom after moving from Group to Direct chat
  // and prevents scrolling to bottom on orientation change
@@ -684,31 +605,6 @@ private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems:
    // Don't autoscroll next time until it will be needed
    shouldAutoScroll = false to chatId
  }
-  val scrollDistance = with(LocalDensity.current) { -39.dp.toPx() }
-  /*
-  * Since we use key with each item in LazyColumn, LazyColumn will not autoscroll to bottom item. We need to do it ourselves.
-  * When the first visible item (from bottom) is visible (even partially) we can autoscroll to 0 item. Or just scrollBy small distance otherwise
-  * */
-  LaunchedEffect(Unit) {
-    snapshotFlow { chatItems.lastOrNull()?.id }
-      .distinctUntilChanged()
-      .filter { listState.layoutInfo.visibleItemsInfo.firstOrNull()?.key != it }
-      .collect {
-        try {
-          if (listState.firstVisibleItemIndex == 0) {
-            listState.animateScrollToItem(0)
-          } else {
-            listState.animateScrollBy(scrollDistance)
-          }
-        } catch (e: CancellationException) {
-          /**
-           * When you tap and hold a finger on a lazy column with chatItems, and then you receive a message,
-           * this coroutine will be canceled with the message "Current mutation had a higher priority" because of animatedScroll.
-           * Which breaks auto-scrolling to bottom. So just ignoring the exception
-           * */
-        }
-      }
-  }
 }

@Composable
@@ -1052,7 +948,6 @@ fun PreviewChatLayout() {
      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1063,7 +958,6 @@ fun PreviewChatLayout() {
      joinGroup = {},
      startCall = {},
      acceptCall = { _ -> },
-      acceptFeature = { _, _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
@@ -1111,7 +1005,6 @@ fun PreviewGroupChatLayout() {
      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1122,7 +1015,6 @@ fun PreviewGroupChatLayout() {
      joinGroup = {},
      startCall = {},
      acceptCall = { _ -> },
-      acceptFeature = { _, _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
@@ -1,22 +1,20 @@
-@file:UseSerializers(UriSerializer::class)
 package chat.simplex.app.views.chat

-import ComposeFileView
 import ComposeVoiceView
+import ComposeFileView
 import android.Manifest
-import android.app.Activity
 import android.content.*
 import android.content.pm.PackageManager
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.ImageDecoder
+import android.graphics.ImageDecoder.DecodeException
 import android.graphics.drawable.AnimatedImageDrawable
 import android.net.Uri
-import android.os.Build
 import android.provider.MediaStore
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
@@ -32,29 +30,29 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.core.net.toFile
+import androidx.core.net.toUri
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.views.chat.item.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.serialization.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
 import java.io.File
-import java.nio.file.Files

@Serializable
 sealed class ComposePreview {
  @Serializable object NoPreview: ComposePreview()
  @Serializable class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
-  @Serializable class ImagePreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
-  @Serializable data class VoicePreview(val voice: String, val durationMs: Int, val finished: Boolean): ComposePreview()
-  @Serializable class FilePreview(val fileName: String, val uri: Uri): ComposePreview()
+  @Serializable class ImagePreview(val images: List<String>): ComposePreview()
+  @Serializable class VoicePreview(val voice: String, val durationMs: Int, val finished: Boolean): ComposePreview()
+  @Serializable class FilePreview(val fileName: String): ComposePreview()
 }

@Serializable
@@ -64,26 +62,16 @@ sealed class ComposeContextItem {
  @Serializable class EditingItem(val chatItem: ChatItem): ComposeContextItem()
 }

-@Serializable
-data class LiveMessage(
-  val chatItem: ChatItem,
-  val typedMsg: String,
-  val sentMsg: String,
-  val sent: Boolean
-)
-
@Serializable
 data class ComposeState(
  val message: String = "",
-  val liveMessage: LiveMessage? = null,
  val preview: ComposePreview = ComposePreview.NoPreview,
  val contextItem: ComposeContextItem = ComposeContextItem.NoContextItem,
  val inProgress: Boolean = false,
  val useLinkPreviews: Boolean
 ) {
-  constructor(editingItem: ChatItem, liveMessage: LiveMessage? = null, useLinkPreviews: Boolean): this(
+  constructor(editingItem: ChatItem, useLinkPreviews: Boolean): this(
    editingItem.content.text,
-    liveMessage,
    chatItemPreview(editingItem),
    ComposeContextItem.EditingItem(editingItem),
    useLinkPreviews = useLinkPreviews
@@ -101,13 +89,10 @@ data class ComposeState(
        is ComposePreview.ImagePreview -> true
        is ComposePreview.VoicePreview -> true
        is ComposePreview.FilePreview -> true
-        else -> message.isNotEmpty() || liveMessage != null
+        else -> message.isNotEmpty()
      }
      hasContent && !inProgress
    }
-  val endLiveDisabled: Boolean
-    get() = liveMessage != null && message.isEmpty() && preview is ComposePreview.NoPreview && contextItem is ComposeContextItem.NoContextItem
-
  val linkPreviewAllowed: Boolean
    get() =
      when (preview) {
@@ -123,19 +108,6 @@ data class ComposeState(
        else -> null
      }

-  val attachmentDisabled: Boolean
-    get() {
-      if (editing || liveMessage != null) return true
-      return when (preview) {
-        ComposePreview.NoPreview -> false
-        is ComposePreview.CLinkPreview -> false
-        else -> true
-      }
-    }
-
-  val empty: Boolean
-    get() = message.isEmpty() && preview is ComposePreview.NoPreview
-
  companion object {
    fun saver(): Saver<MutableState<ComposeState>, *> = Saver(
      save = { json.encodeToString(serializer(), it.value) },
@@ -146,24 +118,16 @@ data class ComposeState(
  }
 }

-sealed class RecordingState {
-  object NotStarted: RecordingState()
-  class Started(val filePath: String, val progressMs: Int = 0): RecordingState()
-  class Finished(val filePath: String, val durationMs: Int): RecordingState()
-
-  val filePathNullable: String?
-    get() = (this as? Started)?.filePath
-}
-
 fun chatItemPreview(chatItem: ChatItem): ComposePreview {
-  val fileName = chatItem.file?.fileName ?: ""
  return when (val mc = chatItem.content.msgContent) {
    is MsgContent.MCText -> ComposePreview.NoPreview
    is MsgContent.MCLink -> ComposePreview.CLinkPreview(linkPreview = mc.preview)
-    // TODO: include correct type
-    is MsgContent.MCImage -> ComposePreview.ImagePreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
-    is MsgContent.MCVoice -> ComposePreview.VoicePreview(voice = fileName, mc.duration / 1000, true)
-    is MsgContent.MCFile -> ComposePreview.FilePreview(fileName, getAppFileUri(fileName))
+    is MsgContent.MCImage -> ComposePreview.ImagePreview(images = listOf(mc.image))
+    is MsgContent.MCVoice -> ComposePreview.VoicePreview(voice = chatItem.file?.fileName ?: "", mc.duration / 1000, true)
+    is MsgContent.MCFile -> {
+      val fileName = chatItem.file?.fileName ?: ""
+      ComposePreview.FilePreview(fileName)
+    }
    is MsgContent.MCUnknown, null -> ComposePreview.NoPreview
  }
 }
@@ -184,18 +148,26 @@ fun ComposeView(
  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
  val textStyle = remember { mutableStateOf(smallFont) }
+  // attachments
+  val chosenContent = rememberSaveable { mutableStateOf<List<UploadContent>>(emptyList()) }
+  val audioSaver = Saver<MutableState<Pair<Uri, Int>?>, Pair<String, Int>> (
+    save = { it.value.let { if (it == null) null else it.first.toString() to it.second } },
+    restore = { mutableStateOf(Uri.parse(it.first) to it.second) }
+  )
+  val chosenAudio = rememberSaveable(saver = audioSaver) { mutableStateOf(null) }
+  val chosenFile = rememberSaveable { mutableStateOf<Uri?>(null) }
  val cameraLauncher = rememberCameraLauncher { uri: Uri? ->
    if (uri != null) {
-      val bitmap: Bitmap? = getBitmapFromUri(uri)
-      if (bitmap != null) {
-        val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-        composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
-      }
+      val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
+      chosenContent.value = listOf(UploadContent.SimpleImage(uri))
+      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview)))
    }
  }
  val cameraPermissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
    if (isGranted) {
-      cameraLauncher.launchWithFallback()
+      cameraLauncher.launch(null)
    } else {
      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
    }
@@ -204,12 +176,19 @@ fun ComposeView(
    val content = ArrayList<UploadContent>()
    val imagesPreview = ArrayList<String>()
    uris.forEach { uri ->
-      val drawable = getDrawableFromUri(uri)
-      var bitmap: Bitmap? = if (drawable != null) getBitmapFromUri(uri) else null
-      val isAnimNewApi = Build.VERSION.SDK_INT >= 28 && drawable is AnimatedImageDrawable
-      val isAnimOldApi = Build.VERSION.SDK_INT < 28 &&
-          (getFileName(SimplexApp.context, uri)?.endsWith(".gif") == true || getFileName(SimplexApp.context, uri)?.endsWith(".webp") == true)
-      if (isAnimNewApi || isAnimOldApi) {
+      val source = ImageDecoder.createSource(context.contentResolver, uri)
+      val drawable = try {
+        ImageDecoder.decodeDrawable(source)
+      } catch (e: DecodeException) {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.image_decoding_exception_title),
+          text = generalGetString(R.string.image_decoding_exception_desc)
+        )
+        Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
+        null
+      }
+      var bitmap: Bitmap? = if (drawable != null) ImageDecoder.decodeBitmap(source) else null
+      if (drawable is AnimatedImageDrawable) {
        // It's a gif or webp
        val fileSize = getFileSize(context, uri)
        if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
@@ -230,7 +209,8 @@ fun ComposeView(
    }

    if (imagesPreview.isNotEmpty()) {
-      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.ImagePreview(imagesPreview, content))
+      chosenContent.value = content
+      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.ImagePreview(imagesPreview))
    }
  }
  val processPickedFile = { uri: Uri?, text: String? ->
@@ -239,7 +219,8 @@ fun ComposeView(
      if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
        val fileName = getFileName(SimplexApp.context, uri)
        if (fileName != null) {
-          composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.FilePreview(fileName, uri))
+          chosenFile.value = uri
+          composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.FilePreview(fileName))
        }
      } else {
        AlertManager.shared.showAlertMsg(
@@ -252,14 +233,13 @@ fun ComposeView(
  val galleryLauncher = rememberLauncherForActivityResult(contract = PickMultipleFromGallery()) { processPickedImage(it, null) }
  val galleryLauncherFallback = rememberGetMultipleContentsLauncher { processPickedImage(it, null) }
  val filesLauncher = rememberGetContentLauncher { processPickedFile(it, null) }
-  val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }

  LaunchedEffect(attachmentOption.value) {
    when (attachmentOption.value) {
      AttachmentOption.TakePhoto -> {
        when (PackageManager.PERMISSION_GRANTED) {
          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
-            cameraLauncher.launchWithFallback()
+            cameraLauncher.launch(null)
          }
          else -> {
            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
@@ -330,160 +310,128 @@ fun ComposeView(
    cancelledLinks.clear()
  }

-  fun clearState(live: Boolean = false) {
-    if (live) {
-      composeState.value = composeState.value.copy(inProgress = false)
-    } else {
-      composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
-      resetLinkPreview()
-    }
-    recState.value = RecordingState.NotStarted
-    textStyle.value = smallFont
-    chatModel.removeLiveDummy()
-  }
-
-  fun deleteUnusedFiles() {
-    chatModel.filesToDelete.forEach { it.delete() }
-    chatModel.filesToDelete.clear()
-  }
-
-  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false): ChatItem? {
-    val aChatItem = chatModel.controller.apiSendMessage(
-      type = cInfo.chatType,
-      id = cInfo.apiId,
-      file = file,
-      quotedItemId = quoted,
-      mc = mc,
-      live = live
-    )
-    if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
-    return aChatItem?.chatItem
-  }
-
-
-
-  suspend fun sendMessageAsync(text: String?, live: Boolean): ChatItem? {
-    val cInfo = chat.chatInfo
+  fun checkLinkPreview(): MsgContent {
    val cs = composeState.value
-    var sent: ChatItem?
-    val msgText = text ?: cs.message
-
-    fun sending() {
-      composeState.value = composeState.value.copy(inProgress = true)
-    }
-
-    fun checkLinkPreview(): MsgContent {
-      return when (val composePreview = cs.preview) {
-        is ComposePreview.CLinkPreview -> {
-          val url = parseMessage(msgText)
-          val lp = composePreview.linkPreview
-          if (lp != null && url == lp.uri) {
-            MsgContent.MCLink(msgText, preview = lp)
-          } else {
-            MsgContent.MCText(msgText)
-          }
-        }
-        else -> MsgContent.MCText(msgText)
-      }
-    }
-
-    fun updateMsgContent(msgContent: MsgContent): MsgContent {
-      return when (msgContent) {
-        is MsgContent.MCText -> checkLinkPreview()
-        is MsgContent.MCLink -> checkLinkPreview()
-        is MsgContent.MCImage -> MsgContent.MCImage(msgText, image = msgContent.image)
-        is MsgContent.MCVoice -> MsgContent.MCVoice(msgText, duration = msgContent.duration)
-        is MsgContent.MCFile -> MsgContent.MCFile(msgText)
-        is MsgContent.MCUnknown -> MsgContent.MCUnknown(type = msgContent.type, text = msgText, json = msgContent.json)
-      }
-    }
-
-    suspend fun updateMessage(ei: ChatItem, cInfo: ChatInfo, live: Boolean): ChatItem? {
-      val oldMsgContent = ei.content.msgContent
-      if (oldMsgContent != null) {
-        val updatedItem = chatModel.controller.apiUpdateChatItem(
-          type = cInfo.chatType,
-          id = cInfo.apiId,
-          itemId = ei.meta.itemId,
-          mc = updateMsgContent(oldMsgContent),
-          live = live
-        )
-        if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
-        return updatedItem?.chatItem
-      }
-      return null
-    }
-
-    val liveMessage = cs.liveMessage
-    if (!live) {
-      if (liveMessage != null) composeState.value = cs.copy(liveMessage = null)
-      sending()
-    }
-
-    if (cs.contextItem is ComposeContextItem.EditingItem) {
-      val ei = cs.contextItem.chatItem
-      sent = updateMessage(ei, cInfo, live)
-    } else if (liveMessage != null && liveMessage.sent) {
-      sent = updateMessage(liveMessage.chatItem, cInfo, live)
-    } else {
-      val msgs: ArrayList<MsgContent> = ArrayList()
-      val files: ArrayList<String> = ArrayList()
-      when (val preview = cs.preview) {
-        ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(msgText))
-        is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
-        is ComposePreview.ImagePreview -> {
-          preview.content.forEachIndexed { index, it ->
-            val file = when (it) {
-              is UploadContent.SimpleImage -> saveImage(context, it.uri)
-              is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
-            }
-            if (file != null) {
-              files.add(file)
-              msgs.add(MsgContent.MCImage(if (preview.content.lastIndex == index) msgText else "", preview.images[index]))
-            }
-          }
-        }
-        is ComposePreview.VoicePreview -> {
-          val tmpFile = File(preview.voice)
-          AudioPlayer.stop(tmpFile.absolutePath)
-          val actualFile = File(getAppFilePath(SimplexApp.context, tmpFile.name.replaceAfter(RecorderNative.extension, "")))
-          withContext(Dispatchers.IO) {
-            Files.move(tmpFile.toPath(), actualFile.toPath())
-          }
-          files.add(actualFile.name)
-          deleteUnusedFiles()
-          msgs.add(MsgContent.MCVoice(if (msgs.isEmpty()) msgText else "", preview.durationMs / 1000))
-        }
-        is ComposePreview.FilePreview -> {
-          val file = saveFileFromUri(context, preview.uri)
-          if (file != null) {
-            files.add((file))
-            msgs.add(MsgContent.MCFile(if (msgs.isEmpty()) msgText else ""))
-          }
+    return when (val composePreview = cs.preview) {
+      is ComposePreview.CLinkPreview -> {
+        val url = parseMessage(cs.message)
+        val lp = composePreview.linkPreview
+        if (lp != null && url == lp.uri) {
+          MsgContent.MCLink(cs.message, preview = lp)
+        } else {
+          MsgContent.MCText(cs.message)
        }
      }
-      val quotedItemId: Long? = when (cs.contextItem) {
-        is ComposeContextItem.QuotedItem -> cs.contextItem.chatItem.id
-        else -> null
-      }
-      sent = null
-      msgs.forEachIndexed { index, content ->
-        if (index > 0) delay(100)
-        sent = send(cInfo, content, if (index == 0) quotedItemId else null, files.getOrNull(index),
-          if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false
-        )
-      }
-      if (sent == null && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.FilePreview || cs.preview is ComposePreview.VoicePreview)) {
-        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live)
-      }
+      else -> MsgContent.MCText(cs.message)
    }
-    clearState(live)
-    return sent
+  }
+
+  fun updateMsgContent(msgContent: MsgContent): MsgContent {
+    val cs = composeState.value
+    return when (msgContent) {
+      is MsgContent.MCText -> checkLinkPreview()
+      is MsgContent.MCLink -> checkLinkPreview()
+      is MsgContent.MCImage -> MsgContent.MCImage(cs.message, image = msgContent.image)
+      is MsgContent.MCVoice -> MsgContent.MCVoice(cs.message, duration = msgContent.duration)
+      is MsgContent.MCFile -> MsgContent.MCFile(cs.message)
+      is MsgContent.MCUnknown -> MsgContent.MCUnknown(type = msgContent.type, text = cs.message, json = msgContent.json)
+    }
+  }
+
+  fun clearState() {
+    composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
+    textStyle.value = smallFont
+    chosenContent.value = emptyList()
+    chosenAudio.value = null
+    chosenFile.value = null
+    linkUrl.value = null
+    prevLinkUrl.value = null
+    pendingLinkUrl.value = null
+    cancelledLinks.clear()
  }

  fun sendMessage() {
-    withBGApi {
-      sendMessageAsync(null, false)
+    composeState.value = composeState.value.copy(inProgress = true)
+    val cInfo = chat.chatInfo
+    val cs = composeState.value
+    when (val contextItem = cs.contextItem) {
+      is ComposeContextItem.EditingItem -> {
+        val ei = contextItem.chatItem
+        val oldMsgContent = ei.content.msgContent
+        if (oldMsgContent != null) {
+          withApi {
+            val updatedItem = chatModel.controller.apiUpdateChatItem(
+              type = cInfo.chatType,
+              id = cInfo.apiId,
+              itemId = ei.meta.itemId,
+              mc = updateMsgContent(oldMsgContent)
+            )
+            if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
+            clearState()
+          }
+        }
+      }
+      else -> {
+        val msgs: ArrayList<MsgContent> = ArrayList()
+        val files: ArrayList<String> = ArrayList()
+        when (val preview = cs.preview) {
+          ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(cs.message))
+          is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
+          is ComposePreview.ImagePreview -> {
+            chosenContent.value.forEachIndexed { index, it ->
+              val file = when (it) {
+                is UploadContent.SimpleImage -> saveImage(context, it.uri)
+                is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
+              }
+              if (file != null) {
+                files.add(file)
+                msgs.add(MsgContent.MCImage(if (msgs.isEmpty()) cs.message else "", preview.images[index]))
+              }
+            }
+          }
+          is ComposePreview.VoicePreview -> {
+            val chosenAudioVal = chosenAudio.value
+            if (chosenAudioVal != null) {
+              val file = chosenAudioVal.first.toFile().name
+              files.add((file))
+              chatModel.filesToDelete.remove(chosenAudioVal.first.toFile())
+              msgs.add(MsgContent.MCVoice(if (msgs.isEmpty()) cs.message else "", chosenAudioVal.second / 1000))
+            }
+          }
+          is ComposePreview.FilePreview -> {
+            val chosenFileVal = chosenFile.value
+            if (chosenFileVal != null) {
+              val file = saveFileFromUri(context, chosenFileVal)
+              if (file != null) {
+                files.add((file))
+                msgs.add(MsgContent.MCFile(if (msgs.isEmpty()) cs.message else ""))
+              }
+            }
+          }
+        }
+        val quotedItemId: Long? = when (contextItem) {
+          is ComposeContextItem.QuotedItem -> contextItem.chatItem.id
+          else -> null
+        }
+        if (msgs.isNotEmpty()) {
+          withApi {
+            msgs.forEachIndexed { index, content ->
+              if (index > 0) delay(100)
+              val aChatItem = chatModel.controller.apiSendMessage(
+                type = cInfo.chatType,
+                id = cInfo.apiId,
+                file = files.getOrNull(index),
+                quotedItemId = if (index == 0) quotedItemId else null,
+                mc = content
+              )
+              if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
+            }
+            clearState()
+          }
+        } else {
+          clearState()
+        }
+      }
    }
  }

@@ -502,17 +450,11 @@ fun ComposeView(

  fun onAudioAdded(filePath: String, durationMs: Int, finished: Boolean) {
    val file = File(filePath)
+    chosenAudio.value = file.toUri() to durationMs
    chatModel.filesToDelete.add(file)
    composeState.value = composeState.value.copy(preview = ComposePreview.VoicePreview(filePath, durationMs, finished))
  }

-  fun allowVoiceToContact() {
-    val contact = (chat.chatInfo as ChatInfo.Direct?)?.contact ?: return
-    withApi {
-      chatModel.controller.allowFeatureToContact(contact, ChatFeature.Voice)
-    }
-  }
-
  fun cancelLinkPreview() {
    val uri = composeState.value.linkPreview?.uri
    if (uri != null) {
@@ -524,70 +466,17 @@ fun ComposeView(

  fun cancelImages() {
    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
+    chosenContent.value = emptyList()
  }

  fun cancelVoice() {
-    val filePath = recState.value.filePathNullable
-    recState.value = RecordingState.NotStarted
    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-    withBGApi {
-      RecorderNative.stopRecording?.invoke()
-      AudioPlayer.stop(filePath)
-      filePath?.let { File(it).delete() }
-    }
+    chosenContent.value = emptyList()
  }

  fun cancelFile() {
    composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
-  }
-
-  fun truncateToWords(s: String): String {
-    var acc = ""
-    val word = StringBuilder()
-    for (c in s) {
-      if (c.isLetter() || c.isDigit()) {
-        word.append(c)
-      } else {
-        acc = acc + word.toString() + c
-        word.clear()
-      }
-    }
-    return acc
-  }
-
-  suspend fun sendLiveMessage() {
-    val cs = composeState.value
-    val typedMsg = cs.message
-    if ((cs.sendEnabled() || cs.contextItem is ComposeContextItem.QuotedItem) && (cs.liveMessage == null || !cs.liveMessage?.sent)) {
-      val ci = sendMessageAsync(typedMsg, live = true)
-      if (ci != null) {
-        composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = typedMsg, sent = true))
-      }
-    } else if (cs.liveMessage == null) {
-      val cItem = chatModel.addLiveDummy(chat.chatInfo)
-      composeState.value = composeState.value.copy(liveMessage = LiveMessage(cItem, typedMsg = typedMsg, sentMsg = typedMsg, sent = false))
-    }
-  }
-
-  fun liveMessageToSend(lm: LiveMessage, t: String): String? {
-    val s = if (t != lm.typedMsg) truncateToWords(t) else t
-    return if (s != lm.sentMsg) s else null
-  }
-
-  suspend fun updateLiveMessage() {
-    val typedMsg = composeState.value.message
-    val liveMessage = composeState.value.liveMessage
-    if (liveMessage != null) {
-      val sentMsg = liveMessageToSend(liveMessage, typedMsg)
-      if (sentMsg != null) {
-        val ci = sendMessageAsync(sentMsg, live = true)
-        if (ci != null) {
-          composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = sentMsg, sent = true))
-        }
-      } else if (liveMessage.typedMsg != typedMsg) {
-        composeState.value = composeState.value.copy(liveMessage = liveMessage.copy(typedMsg = typedMsg))
-      }
-    }
+    chosenFile.value = null
  }

  @Composable
@@ -629,9 +518,6 @@ fun ComposeView(
  }

  LaunchedEffect(chatModel.sharedContent.value) {
-    // Important. If it's null, don't do anything, chat is not closed yet but will be after a moment
-    if (chatModel.chatId.value == null) return@LaunchedEffect
-
    when (val shared = chatModel.sharedContent.value) {
      is SharedContent.Text -> onMessageChange(shared.text)
      is SharedContent.Images -> processPickedImage(shared.uris, shared.text)
@@ -641,9 +527,6 @@ fun ComposeView(
    chatModel.sharedContent.value = null
  }

-  val userCanSend = rememberUpdatedState(chat.userCanSend)
-  val userIsObserver = rememberUpdatedState(chat.userIsObserver)
-
  Column {
    contextItemView()
    when {
@@ -655,104 +538,27 @@ fun ComposeView(
      modifier = Modifier.padding(end = 8.dp),
      verticalAlignment = Alignment.Bottom,
    ) {
-      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled && rememberUpdatedState(chat.userCanSend).value) {
+      val attachEnabled = !composeState.value.editing && composeState.value.preview !is ComposePreview.VoicePreview
+      IconButton(showChooseAttachment, enabled = attachEnabled) {
        Icon(
          Icons.Filled.AttachFile,
          contentDescription = stringResource(R.string.attach),
-          tint = if (!composeState.value.attachmentDisabled && userCanSend.value) MaterialTheme.colors.primary else HighOrLowlight,
+          tint = if (attachEnabled) MaterialTheme.colors.primary else HighOrLowlight,
          modifier = Modifier
            .size(28.dp)
            .clip(CircleShape)
        )
      }
-      val allowedVoiceByPrefs = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.Voice) }
-      LaunchedEffect(allowedVoiceByPrefs) {
-        if (!allowedVoiceByPrefs && composeState.value.preview is ComposePreview.VoicePreview) {
-          // Voice was disabled right when this user records it, just cancel it
-          cancelVoice()
-        }
-      }
-      val needToAllowVoiceToContact = remember(chat.chatInfo) {
-        chat.chatInfo is ChatInfo.Direct && with(chat.chatInfo.contact.mergedPreferences.voice) {
-          ((userPreference as? ContactUserPref.User)?.preference?.allow == FeatureAllowed.NO || (userPreference as? ContactUserPref.Contact)?.preference?.allow == FeatureAllowed.NO) &&
-              contactPreference.allow == FeatureAllowed.YES
-        }
-      }
-      LaunchedEffect(Unit) {
-        snapshotFlow { recState.value }
-          .distinctUntilChanged()
-          .collect {
-            when(it) {
-              is RecordingState.Started -> onAudioAdded(it.filePath, it.progressMs, false)
-              is RecordingState.Finished -> onAudioAdded(it.filePath, it.durationMs, true)
-              is RecordingState.NotStarted -> {}
-            }
-          }
-      }
-
-      fun clearCurrentDraft() {
-        if (chatModel.draftChatId.value == chat.id) {
-          chatModel.draft.value = null
-          chatModel.draftChatId.value = null
-        }
-      }
-
-      LaunchedEffect(rememberUpdatedState(chat.userCanSend).value) {
-        if (!chat.userCanSend) {
-          clearCurrentDraft()
-          clearState()
-        }
-      }
-
-      val activity = LocalContext.current as Activity
-      DisposableEffect(Unit) {
-        val orientation = activity.resources.configuration.orientation
-        onDispose {
-          if (orientation == activity.resources.configuration.orientation) {
-            val cs = composeState.value
-            if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
-              sendMessage()
-              resetLinkPreview()
-              clearCurrentDraft()
-              deleteUnusedFiles()
-            } else if (!composeState.value.empty) {
-              if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
-                composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
-              }
-              chatModel.draft.value = composeState.value
-              chatModel.draftChatId.value = chat.id
-            } else {
-              clearCurrentDraft()
-              deleteUnusedFiles()
-            }
-            chatModel.removeLiveDummy()
-          }
-        }
-      }
-
      SendMsgView(
        composeState,
-        showVoiceRecordIcon = true,
-        recState,
-        chat.chatInfo is ChatInfo.Direct,
-        liveMessageAlertShown = chatModel.controller.appPrefs.liveMessageAlertShown,
-        needToAllowVoiceToContact,
-        allowedVoiceByPrefs,
-        allowVoiceToContact = ::allowVoiceToContact,
-        userIsObserver = userIsObserver.value,
-        userCanSend = userCanSend.value,
+        allowVoiceRecord = true,
        sendMessage = {
          sendMessage()
          resetLinkPreview()
        },
-        sendLiveMessage = ::sendLiveMessage,
-        updateLiveMessage = ::updateLiveMessage,
-        cancelLiveMessage = {
-          composeState.value = composeState.value.copy(liveMessage = null)
-          chatModel.removeLiveDummy()
-        },
-        onMessageChange = ::onMessageChange,
-        textStyle = textStyle
+        ::onMessageChange,
+        ::onAudioAdded,
+        textStyle
      )
    }
  }
@@ -14,49 +14,42 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.model.durationText
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.item.AudioInfoUpdater
 import chat.simplex.app.views.chat.item.SentColorLight
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.flow.distinctUntilChanged

@Composable
-fun ComposeVoiceView(
-  filePath: String,
-  recordedDurationMs: Int,
-  finishedRecording: Boolean,
-  cancelEnabled: Boolean,
-  cancelVoice: () -> Unit
-) {
+fun ComposeVoiceView(filePath: String, durationMs: Int, finished: Boolean, cancelEnabled: Boolean, cancelVoice: () -> Unit) {
  BoxWithConstraints(Modifier
    .fillMaxWidth()
  ) {
    val audioPlaying = rememberSaveable { mutableStateOf(false) }
-    val progress = rememberSaveable { mutableStateOf(0) }
-    val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
+    val audioInfo = rememberSaveable(saver = ProgressAndDuration.Saver) {
+      mutableStateOf(ProgressAndDuration(durationMs = durationMs))
+    }
+    LaunchedEffect(durationMs) {
+      audioInfo.value = audioInfo.value.copy(durationMs = durationMs)
+    }
    val progressBarWidth = remember { Animatable(0f) }
-    LaunchedEffect(recordedDurationMs, finishedRecording) {
-      snapshotFlow { progress.value }
+    LaunchedEffect(durationMs, finished) {
+      snapshotFlow { audioInfo.value }
        .distinctUntilChanged()
        .collect {
-          val startTime = when {
-            finishedRecording -> progress.value
-            else -> recordedDurationMs
-          }
-          val endTime = when {
-            finishedRecording -> duration.value
-            audioPlaying.value -> recordedDurationMs
-            else -> MAX_VOICE_MILLIS_FOR_SENDING
-          }
-          val to = ((startTime.toDouble() / endTime) * maxWidth.value).dp
-          progressBarWidth.animateTo(to.value, audioProgressBarAnimationSpec())
+          val number = if (audioPlaying.value) audioInfo.value.progressMs else if (!finished) durationMs else 0
+          val new = if (audioPlaying.value || finished)
+            ((number.toDouble() / durationMs) * maxWidth.value).dp
+          else
+            (((number.toDouble()) / MAX_VOICE_MILLIS_FOR_SENDING) * maxWidth.value).dp
+          progressBarWidth.animateTo(new.value, audioProgressBarAnimationSpec())
        }
    }
    Spacer(
      Modifier
        .requiredWidth(progressBarWidth.value.dp)
        .padding(top = 58.dp)
-        .height(3.dp)
+        .height(2.dp)
        .background(MaterialTheme.colors.primary)
    )
    Row(
@@ -67,35 +60,33 @@ fun ComposeVoiceView(
        .background(SentColorLight),
      verticalAlignment = Alignment.CenterVertically
    ) {
-      IconButton(
-        onClick = {
-          if (!audioPlaying.value) {
-            AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
-          } else {
-            AudioPlayer.pause(audioPlaying, progress)
-          }
-        },
-        enabled = finishedRecording) {
+      val play = play@{
+        audioPlaying.value = AudioPlayer.start(filePath, audioInfo.value.progressMs) {
+          audioPlaying.value = false
+        }
+      }
+      val pause = {
+        audioInfo.value = ProgressAndDuration(AudioPlayer.pause(), audioInfo.value.durationMs)
+        audioPlaying.value = false
+      }
+      AudioInfoUpdater(filePath, audioPlaying, audioInfo)
+
+      IconButton({ if (!audioPlaying.value) play() else pause() }, enabled = finished) {
        Icon(
          if (audioPlaying.value) Icons.Filled.Pause else Icons.Filled.PlayArrow,
          stringResource(R.string.icon_descr_file),
          Modifier
            .padding(start = 4.dp, end = 2.dp)
            .size(36.dp),
-          tint = if (finishedRecording) MaterialTheme.colors.primary else HighOrLowlight
+          tint = if (finished) MaterialTheme.colors.primary else HighOrLowlight
        )
      }
-      val numberInText = remember(recordedDurationMs, progress.value) {
-        derivedStateOf {
-          when {
-            finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
-            finishedRecording -> progress.value / 1000
-            else -> recordedDurationMs / 1000
-          }
-        }
+      val numberInText = remember(durationMs, audioInfo.value) {
+        derivedStateOf { if (audioPlaying.value) audioInfo.value.progressMs / 1000 else durationMs / 1000 }
      }
+      val text = "%02d:%02d".format(numberInText.value / 60, numberInText.value % 60)
      Text(
-        durationText(numberInText.value),
+        text,
        fontSize = 18.sp,
        color = HighOrLowlight,
      )
@@ -1,232 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.PreferenceToggle
-
-@Composable
-fun ContactPreferencesView(
-  m: ChatModel,
-  user: User,
-  contactId: Long,
-  close: () -> Unit,
-) {
-  val contact = remember { derivedStateOf { (m.getContactChat(contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }
-  val ct = contact.value ?: return
-  var featuresAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(contactUserPrefsToFeaturesAllowed(ct.mergedPreferences)) }
-  var currentFeaturesAllowed by rememberSaveable(ct, stateSaver = serializableSaver()) { mutableStateOf(featuresAllowed) }
-
-  fun savePrefs(afterSave: () -> Unit = {}) {
-    withApi {
-      val prefs = contactFeaturesAllowedToPrefs(featuresAllowed)
-      val toContact = m.controller.apiSetContactPrefs(ct.contactId, prefs)
-      if (toContact != null) {
-        m.updateContact(toContact)
-        currentFeaturesAllowed = featuresAllowed
-      }
-      afterSave()
-    }
-  }
-  ModalView(
-    close = {
-      if (featuresAllowed == currentFeaturesAllowed) close()
-      else showUnsavedChangesAlert({ savePrefs(close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    ContactPreferencesLayout(
-      featuresAllowed,
-      currentFeaturesAllowed,
-      user,
-      ct,
-      applyPrefs = { prefs ->
-        featuresAllowed = prefs
-      },
-      reset = {
-        featuresAllowed = currentFeaturesAllowed
-      },
-      savePrefs = ::savePrefs,
-    )
-  }
-}
-
-@Composable
-private fun ContactPreferencesLayout(
-  featuresAllowed: ContactFeaturesAllowed,
-  currentFeaturesAllowed: ContactFeaturesAllowed,
-  user: User,
-  contact: Contact,
-  applyPrefs: (ContactFeaturesAllowed) -> Unit,
-  reset: () -> Unit,
-  savePrefs: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.contact_preferences))
-    val timedMessages: MutableState<Boolean> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.timedMessagesAllowed) }
-    val onTTLUpdated = { ttl: Int? ->
-      applyPrefs(featuresAllowed.copy(timedMessagesTTL = ttl ?: 86400))
-    }
-    TimedMessagesFeatureSection(featuresAllowed, contact.mergedPreferences.timedMessages, timedMessages, onTTLUpdated) { allowed, ttl ->
-      applyPrefs(featuresAllowed.copy(timedMessagesAllowed = allowed, timedMessagesTTL = ttl ?: currentFeaturesAllowed.timedMessagesTTL))
-    }
-    SectionSpacer()
-    val allowFullDeletion: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.fullDelete) }
-    FeatureSection(ChatFeature.FullDelete, user.fullPreferences.fullDelete.allow, contact.mergedPreferences.fullDelete, allowFullDeletion) {
-      applyPrefs(featuresAllowed.copy(fullDelete = it))
-    }
-    SectionSpacer()
-    val allowVoice: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.voice) }
-    FeatureSection(ChatFeature.Voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, allowVoice) {
-      applyPrefs(featuresAllowed.copy(voice = it))
-    }
-    SectionSpacer()
-    ResetSaveButtons(
-      reset = reset,
-      save = savePrefs,
-      disabled = featuresAllowed == currentFeaturesAllowed
-    )
-  }
-}
-
-@Composable
-private fun FeatureSection(
-  feature: ChatFeature,
-  userDefault: FeatureAllowed,
-  pref: ContactUserPreference,
-  allowFeature: State<ContactFeatureAllowed>,
-  onSelected: (ContactFeatureAllowed) -> Unit
-) {
-  val enabled = FeatureEnabled.enabled(
-    feature.asymmetric,
-    user = SimpleChatPreference(allow = allowFeature.value.allowed),
-    contact = pref.contactPreference
-  )
-
-  SectionView(
-    feature.text.uppercase(),
-    icon = feature.iconFilled,
-    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
-    leadingIcon = true,
-  ) {
-    SectionItemView {
-      ExposedDropDownSettingRow(
-        generalGetString(R.string.chat_preferences_you_allow),
-        ContactFeatureAllowed.values(userDefault).map { it to it.text },
-        allowFeature,
-        icon = null,
-        onSelected = onSelected
-      )
-    }
-    SectionDivider()
-    InfoRow(
-      generalGetString(R.string.chat_preferences_contact_allows),
-      pref.contactPreference.allow.text
-    )
-  }
-  SectionTextFooter(feature.enabledDescription(enabled))
-}
-
-@Composable
-private fun TimedMessagesFeatureSection(
-  featuresAllowed: ContactFeaturesAllowed,
-  pref: ContactUserPreferenceTimed,
-  allowFeature: State<Boolean>,
-  onTTLUpdated: (Int?) -> Unit,
-  onSelected: (Boolean, Int?) -> Unit
-) {
-  val enabled = FeatureEnabled.enabled(
-    ChatFeature.TimedMessages.asymmetric,
-    user = TimedMessagesPreference(allow = if (allowFeature.value) FeatureAllowed.YES else FeatureAllowed.NO),
-    contact = pref.contactPreference
-  )
-
-  SectionView(
-    ChatFeature.TimedMessages.text.uppercase(),
-    icon = ChatFeature.TimedMessages.iconFilled,
-    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
-    leadingIcon = true,
-  ) {
-    SectionItemView {
-      PreferenceToggle(
-        generalGetString(R.string.chat_preferences_you_allow),
-        checked = allowFeature.value,
-      ) { allow ->
-        onSelected(allow, if (allow) featuresAllowed.timedMessagesTTL ?: 86400 else null)
-      }
-    }
-    SectionDivider()
-    InfoRow(
-      generalGetString(R.string.chat_preferences_contact_allows),
-      pref.contactPreference.allow.text
-    )
-    SectionDivider()
-    if (featuresAllowed.timedMessagesAllowed) {
-      val ttl = rememberSaveable(featuresAllowed.timedMessagesTTL) { mutableStateOf(featuresAllowed.timedMessagesTTL) }
-      TimedMessagesTTLPicker(ttl, onTTLUpdated)
-    } else if (pref.contactPreference.allow == FeatureAllowed.YES || pref.contactPreference.allow == FeatureAllowed.ALWAYS) {
-      InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(pref.contactPreference.ttl))
-    }
-  }
-  SectionTextFooter(ChatFeature.TimedMessages.enabledDescription(enabled))
-}
-
-@Composable
-private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-    SectionDivider()
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_contact), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-@Composable
-fun TimedMessagesTTLPicker(selection: MutableState<Int?>, onSelected: (Int?) -> Unit) {
-  val ttlValues = TimedMessagesPreference.ttlValues
-  val values = ttlValues + if (ttlValues.contains(selection.value)) listOf() else listOf(selection.value)
-  SectionItemView {
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.delete_after),
-      values.map { it to TimedMessagesPreference.ttlText(it) },
-      selection,
-      onSelected = onSelected
-    )
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_contact),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
@@ -14,7 +14,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.model.*
+import chat.simplex.app.model.CIDirection
+import chat.simplex.app.model.ChatItem
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.item.*
@@ -52,7 +53,6 @@ fun ContextItemView(
      MarkdownText(
        contextItem.text, contextItem.formattedText,
        sender = contextItem.memberDisplayName, senderBold = true, maxLines = 3,
-        linkMode = SimplexLinkMode.DESCRIPTION,
        modifier = Modifier.fillMaxWidth(),
      )
    }
@@ -1,53 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCodeScanner
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanCodeLayout(verifyCode, close)
-}
-
-@Composable
-private fun ScanCodeLayout(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.scan_code), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = DEFAULT_PADDING)
-    ) {
-      QRCodeScanner { text ->
-        verifyCode(text) {
-          if (it) {
-            close()
-          } else {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.incorrect_code)
-            )
-          }
-        }
-      }
-    }
-    Text(stringResource(R.string.scan_code_from_contacts_app))
-  }
-}
@@ -6,17 +6,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
-import android.os.Build
 import android.text.InputType
-import android.util.Log
 import android.view.ViewGroup
-import android.view.WindowManager
 import android.view.inputmethod.*
 import android.widget.EditText
-import android.widget.TextView
-import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
@@ -27,17 +21,15 @@ import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
@@ -45,135 +37,154 @@ import androidx.core.view.inputmethod.InputConnectionCompat
 import androidx.core.widget.*
 import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.*
+import chat.simplex.app.model.ChatItem
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import kotlinx.coroutines.*
-import java.lang.reflect.Field
+import java.io.*

@Composable
 fun SendMsgView(
  composeState: MutableState<ComposeState>,
-  showVoiceRecordIcon: Boolean,
-  recState: MutableState<RecordingState>,
-  isDirectChat: Boolean,
-  liveMessageAlertShown: SharedPreference<Boolean>,
-  needToAllowVoiceToContact: Boolean,
-  allowedVoiceByPrefs: Boolean,
-  userIsObserver: Boolean,
-  userCanSend: Boolean,
-  allowVoiceToContact: () -> Unit,
+  allowVoiceRecord: Boolean,
  sendMessage: () -> Unit,
-  sendLiveMessage: (suspend () -> Unit)? = null,
-  updateLiveMessage: (suspend () -> Unit)? = null,
-  cancelLiveMessage: (() -> Unit)? = null,
  onMessageChange: (String) -> Unit,
+  onAudioAdded: (String, Int, Boolean) -> Unit,
  textStyle: MutableState<TextStyle>
 ) {
-  Box(Modifier.padding(vertical = 8.dp)) {
-    val cs = composeState.value
-    val showProgress = cs.inProgress && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.FilePreview)
-    val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
-        cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
-    val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
-    // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
-      Box(Modifier
-        .matchParentSize()
-        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.observer_cant_send_message_title),
-            text = generalGetString(R.string.observer_cant_send_message_desc)
-          )
-        })
-      )
-    }
-    if (showDeleteTextButton.value) {
-      DeleteTextButton(composeState)
-    }
-    Box(Modifier.align(Alignment.BottomEnd)) {
-      val sendButtonSize = remember { Animatable(36f) }
-      val sendButtonAlpha = remember { Animatable(1f) }
-      val permissionsState = rememberMultiplePermissionsState(listOf(Manifest.permission.RECORD_AUDIO))
-      val scope = rememberCoroutineScope()
-      LaunchedEffect(Unit) {
-        // Making LiveMessage alive when screen orientation was changed
-        if (cs.liveMessage != null && sendLiveMessage != null && updateLiveMessage != null) {
-          startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-        }
+  Column(Modifier.padding(vertical = 8.dp)) {
+    Box {
+      val cs = composeState.value
+      val attachEnabled = !composeState.value.editing
+      val filePath = rememberSaveable { mutableStateOf(null as String?) }
+      var recordingTimeRange by rememberSaveable(saver = LongRange.saver) { mutableStateOf(0L..0L) } // since..to
+      val showVoiceButton = ((cs.message.isEmpty() || recordingTimeRange.first > 0L) && allowVoiceRecord && attachEnabled && cs.preview is ComposePreview.NoPreview) || filePath.value != null
+      Box(if (recordingTimeRange.first == 0L)
+        Modifier
+      else
+        Modifier.clickable(false, onClick = {})
+      ) {
+        NativeKeyboard(composeState, textStyle, onMessageChange)
      }
-      when {
-        showProgress -> ProgressIndicator()
-        showVoiceButton -> {
-          Row(verticalAlignment = Alignment.CenterVertically) {
-            val stopRecOnNextClick = remember { mutableStateOf(false) }
+      Box(Modifier.align(Alignment.BottomEnd)) {
+        val icon = if (cs.editing) Icons.Filled.Check else Icons.Outlined.ArrowUpward
+        val color = if (cs.sendEnabled()) MaterialTheme.colors.primary else HighOrLowlight
+        if (cs.inProgress && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.VoicePreview || cs.preview is ComposePreview.FilePreview)) {
+          CircularProgressIndicator(Modifier.size(36.dp).padding(4.dp), color = HighOrLowlight, strokeWidth = 3.dp)
+        } else if (!showVoiceButton) {
+          IconButton(sendMessage, Modifier.size(36.dp), enabled = cs.sendEnabled()) {
+            Icon(
+              icon,
+              stringResource(R.string.icon_descr_send_message),
+              tint = Color.White,
+              modifier = Modifier
+                .size(36.dp)
+                .padding(4.dp)
+                .clip(CircleShape)
+                .background(color)
+            )
+          }
+        } else {
+          val permissionsState = rememberMultiplePermissionsState(
+            permissions = listOf(
+              Manifest.permission.RECORD_AUDIO,
+            )
+          )
+          val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
+          val recordingInProgress: State<Boolean> = remember { rec.recordingInProgress }
+          var now by remember { mutableStateOf(System.currentTimeMillis()) }
+          LaunchedEffect(Unit) {
+            while (isActive) {
+              now = System.currentTimeMillis()
+              if (recordingTimeRange.first != 0L && recordingInProgress.value && composeState.value.preview is ComposePreview.VoicePreview) {
+                filePath.value?.let { onAudioAdded(it, (now - recordingTimeRange.first).toInt(), false) }
+              }
+              delay(100)
+            }
+          }
+          val stopRecordingAndAddAudio: () -> Unit = {
+            rec.stop()
+            recordingTimeRange = recordingTimeRange.first..System.currentTimeMillis()
+            filePath.value?.let { onAudioAdded(it, (recordingTimeRange.last - recordingTimeRange.first).toInt(), true) }
+          }
+          val startStopRecording: () -> Unit = {
            when {
-              needToAllowVoiceToContact || !allowedVoiceByPrefs || !userCanSend -> {
-                DisallowedVoiceButton(userCanSend) {
-                  if (needToAllowVoiceToContact) {
-                    showNeedToAllowVoiceAlert(allowVoiceToContact)
-                  } else if (!allowedVoiceByPrefs) {
-                    showDisabledVoiceAlert(isDirectChat)
-                  }
-                }
-              }
-              !permissionsState.allPermissionsGranted ->
-                VoiceButtonWithoutPermission { permissionsState.launchMultiplePermissionRequest() }
-              else ->
-                RecordVoiceView(recState, stopRecOnNextClick)
-            }
-            if (sendLiveMessage != null 
-                && updateLiveMessage != null
-                && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
-                && cs.contextItem is ComposeContextItem.NoContextItem) {
-              Spacer(Modifier.width(10.dp))
-              StartLiveMessageButton(userCanSend) {
-                if (composeState.value.preview is ComposePreview.NoPreview) {
-                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                }
+              !permissionsState.allPermissionsGranted -> permissionsState.launchMultiplePermissionRequest()
+              recordingInProgress.value -> stopRecordingAndAddAudio()
+              filePath.value == null -> {
+                recordingTimeRange = System.currentTimeMillis()..0L
+                filePath.value = rec.start(stopRecordingAndAddAudio)
+                filePath.value?.let { onAudioAdded(it, (now - recordingTimeRange.first).toInt(), false) }
              }
            }
          }
-        }
-        cs.liveMessage?.sent == false && cs.message.isEmpty() -> {
-          CancelLiveMessageButton {
-            cancelLiveMessage?.invoke()
-          }
-        }
-        else -> {
-          val cs = composeState.value
-          val icon = if (cs.editing || cs.liveMessage != null) Icons.Filled.Check else Icons.Outlined.ArrowUpward
-          val disabled = !cs.sendEnabled() ||
-                        (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-                        cs.endLiveDisabled
-          if (cs.liveMessage == null &&
-            cs.preview !is ComposePreview.VoicePreview && !cs.editing &&
-            cs.contextItem is ComposeContextItem.NoContextItem &&
-            sendLiveMessage != null && updateLiveMessage != null
-          ) {
-            var showDropdown by rememberSaveable { mutableStateOf(false) }
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage) { showDropdown = true }
-
-            DropdownMenu(
-              expanded = showDropdown,
-              onDismissRequest = { showDropdown = false },
-              Modifier.width(220.dp),
-            ) {
-              ItemAction(
-                generalGetString(R.string.send_live_message),
-                Icons.Filled.Bolt,
-                onClick = {
-                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                  showDropdown = false
-                }
-              )
+          var stopRecOnNextClick by remember { mutableStateOf(false) }
+          val context = LocalContext.current
+          DisposableEffect(stopRecOnNextClick) {
+            val activity = context as? Activity ?: return@DisposableEffect onDispose {}
+            if (stopRecOnNextClick) {
+              // Lock orientation to current orientation because screen rotation will break the recording
+              activity.requestedOrientation = if (activity.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT)
+                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+              else
+                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            }
+            // Unlock orientation
+            onDispose { activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED }
+          }
+          val cleanUp = { remove: Boolean ->
+            rec.stop()
+            if (remove) filePath.value?.let { File(it).delete() }
+            filePath.value = null
+            stopRecOnNextClick = false
+            recordingTimeRange = 0L..0L
+          }
+          LaunchedEffect(cs.preview) {
+            if (cs.preview !is ComposePreview.VoicePreview && filePath.value != null) {
+              // Pressed on X icon in preview
+              cleanUp(true)
+            }
+          }
+          val interactionSource = interactionSourceWithTapDetection(
+            onPress = {
+              if (filePath.value == null) startStopRecording()
+            },
+            onClick = {
+              if (!recordingInProgress.value && filePath.value != null) {
+                sendMessage()
+                cleanUp(false)
+              } else if (stopRecOnNextClick) {
+                stopRecordingAndAddAudio()
+                stopRecOnNextClick = false
+              } else {
+                // tapped and didn't hold a finger
+                stopRecOnNextClick = true
+              }
+            },
+            onCancel = startStopRecording,
+            onRelease = startStopRecording
+          )
+          val sendButtonModifier = if (recordingTimeRange.last != 0L)
+            Modifier.clip(CircleShape).background(color)
+          else
+            Modifier
+          IconButton({}, Modifier.size(36.dp), enabled = !cs.inProgress, interactionSource = interactionSource) {
+            Icon(
+              if (recordingTimeRange.last != 0L) Icons.Outlined.ArrowUpward else if (stopRecOnNextClick) Icons.Default.Stop else Icons.Default.Mic,
+              stringResource(R.string.icon_descr_record_voice_message),
+              tint = if (recordingTimeRange.last != 0L) Color.White else if (!cs.inProgress) MaterialTheme.colors.primary else HighOrLowlight,
+              modifier = Modifier
+                .size(36.dp)
+                .padding(4.dp)
+                .then(sendButtonModifier)
+            )
+          }
+          DisposableEffect(Unit) {
+            onDispose {
+              rec.stop()
            }
-          } else {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage)
          }
        }
      }
@@ -185,8 +196,6 @@ fun SendMsgView(
 private fun NativeKeyboard(
  composeState: MutableState<ComposeState>,
  textStyle: MutableState<TextStyle>,
-  showDeleteTextButton: MutableState<Boolean>,
-  userIsObserver: Boolean,
  onMessageChange: (String) -> Unit
 ) {
  val cs = composeState.value
@@ -197,15 +206,19 @@ private fun NativeKeyboard(
  val paddingTop = with(LocalDensity.current) { 7.dp.roundToPx() }
  val paddingEnd = with(LocalDensity.current) { 45.dp.roundToPx() }
  val paddingBottom = with(LocalDensity.current) { 7.dp.roundToPx() }
+
  var showKeyboard by remember { mutableStateOf(false) }
  LaunchedEffect(cs.contextItem) {
-    if (cs.contextItem is ComposeContextItem.QuotedItem) {
-      delay(100)
-      showKeyboard = true
-    } else if (cs.contextItem is ComposeContextItem.EditingItem) {
-      // Keyboard will not show up if we try to show it too fast
-      delay(300)
-      showKeyboard = true
+    when (cs.contextItem) {
+      is ComposeContextItem.QuotedItem -> {
+        delay(100)
+        showKeyboard = true
+      }
+      is ComposeContextItem.EditingItem -> {
+        // Keyboard will not show up if we try to show it too fast
+        delay(300)
+        showKeyboard = true
+      }
    }
  }

@@ -217,7 +230,6 @@ private fun NativeKeyboard(
      ) {
        super.setOnReceiveContentListener(mimeTypes, listener)
      }
-
      override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
        val connection = super.onCreateInputConnection(editorInfo)
        EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf("image/*"))
@@ -243,17 +255,7 @@ private fun NativeKeyboard(
    editText.background = drawable
    editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
    editText.setText(cs.message)
-    if (Build.VERSION.SDK_INT >= 29) {
-      editText.textCursorDrawable?.let { DrawableCompat.setTint(it, HighOrLowlight.toArgb()) }
-    } else {
-      try {
-        val f: Field = TextView::class.java.getDeclaredField("mCursorDrawableRes")
-        f.isAccessible = true
-        f.set(editText, R.drawable.edit_text_cursor)
-      } catch (e: Exception) {
-        Log.e(chat.simplex.app.TAG, e.stackTraceToString())
-      }
-    }
+    editText.textCursorDrawable?.let { DrawableCompat.setTint(it, HighOrLowlight.toArgb()) }
    editText.doOnTextChanged { text, _, _, _ -> onMessageChange(text.toString()) }
    editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
    editText
@@ -274,315 +276,17 @@ private fun NativeKeyboard(
      imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
      showKeyboard = false
    }
-    showDeleteTextButton.value = it.lineCount >= 4
  }
  if (composeState.value.preview is ComposePreview.VoicePreview) {
-    ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
-  } else if (userIsObserver) {
-    ComposeOverlay(R.string.you_are_observer, textStyle, padding)
-  }
-}
-
-@Composable
-private fun ComposeOverlay(textId: Int, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
-  Text(
-    generalGetString(textId),
-    Modifier.padding(padding),
-    color = HighOrLowlight,
-    style = textStyle.value.copy(fontStyle = FontStyle.Italic)
-  )
-}
-
-@Composable
-private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>) {
-  IconButton(
-    { composeState.value = composeState.value.copy(message = "") },
-    Modifier.align(Alignment.TopEnd).size(36.dp)
-  ) {
-    Icon(Icons.Filled.Close, null, Modifier.padding(7.dp).size(36.dp), tint = HighOrLowlight)
-  }
-}
-
-@Composable
-private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNextClick: MutableState<Boolean>) {
-  val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
-  DisposableEffect(Unit) { onDispose { rec.stop() } }
-  val stopRecordingAndAddAudio: () -> Unit = {
-    recState.value.filePathNullable?.let {
-      recState.value = RecordingState.Finished(it, rec.stop())
-    }
-  }
-  if (stopRecOnNextClick.value) {
-    LaunchedEffect(recState.value) {
-      if (recState.value is RecordingState.NotStarted) {
-        stopRecOnNextClick.value = false
-      }
-    }
-    // Lock orientation to current orientation because screen rotation will break the recording
-    LockToCurrentOrientationUntilDispose()
-    StopRecordButton(stopRecordingAndAddAudio)
-  } else {
-    val startRecording: () -> Unit = {
-      recState.value = RecordingState.Started(
-        filePath = rec.start { progress: Int?, finished: Boolean ->
-          val state = recState.value
-          if (state is RecordingState.Started && progress != null) {
-            recState.value = if (!finished)
-              RecordingState.Started(state.filePath, progress)
-            else
-              RecordingState.Finished(state.filePath, progress)
-          }
-        },
-      )
-    }
-    val interactionSource = interactionSourceWithTapDetection(
-      onPress = { if (recState.value is RecordingState.NotStarted) startRecording() },
-      onClick = {
-        if (stopRecOnNextClick.value) {
-          stopRecordingAndAddAudio()
-        } else {
-          // tapped and didn't hold a finger
-          stopRecOnNextClick.value = true
-        }
-      },
-      onCancel = stopRecordingAndAddAudio,
-      onRelease = stopRecordingAndAddAudio
-    )
-    RecordVoiceButton(interactionSource)
-  }
-}
-
-@Composable
-private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
-    Icon(
-      Icons.Outlined.KeyboardVoice,
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = HighOrLowlight,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
+    Text(
+      generalGetString(R.string.voice_message_send_text),
+      Modifier.padding(padding),
+      color = HighOrLowlight,
+      style = textStyle.value.copy(fontStyle = FontStyle.Italic)
    )
  }
 }

-@Composable
-private fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      Icons.Filled.KeyboardVoice,
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(34.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun LockToCurrentOrientationUntilDispose() {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    val activity = context as Activity
-    val manager = context.getSystemService(Activity.WINDOW_SERVICE) as WindowManager
-    val rotation = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) manager.defaultDisplay.rotation else activity.display?.rotation
-    activity.requestedOrientation = when (rotation) {
-      android.view.Surface.ROTATION_90 -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-      android.view.Surface.ROTATION_180 -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
-      android.view.Surface.ROTATION_270 -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-      else -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-    // Unlock orientation
-    onDispose { activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED }
-  }
-}
-
-@Composable
-private fun StopRecordButton(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      Icons.Filled.Stop,
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun RecordVoiceButton(interactionSource: MutableInteractionSource) {
-  IconButton({}, Modifier.size(36.dp), interactionSource = interactionSource) {
-    Icon(
-      Icons.Filled.KeyboardVoice,
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(34.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(Modifier.size(36.dp).padding(4.dp), color = HighOrLowlight, strokeWidth = 3.dp)
-}
-
-@Composable
-private fun CancelLiveMessageButton(
-  onClick: () -> Unit
-) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      Icons.Filled.Close,
-      stringResource(R.string.icon_descr_cancel_live_message),
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@Composable
-private fun SendMsgButton(
-  icon: ImageVector,
-  sizeDp: Animatable<Float, AnimationVector1D>,
-  alpha: Animatable<Float, AnimationVector1D>,
-  enabled: Boolean,
-  sendMessage: () -> Unit,
-  onLongClick: (() -> Unit)? = null
-) {
-  val interactionSource = remember { MutableInteractionSource() }
-  Box(
-    modifier = Modifier.requiredSize(36.dp)
-      .combinedClickable(
-        onClick = sendMessage,
-        onLongClick = onLongClick,
-        enabled = enabled,
-        role = Role.Button,
-        interactionSource = interactionSource,
-        indication = rememberRipple(bounded = false, radius = 24.dp)
-      ),
-    contentAlignment = Alignment.Center
-  ) {
-    Icon(
-      icon,
-      stringResource(R.string.icon_descr_send_message),
-      tint = Color.White,
-      modifier = Modifier
-        .size(sizeDp.value.dp)
-        .padding(4.dp)
-        .alpha(alpha.value)
-        .clip(CircleShape)
-        .background(if (enabled) MaterialTheme.colors.primary else HighOrLowlight)
-        .padding(3.dp)
-    )
-  }
-}
-
-@Composable
-private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
-  val interactionSource = remember { MutableInteractionSource() }
-  Box(
-    modifier = Modifier.requiredSize(36.dp)
-      .clickable(
-        onClick = onClick,
-        enabled = enabled,
-        role = Role.Button,
-        interactionSource = interactionSource,
-        indication = rememberRipple(bounded = false, radius = 24.dp)
-      ),
-    contentAlignment = Alignment.Center
-  ) {
-    Icon(
-      Icons.Filled.Bolt,
-      stringResource(R.string.icon_descr_send_message),
-      tint = if (enabled) MaterialTheme.colors.primary else HighOrLowlight,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-private fun startLiveMessage(
-  scope: CoroutineScope,
-  send: suspend () -> Unit,
-  update: suspend () -> Unit,
-  sendButtonSize: Animatable<Float, AnimationVector1D>,
-  sendButtonAlpha: Animatable<Float, AnimationVector1D>,
-  composeState: MutableState<ComposeState>,
-  liveMessageAlertShown: SharedPreference<Boolean>
-) {
-  fun run() {
-    scope.launch {
-      while (composeState.value.liveMessage != null) {
-        sendButtonSize.animateTo(if (sendButtonSize.value == 36f) 32f else 36f, tween(700, 50))
-      }
-      sendButtonSize.snapTo(36f)
-    }
-    scope.launch {
-      while (composeState.value.liveMessage != null) {
-        sendButtonAlpha.animateTo(if (sendButtonAlpha.value == 1f) 0.75f else 1f, tween(700, 50))
-      }
-      sendButtonAlpha.snapTo(1f)
-    }
-    scope.launch {
-      delay(3000)
-      while (composeState.value.liveMessage != null) {
-        update()
-        delay(3000)
-      }
-    }
-  }
-
-  fun start() = withBGApi {
-    if (composeState.value.liveMessage == null) {
-      send()
-    }
-    run()
-  }
-
-  if (liveMessageAlertShown.state.value) {
-    start()
-  } else {
-    AlertManager.shared.showAlertDialog(
-      title = generalGetString(R.string.live_message),
-      text = generalGetString(R.string.send_live_message_desc),
-      confirmText = generalGetString(R.string.send_verb),
-      onConfirm = {
-        liveMessageAlertShown.set(true)
-        start()
-      })
-  }
-}
-
-private fun showNeedToAllowVoiceAlert(onConfirm: () -> Unit) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.allow_voice_messages_question),
-    text = generalGetString(R.string.you_need_to_allow_to_send_voice),
-    confirmText = generalGetString(R.string.allow_verb),
-    dismissText = generalGetString(R.string.cancel_verb),
-    onConfirm = onConfirm,
-  )
-}
-
-private fun showDisabledVoiceAlert(isDirectChat: Boolean) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.voice_messages_prohibited),
-    text = generalGetString(
-      if (isDirectChat)
-        R.string.ask_your_contact_to_enable_voice
-      else
-        R.string.only_group_owners_can_enable_voice
-    )
-  )
-}
-
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -596,17 +300,10 @@ fun PreviewSendMsgView() {
  SimpleXTheme {
    SendMsgView(
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
+      allowVoiceRecord = false,
      sendMessage = {},
      onMessageChange = { _ -> },
+      onAudioAdded = { _, _, _ -> },
      textStyle = textStyle
    )
  }
@@ -626,17 +323,10 @@ fun PreviewSendMsgViewEditing() {
  SimpleXTheme {
    SendMsgView(
      composeState = remember { mutableStateOf(composeStateEditing) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
+      allowVoiceRecord = false,
      sendMessage = {},
      onMessageChange = { _ -> },
+      onAudioAdded = { _, _, _ -> },
      textStyle = textStyle
    )
  }
@@ -652,21 +342,14 @@ fun PreviewSendMsgViewEditing() {
 fun PreviewSendMsgViewInProgress() {
  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
  val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt", getAppFileUri("test.txt")), inProgress = true, useLinkPreviews = true)
+  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt"), inProgress = true, useLinkPreviews = true)
  SimpleXTheme {
    SendMsgView(
      composeState = remember { mutableStateOf(composeStateInProgress) },
-      showVoiceRecordIcon = false,
-      recState = remember { mutableStateOf(RecordingState.NotStarted) },
-      isDirectChat = true,
-      liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
-      needToAllowVoiceToContact = false,
-      allowedVoiceByPrefs = true,
-      userIsObserver = false,
-      userCanSend = true,
-      allowVoiceToContact = {},
+      allowVoiceRecord = false,
      sendMessage = {},
      onMessageChange = { _ -> },
+      onAudioAdded = { _, _, _ -> },
      textStyle = textStyle
    )
  }
@@ -1,137 +0,0 @@
-package chat.simplex.app.views.chat
-
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun VerifyCodeView(
-  displayName: String,
-  connectionCode: String?,
-  connectionVerified: Boolean,
-  verify: suspend (String?) -> Pair<Boolean, String>?,
-  close: () -> Unit,
-) {
-  if (connectionCode != null) {
-    VerifyCodeLayout(
-      displayName,
-      connectionCode,
-      connectionVerified,
-      verifyCode = { newCode, cb ->
-        withBGApi {
-          val res = verify(newCode)
-          if (res != null) {
-            val (verified) = res
-            cb(verified)
-            if (verified) close()
-          }
-        }
-      }
-    )
-  }
-}
-
-@Composable
-private fun VerifyCodeLayout(
-  displayName: String,
-  connectionCode: String,
-  connectionVerified: Boolean,
-  verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .verticalScroll(rememberScrollState())
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.security_code), false)
-    val splitCode = splitToParts(connectionCode, 24)
-    Row(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF), horizontalArrangement = Arrangement.Center) {
-      if (connectionVerified) {
-        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 4.dp).size(22.dp), tint = HighOrLowlight)
-        Text(String.format(stringResource(R.string.is_verified), displayName))
-      } else {
-        Text(String.format(stringResource(R.string.is_not_verified), displayName))
-      }
-    }
-
-    SectionView {
-      QRCode(connectionCode, Modifier.aspectRatio(1f))
-    }
-
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-      Spacer(Modifier.weight(2f))
-      SelectionContainer(Modifier.padding(vertical = DEFAULT_PADDING_HALF, horizontal = DEFAULT_PADDING_HALF)) {
-        Text(
-          splitCode,
-          fontFamily = FontFamily.Monospace,
-          fontSize = 18.sp,
-          maxLines = 20
-        )
-      }
-      val context = LocalContext.current
-      Box(Modifier.weight(1f)) {
-        IconButton({ shareText(context, connectionCode) }, Modifier.size(20.dp).align(Alignment.CenterStart)) {
-          Icon(Icons.Filled.Share, null, tint = MaterialTheme.colors.primary)
-        }
-      }
-      Spacer(Modifier.weight(1f))
-    }
-
-    Text(
-      generalGetString(R.string.to_verify_compare),
-      Modifier.padding(bottom = DEFAULT_PADDING)
-    )
-
-    Row(
-      Modifier.padding(bottom = DEFAULT_PADDING).align(Alignment.CenterHorizontally),
-      horizontalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      if (connectionVerified) {
-        SimpleButton(generalGetString(R.string.clear_verification), Icons.Outlined.Shield) {
-          verifyCode(null) {}
-        }
-      } else {
-        SimpleButton(generalGetString(R.string.scan_code), Icons.Outlined.QrCode) {
-          ModalManager.shared.showModal {
-            ScanCodeView(verifyCode) { }
-          }
-        }
-        SimpleButton(generalGetString(R.string.mark_code_verified), Icons.Outlined.VerifiedUser) {
-          verifyCode(connectionCode) { verified ->
-            if (!verified) {
-              AlertManager.shared.showAlertMsg(
-                title = generalGetString(R.string.incorrect_code)
-              )
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-private fun splitToParts(s: String, length: Int): String {
-  if (length >= s.length) return s
-  return (0..(s.length - 1) / length)
-    .map { s.drop(it * length).take(length) }
-    .joinToString(separator = "\n")
-}
@@ -31,23 +31,17 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.SettingsActionItem

@Composable
-fun AddGroupMembersView(groupInfo: GroupInfo, creatingGroup: Boolean = false, chatModel: ChatModel, close: () -> Unit) {
+fun AddGroupMembersView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
  val selectedContacts = remember { mutableStateListOf<Long>() }
  val selectedRole = remember { mutableStateOf(GroupMemberRole.Member) }
  var allowModifyMembers by remember { mutableStateOf(true) }
  BackHandler(onBack = close)
  AddGroupMembersLayout(
    groupInfo = groupInfo,
-    creatingGroup = creatingGroup,
    contactsToAdd = getContactsToAdd(chatModel),
    selectedContacts = selectedContacts,
    selectedRole = selectedRole,
    allowModifyMembers = allowModifyMembers,
-    openPreferences = {
-      ModalManager.shared.showCustomModal { close ->
-        GroupPreferencesView(chatModel, groupInfo.id, close)
-      }
-    },
    inviteMembers = {
      allowModifyMembers = false
      withApi {
@@ -65,7 +59,6 @@ fun AddGroupMembersView(groupInfo: GroupInfo, creatingGroup: Boolean = false, ch
    clearSelection = { selectedContacts.clear() },
    addContact = { contactId -> if (contactId !in selectedContacts) selectedContacts.add(contactId) },
    removeContact = { contactId -> selectedContacts.removeIf { it == contactId } },
-    close = close,
  )
 }

@@ -86,17 +79,14 @@ fun getContactsToAdd(chatModel: ChatModel): List<Contact> {
@Composable
 fun AddGroupMembersLayout(
  groupInfo: GroupInfo,
-  creatingGroup: Boolean,
  contactsToAdd: List<Contact>,
  selectedContacts: List<Long>,
  selectedRole: MutableState<GroupMemberRole>,
  allowModifyMembers: Boolean,
-  openPreferences: () -> Unit,
  inviteMembers: () -> Unit,
  clearSelection: () -> Unit,
  addContact: (Long) -> Unit,
  removeContact: (Long) -> Unit,
-  close: () -> Unit,
 ) {
  Column(
    Modifier
@@ -130,28 +120,18 @@ fun AddGroupMembersLayout(
      }
    } else {
      SectionView {
-        if (creatingGroup) {
-          SectionItemView(openPreferences) {
-            Text(stringResource(R.string.set_group_preferences))
-          }
-          SectionDivider()
-        }
        SectionItemView {
          RoleSelectionRow(groupInfo, selectedRole, allowModifyMembers)
        }
        SectionDivider()
-        if (creatingGroup && selectedContacts.isEmpty()) {
-          SkipInvitingButton(close)
-        } else {
-          InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty() || !allowModifyMembers)
-        }
+        InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty() || !allowModifyMembers)
      }
      SectionCustomFooter {
        InviteSectionFooter(selectedContactsCount = selectedContacts.size, allowModifyMembers, clearSelection)
      }
      SectionSpacer()

-      SectionView(stringResource(R.string.select_contacts)) {
+      SectionView {
        ContactList(contacts = contactsToAdd, selectedContacts, groupInfo, allowModifyMembers, addContact, removeContact)
      }
      SectionSpacer()
@@ -190,17 +170,6 @@ fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
  )
 }

-@Composable
-fun SkipInvitingButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.Check,
-    stringResource(R.string.skip_inviting_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
@Composable
 fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelection: () -> Unit) {
  Row(
@@ -319,17 +288,14 @@ fun PreviewAddGroupMembersLayout() {
  SimpleXTheme {
    AddGroupMembersLayout(
      groupInfo = GroupInfo.sampleData,
-      creatingGroup = false,
      contactsToAdd = listOf(Contact.sampleData, Contact.sampleData, Contact.sampleData),
      selectedContacts = remember { mutableStateListOf() },
      selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) },
      allowModifyMembers = true,
-      openPreferences = {},
      inviteMembers = {},
      clearSelection = {},
      addContact = {},
-      removeContact = {},
-      close = {},
+      removeContact = {}
    )
  }
 }
@@ -4,9 +4,7 @@ import InfoRow
 import SectionDivider
 import SectionItemView
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -24,17 +22,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.TAG
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
 import chat.simplex.app.views.chatlist.cantInviteIncognitoAlert
 import chat.simplex.app.views.chatlist.setGroupMembers
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*

@Composable
-fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit, close: () -> Unit) {
+fun GroupChatInfoView(chatModel: ChatModel, close: () -> Unit) {
  BackHandler(onBack = close)
  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
  val developerTools = chatModel.controller.appPrefs.developerTools.get()
@@ -47,58 +43,33 @@ fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, groupLinkMemberR
        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
        .sortedBy { it.displayName.lowercase() },
      developerTools,
-      groupLink,
      addMembers = {
        withApi {
          setGroupMembers(groupInfo, chatModel)
          ModalManager.shared.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, false, chatModel, close)
+            AddGroupMembersView(groupInfo, chatModel, close)
          }
        }
      },
      showMemberInfo = { member ->
        withApi {
          val stats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
-          val (_, code) = if (member.memberActive) {
-            try {
-              chatModel.controller.apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId)
-            } catch (e: Exception) {
-              Log.e(TAG, e.stackTraceToString())
-              member to null
-            }
-          } else {
-            member to null
-          }
          ModalManager.shared.showModalCloseable(true) { closeCurrent ->
-            remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-              GroupMemberInfoView(groupInfo, mem, stats, code, chatModel, closeCurrent) {
-                closeCurrent()
-                close()
-              }
-            }
+            GroupMemberInfoView(groupInfo, member, stats, chatModel, closeCurrent) { closeCurrent(); close() }
          }
        }
      },
      editGroupProfile = {
        ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
      },
-      addOrEditWelcomeMessage = {
-        ModalManager.shared.showCustomModal { close -> GroupWelcomeView(chatModel, groupInfo, close) }
-      },
-      openPreferences = {
-        ModalManager.shared.showCustomModal { close ->
-          GroupPreferencesView(
-            chatModel,
-            chat.id,
-            close
-          )
-        }
-      },
      deleteGroup = { deleteGroupDialog(chat.chatInfo, groupInfo, chatModel, close) },
      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
      leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) },
      manageGroupLink = {
-          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, groupLinkMemberRole, onGroupLinkUpdated) }
+        withApi {
+          val groupLink = chatModel.controller.apiGetGroupLink(groupInfo.groupId)
+          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink) }
+        }
      }
    )
  }
@@ -146,12 +117,9 @@ fun GroupChatInfoLayout(
  groupInfo: GroupInfo,
  members: List<GroupMember>,
  developerTools: Boolean,
-  groupLink: String?,
  addMembers: () -> Unit,
  showMemberInfo: (GroupMember) -> Unit,
  editGroupProfile: () -> Unit,
-  addOrEditWelcomeMessage: () -> Unit,
-  openPreferences: () -> Unit,
  deleteGroup: () -> Unit,
  clearChat: () -> Unit,
  leaveGroup: () -> Unit,
@@ -171,27 +139,9 @@ fun GroupChatInfoLayout(
    }
    SectionSpacer()

-    SectionView {
-      if (groupInfo.canEdit) {
-        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
-        SectionDivider()
-        SectionItemView(addOrEditWelcomeMessage) { AddOrEditWelcomeMessage(groupInfo.groupProfile.description) }
-        SectionDivider()
-      }
-      GroupPreferencesButton(openPreferences)
-    }
-    SectionTextFooter(stringResource(R.string.only_group_owners_can_change_prefs))
-    SectionSpacer()
-
    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
      if (groupInfo.canAddMembers) {
-        SectionItemView(manageGroupLink) {
-          if (groupLink == null) {
-            CreateGroupLinkButton()
-          } else {
-            GroupLinkButton()
-          }
-        }
+        SectionItemView(manageGroupLink) { GroupLinkButton() }
        SectionDivider()
        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
        SectionItemView(onAddMembersClick) {
@@ -210,6 +160,10 @@ fun GroupChatInfoLayout(
    }
    SectionSpacer()
    SectionView {
+      if (groupInfo.canEdit) {
+        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
+        SectionDivider()
+      }
      ClearChatButton(clearChat)
      if (groupInfo.canDelete) {
        SectionDivider()
@@ -234,7 +188,7 @@ fun GroupChatInfoLayout(
 }

@Composable
-private fun GroupChatInfoHeader(cInfo: ChatInfo) {
+fun GroupChatInfoHeader(cInfo: ChatInfo) {
  Column(
    Modifier.padding(horizontal = 8.dp),
    horizontalAlignment = Alignment.CenterHorizontally
@@ -258,16 +212,7 @@ private fun GroupChatInfoHeader(cInfo: ChatInfo) {
 }

@Composable
-private fun GroupPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.group_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
+fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
  Row(
    Modifier.fillMaxSize(),
    verticalAlignment = Alignment.CenterVertically
@@ -283,7 +228,7 @@ private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
 }

@Composable
-private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
+fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
  Column {
    members.forEachIndexed { index, member ->
      SectionItemView({ showMemberInfo(member) }, minHeight = 50.dp) {
@@ -297,28 +242,22 @@ private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember
 }

@Composable
-private fun MemberRow(member: GroupMember, user: Boolean = false) {
+fun MemberRow(member: GroupMember, user: Boolean = false) {
  Row(
    Modifier.fillMaxWidth(),
    horizontalArrangement = Arrangement.SpaceBetween,
    verticalAlignment = Alignment.CenterVertically
  ) {
    Row(
-      Modifier.weight(1f).padding(end = DEFAULT_PADDING),
      verticalAlignment = Alignment.CenterVertically,
      horizontalArrangement = Arrangement.spacedBy(4.dp)
    ) {
      ProfileImage(size = 46.dp, member.image)
      Column {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (member.verified) {
-            MemberVerifiedShield()
-          }
-          Text(
-            member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-            color = if (member.memberIncognito) Indigo else Color.Unspecified
-          )
-        }
+        Text(
+          member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
+          color = if (member.memberIncognito) Indigo else Color.Unspecified
+        )
        val s = member.memberStatus.shortText
        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
        Text(
@@ -338,12 +277,7 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
 }

@Composable
-private fun MemberVerifiedShield() {
-  Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 3.dp).size(16.dp), tint = HighOrLowlight)
-}
-
-@Composable
-private fun GroupLinkButton() {
+fun GroupLinkButton() {
  Row(
    Modifier
      .fillMaxSize(),
@@ -352,27 +286,10 @@ private fun GroupLinkButton() {
    Icon(
      Icons.Outlined.Link,
      stringResource(R.string.group_link),
-      tint = HighOrLowlight
+      tint = MaterialTheme.colors.primary
    )
    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.group_link))
-  }
-}
-
-@Composable
-private fun CreateGroupLinkButton() {
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.AddLink,
-      stringResource(R.string.create_group_link),
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.create_group_link))
+    Text(stringResource(R.string.group_link), color = MaterialTheme.colors.primary)
  }
 }

@@ -386,37 +303,15 @@ fun EditGroupProfileButton() {
    Icon(
      Icons.Outlined.Edit,
      stringResource(R.string.button_edit_group_profile),
-      tint = HighOrLowlight
+      tint = MaterialTheme.colors.primary
    )
    Spacer(Modifier.size(8.dp))
-    Text(stringResource(R.string.button_edit_group_profile))
+    Text(stringResource(R.string.button_edit_group_profile), color = MaterialTheme.colors.primary)
  }
 }

@Composable
-private fun AddOrEditWelcomeMessage(welcomeMessage: String?) {
-  val text = if (welcomeMessage == null) {
-    stringResource(R.string.button_add_welcome_message)
-  } else {
-    stringResource(R.string.button_welcome_message)
-  }
-  Row(
-    Modifier
-      .fillMaxSize(),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Icon(
-      Icons.Outlined.MapsUgc,
-      text,
-      tint = HighOrLowlight
-    )
-    Spacer(Modifier.size(8.dp))
-    Text(text)
-  }
-}
-
-@Composable
-private fun LeaveGroupButton() {
+fun LeaveGroupButton() {
  Row(
    Modifier.fillMaxSize(),
    verticalAlignment = Alignment.CenterVertically
@@ -432,7 +327,7 @@ private fun LeaveGroupButton() {
 }

@Composable
-private fun DeleteGroupButton() {
+fun DeleteGroupButton() {
  Row(
    Modifier.fillMaxSize(),
    verticalAlignment = Alignment.CenterVertically
@@ -454,13 +349,13 @@ fun PreviewGroupChatInfoLayout() {
    GroupChatInfoLayout(
      chat = Chat(
        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf()
+        chatItems = arrayListOf(),
+        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
      ),
      groupInfo = GroupInfo.sampleData,
      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
      developerTools = false,
-      groupLink = null,
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, addOrEditWelcomeMessage = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
+      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
    )
  }
 }
@@ -1,15 +1,10 @@
 package chat.simplex.app.views.chat.group

-import SectionItemView
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -18,54 +13,25 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.GroupInfo
+import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import chat.simplex.app.ui.theme.SimpleButton
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.QRCode

@Composable
-fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, memberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit) {
-  var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
-  val groupLinkMemberRole = rememberSaveable { mutableStateOf(memberRole) }
-  var creatingLink by rememberSaveable { mutableStateOf(false) }
+fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?) {
+  var groupLink by remember { mutableStateOf(connReqContact) }
  val cxt = LocalContext.current
-  fun createLink() {
-    creatingLink = true
-    withApi {
-      val link = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
-      if (link != null) {
-        groupLink = link.first
-        groupLinkMemberRole.value = link.second
-        onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
-      }
-      creatingLink = false
-    }
-  }
-  LaunchedEffect(Unit) {
-    if (groupLink == null && !creatingLink) {
-      createLink()
-    }
-  }
  GroupLinkLayout(
    groupLink = groupLink,
-    groupInfo,
-    groupLinkMemberRole,
-    creatingLink,
-    createLink = ::createLink,
-    share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
-    updateLink = {
-      val role = groupLinkMemberRole.value
-      if (role != null) {
-        withBGApi {
-          val link = chatModel.controller.apiGroupLinkMemberRole(groupInfo.groupId, role)
-          if (link != null) {
-            groupLink = link.first
-            groupLinkMemberRole.value = link.second
-            onGroupLinkUpdated(groupLink to groupLinkMemberRole.value)
-          }
-        }
+    createLink = {
+      withApi {
+        groupLink = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
      }
    },
+    share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
    deleteLink = {
      AlertManager.shared.showAlertMsg(
        title = generalGetString(R.string.delete_link_question),
@@ -76,33 +42,23 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
            val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
            if (r) {
              groupLink = null
-              onGroupLinkUpdated(null to null)
            }
          }
        }
      )
    }
  )
-  if (creatingLink) {
-    ProgressIndicator()
-  }
 }

@Composable
 fun GroupLinkLayout(
  groupLink: String?,
-  groupInfo: GroupInfo,
-  groupLinkMemberRole: MutableState<GroupMemberRole?>,
-  creatingLink: Boolean,
  createLink: () -> Unit,
  share: () -> Unit,
-  updateLink: () -> Unit,
  deleteLink: () -> Unit
 ) {
  Column(
-    Modifier
-      .verticalScroll(rememberScrollState())
-      .padding(start = DEFAULT_PADDING, bottom = DEFAULT_BOTTOM_PADDING, end = DEFAULT_PADDING),
+    Modifier.padding(horizontal = DEFAULT_PADDING),
    horizontalAlignment = Alignment.Start,
    verticalArrangement = Arrangement.Top
  ) {
@@ -118,19 +74,9 @@ fun GroupLinkLayout(
      verticalArrangement = Arrangement.SpaceEvenly
    ) {
      if (groupLink == null) {
-        SimpleButton(stringResource(R.string.button_create_group_link), icon = Icons.Outlined.AddLink, disabled = creatingLink, click = createLink)
+        SimpleButton(stringResource(R.string.button_create_group_link), icon = Icons.Outlined.AddLink, click = createLink)
      } else {
-        SectionItemView(padding = PaddingValues(bottom = DEFAULT_PADDING)) {
-          RoleSelectionRow(groupInfo, groupLinkMemberRole)
-        }
-        var initialLaunch by remember { mutableStateOf(true) }
-        LaunchedEffect(groupLinkMemberRole.value) {
-          if (!initialLaunch) {
-            updateLink()
-          }
-          initialLaunch = false
-        }
-        QRCode(groupLink, Modifier.aspectRatio(1f))
+        QRCode(groupLink, Modifier.weight(1f, fill = false).aspectRatio(1f))
        Row(
          horizontalArrangement = Arrangement.spacedBy(10.dp),
          verticalAlignment = Alignment.CenterVertically,
@@ -153,37 +99,3 @@ fun GroupLinkLayout(
  }
 }

-@Composable
-private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole?>, enabled: Boolean = true) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    val values = listOf(GroupMemberRole.Member, GroupMemberRole.Observer).map { it to it.text }
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.initial_member_role),
-      values,
-      selectedRole,
-      icon = null,
-      enabled = rememberUpdatedState(enabled),
-      onSelected = { selectedRole.value = it }
-    )
-  }
-}
-
-@Composable
-fun ProgressIndicator() {
-  Box(
-    Modifier.fillMaxSize(),
-    contentAlignment = Alignment.Center
-  ) {
-    CircularProgressIndicator(
-      Modifier
-        .padding(horizontal = 2.dp)
-        .size(30.dp),
-      color = HighOrLowlight,
-      strokeWidth = 2.5.dp
-    )
-  }
-}
@@ -5,7 +5,6 @@ import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionView
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -13,7 +12,6 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -23,20 +21,19 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.TAG
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
+import chat.simplex.app.views.chat.SimplexServers
+import chat.simplex.app.views.chat.SwitchAddressButton
+import chat.simplex.app.views.chatlist.openChat
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.SettingsActionItem
-import kotlinx.datetime.Clock

@Composable
 fun GroupMemberInfoView(
  groupInfo: GroupInfo,
  member: GroupMember,
  connStats: ConnectionStats?,
-  connectionCode: String?,
  chatModel: ChatModel,
  close: () -> Unit,
  closeAll: () -> Unit, // Close all open windows up to ChatView
@@ -52,25 +49,20 @@ fun GroupMemberInfoView(
      connStats,
      newRole,
      developerTools,
-      connectionCode,
-      getContactChat = { chatModel.getContactChat(it) },
-      knownDirectChat = {
+      openDirectChat = {
        withApi {
-          chatModel.chatItems.clear()
-          chatModel.chatItems.addAll(it.chatItems)
-          chatModel.chatId.value = it.chatInfo.id
-          closeAll()
-        }
-      },
-      newDirectChat = {
-        withApi {
-          val c = chatModel.controller.apiGetChat(ChatType.Direct, it)
-          if (c != null) {
-            chatModel.addChat(c)
+          val oldChat = chatModel.getContactChat(member.memberContactId ?: return@withApi)
+          if (oldChat != null) {
+            openChat(oldChat.chatInfo, chatModel)
+          } else {
+            var newChat = chatModel.controller.apiGetChat(ChatType.Direct, member.memberContactId) ?: return@withApi
+            // TODO it's not correct to blindly set network status to connected - we should manage network status in model / backend
+            newChat = newChat.copy(serverInfo = Chat.ServerInfo(networkStatus = Chat.NetworkStatus.Connected()))
+            chatModel.addChat(newChat)
            chatModel.chatItems.clear()
-            chatModel.chatId.value = c.id
-            closeAll()
+            chatModel.chatId.value = newChat.id
          }
+          closeAll()
        }
      },
      removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) },
@@ -93,32 +85,6 @@ fun GroupMemberInfoView(
      },
      switchMemberAddress = {
        switchMemberAddress(chatModel, groupInfo, member)
-      },
-      verifyClicked = {
-        ModalManager.shared.showModalCloseable { close ->
-          remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-            VerifyCodeView(
-              mem.displayName,
-              connectionCode,
-              mem.verified,
-              verify = { code ->
-                chatModel.controller.apiVerifyGroupMember(mem.groupId, mem.groupMemberId, code)?.let { r ->
-                  val (verified, existingCode) = r
-                  chatModel.upsertGroupMember(
-                    groupInfo,
-                    mem.copy(
-                      activeConn = mem.activeConn?.copy(
-                        connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
-                      )
-                    )
-                  )
-                  r
-                }
-              },
-              close,
-            )
-          }
-        }
      }
    )
  }
@@ -148,14 +114,10 @@ fun GroupMemberInfoLayout(
  connStats: ConnectionStats?,
  newRole: MutableState<GroupMemberRole>,
  developerTools: Boolean,
-  connectionCode: String?,
-  getContactChat: (Long) -> Chat?,
-  knownDirectChat: (Chat) -> Unit,
-  newDirectChat: (Long) -> Unit,
+  openDirectChat: () -> Unit,
  removeMember: () -> Unit,
  onRoleSelected: (GroupMemberRole) -> Unit,
  switchMemberAddress: () -> Unit,
-  verifyClicked: () -> Unit,
 ) {
  Column(
    Modifier
@@ -171,29 +133,10 @@ fun GroupMemberInfoLayout(
    }
    SectionSpacer()

-    if (member.memberActive) {
-      val contactId = member.memberContactId
-      if (contactId != null) {
-        SectionView {
-          val chat = getContactChat(contactId)
-          if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-            OpenChatButton(onClick = { knownDirectChat(chat) })
-            if (connectionCode != null) {
-              SectionDivider()
-            }
-          } else if (groupInfo.fullGroupPreferences.directMessages.on) {
-            OpenChatButton(onClick = { newDirectChat(contactId) })
-            if (connectionCode != null) {
-              SectionDivider()
-            }
-          }
-          if (connectionCode != null) {
-            VerifyCodeButton(member.verified, verifyClicked)
-          }
-        }
-        SectionSpacer()
-      }
+    SectionView {
+      OpenChatButton(openDirectChat)
    }
+    SectionSpacer()

    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
@@ -216,10 +159,12 @@ fun GroupMemberInfoLayout(
      }
    }
    SectionSpacer()
-    if (connStats != null) {
-      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchMemberAddress)
-      SectionDivider()
+    SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
+      if (developerTools) {
+        SwitchAddressButton(switchMemberAddress)
+        SectionDivider()
+      }
+      if (connStats != null) {
        val rcvServers = connStats.rcvServers
        val sndServers = connStats.sndServers
        if ((rcvServers != null && rcvServers.isNotEmpty()) || (sndServers != null && sndServers.isNotEmpty())) {
@@ -234,8 +179,8 @@ fun GroupMemberInfoLayout(
          }
        }
      }
-      SectionSpacer()
    }
+    SectionSpacer()

    if (member.canBeRemoved(groupInfo)) {
      SectionView {
@@ -262,17 +207,12 @@ fun GroupMemberInfoHeader(member: GroupMember) {
    horizontalAlignment = Alignment.CenterHorizontally
  ) {
    ProfileImage(size = 192.dp, member.image, color = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      if (member.verified) {
-        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = HighOrLowlight)
-      }
-      Text(
-        member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
+    Text(
+      member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
+      color = MaterialTheme.colors.onBackground,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis
+    )
    if (member.fullName != "" && member.fullName != member.displayName) {
      Text(
        member.fullName, style = MaterialTheme.typography.h2,
@@ -362,14 +302,10 @@ fun PreviewGroupMemberInfoLayout() {
      connStats = null,
      newRole = remember { mutableStateOf(GroupMemberRole.Member) },
      developerTools = false,
-      connectionCode = "123",
-      getContactChat = { Chat.sampleData },
-      knownDirectChat = {},
-      newDirectChat = {},
+      openDirectChat = {},
      removeMember = {},
      onRoleSelected = {},
      switchMemberAddress = {},
-      verifyClicked = {},
    )
  }
 }
@@ -1,183 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.TimedMessagesTTLPicker
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.PreferenceToggleWithIcon
-
-@Composable
-fun GroupPreferencesView(m: ChatModel, chatId: String, close: () -> Unit,) {
-  val groupInfo = remember { derivedStateOf { (m.getChat(chatId)?.chatInfo as? ChatInfo.Group)?.groupInfo } }
-  val gInfo = groupInfo.value ?: return
-  var preferences by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(gInfo.fullGroupPreferences) }
-  var currentPreferences by rememberSaveable(gInfo, stateSaver = serializableSaver()) { mutableStateOf(preferences) }
-
-  fun savePrefs(afterSave: () -> Unit = {}) {
-    withApi {
-      val gp = gInfo.groupProfile.copy(groupPreferences = preferences.toGroupPreferences())
-      val gInfo = m.controller.apiUpdateGroup(gInfo.groupId, gp)
-      if (gInfo != null) {
-        m.updateGroup(gInfo)
-        currentPreferences = preferences
-      }
-      afterSave()
-    }
-  }
-  ModalView(
-    close = {
-      if (preferences == currentPreferences) close()
-      else showUnsavedChangesAlert({ savePrefs(close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    GroupPreferencesLayout(
-      preferences,
-      currentPreferences,
-      gInfo,
-      applyPrefs = { prefs ->
-        preferences = prefs
-      },
-      reset = {
-        preferences = currentPreferences
-      },
-      savePrefs = ::savePrefs,
-    )
-  }
-}
-
-@Composable
-private fun GroupPreferencesLayout(
-  preferences: FullGroupPreferences,
-  currentPreferences: FullGroupPreferences,
-  groupInfo: GroupInfo,
-  applyPrefs: (FullGroupPreferences) -> Unit,
-  reset: () -> Unit,
-  savePrefs: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.group_preferences))
-    val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.enable) }
-    val onTTLUpdated = { ttl: Int? ->
-      applyPrefs(preferences.copy(timedMessages = preferences.timedMessages.copy(ttl = ttl ?: 86400)))
-    }
-    FeatureSection(GroupFeature.TimedMessages, timedMessages, groupInfo, preferences, onTTLUpdated) { enable ->
-      if (enable == GroupFeatureEnabled.ON) {
-         applyPrefs(preferences.copy(timedMessages = TimedMessagesGroupPreference(enable = enable, ttl = preferences.timedMessages.ttl ?: 86400)))
-      } else {
-        applyPrefs(preferences.copy(timedMessages = TimedMessagesGroupPreference(enable = enable, ttl = currentPreferences.timedMessages.ttl)))
-      }
-    }
-    SectionSpacer()
-    val allowDirectMessages = remember(preferences) { mutableStateOf(preferences.directMessages.enable) }
-    FeatureSection(GroupFeature.DirectMessages, allowDirectMessages, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(directMessages = GroupPreference(enable = it)))
-    }
-    SectionSpacer()
-    val allowFullDeletion = remember(preferences) { mutableStateOf(preferences.fullDelete.enable) }
-    FeatureSection(GroupFeature.FullDelete, allowFullDeletion, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(fullDelete = GroupPreference(enable = it)))
-    }
-    SectionSpacer()
-    val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.enable) }
-    FeatureSection(GroupFeature.Voice, allowVoice, groupInfo, preferences, onTTLUpdated) {
-      applyPrefs(preferences.copy(voice = GroupPreference(enable = it)))
-    }
-    if (groupInfo.canEdit) {
-      SectionSpacer()
-      ResetSaveButtons(
-        reset = reset,
-        save = savePrefs,
-        disabled = preferences == currentPreferences
-      )
-    }
-  }
-}
-
-@Composable
-private fun FeatureSection(
-  feature: GroupFeature,
-  enableFeature: State<GroupFeatureEnabled>,
-  groupInfo: GroupInfo,
-  preferences: FullGroupPreferences,
-  onTTLUpdated: (Int?) -> Unit,
-  onSelected: (GroupFeatureEnabled) -> Unit
-) {
-  SectionView {
-    val on = enableFeature.value == GroupFeatureEnabled.ON
-    val icon = if (on) feature.iconFilled else feature.icon
-    val iconTint = if (on) SimplexGreen else HighOrLowlight
-    val timedOn = feature == GroupFeature.TimedMessages && enableFeature.value == GroupFeatureEnabled.ON
-    if (groupInfo.canEdit) {
-      SectionItemView {
-        PreferenceToggleWithIcon(
-          feature.text,
-          icon,
-          iconTint,
-          enableFeature.value == GroupFeatureEnabled.ON,
-        ) { checked ->
-          onSelected(if (checked) GroupFeatureEnabled.ON else GroupFeatureEnabled.OFF)
-        }
-      }
-      if (timedOn) {
-        SectionDivider()
-        val ttl = rememberSaveable(preferences.timedMessages) { mutableStateOf(preferences.timedMessages.ttl) }
-        TimedMessagesTTLPicker(ttl, onTTLUpdated)
-      }
-    } else {
-      InfoRow(
-        feature.text,
-        enableFeature.value.text,
-        icon = icon,
-        iconTint = iconTint,
-      )
-      if (timedOn) {
-        SectionDivider()
-        InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(preferences.timedMessages.ttl))
-      }
-    }
-  }
-  SectionTextFooter(feature.enableDescription(enableFeature.value, groupInfo.canEdit))
-}
-
-@Composable
-private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-    SectionDivider()
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_group_members), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_group_members),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
@@ -136,13 +136,7 @@ fun GroupProfileLayout(
              if (enabled) {
                Text(
                  stringResource(R.string.save_group_profile),
-                  modifier = Modifier.clickable {
-                    saveProfile(groupProfile.copy(
-                      displayName = displayName.value,
-                      fullName = fullName.value,
-                      image = profileImage.value
-                    ))
-                  },
+                  modifier = Modifier.clickable { saveProfile(GroupProfile(displayName.value, fullName.value, profileImage.value)) },
                  color = MaterialTheme.colors.primary
                )
              } else {
@@ -1,94 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import SectionItemView
-import SectionSpacer
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
-  var groupInfo by remember { mutableStateOf(groupInfo) }
-  val welcomeText = remember { mutableStateOf(groupInfo.groupProfile.description ?: "") }
-
-  fun save(afterSave: () -> Unit = {}) {
-    withApi {
-      var welcome: String? = welcomeText.value.trim('\n', ' ')
-      if (welcome?.length == 0) {
-        welcome = null
-      }
-      val groupProfileUpdated = groupInfo.groupProfile.copy(description = welcome)
-      val res = m.controller.apiUpdateGroup(groupInfo.groupId, groupProfileUpdated)
-      if (res != null) {
-        groupInfo = res
-        m.updateGroup(res)
-        welcomeText.value = welcome ?: ""
-      }
-      afterSave()
-    }
-  }
-
-  ModalView(
-    close = {
-      if (welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)) close()
-      else showUnsavedChangesAlert({ save(close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    GroupWelcomeLayout(
-      welcomeText,
-      groupInfo,
-      save = ::save
-    )
-  }
-}
-
-@Composable
-private fun GroupWelcomeLayout(
-  welcomeText: MutableState<String>,
-  groupInfo: GroupInfo,
-  save: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.group_welcome_title))
-    val welcomeText = remember { welcomeText }
-    TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
-    SectionSpacer()
-    SaveButton(
-      save = save,
-      disabled = welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
-    )
-  }
-}
-
-@Composable
-private fun SaveButton(save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_update_group_profile), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_welcome_message_question),
-    confirmText = generalGetString(R.string.save_and_update_group_profile),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
@@ -24,7 +24,7 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat
    Modifier
      .padding(horizontal = 4.dp)
      .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-    @Composable fun ConnectingCallIcon() = Icon(Icons.Outlined.SettingsPhone, stringResource(R.string.icon_descr_call_connecting), tint = SimplexGreen)
+    @Composable fun ConnectingCallIcon() = Icon(Icons.Outlined.SettingsPhone, stringResource(R.string.icon_descr_call_connecting), tint = Color.Green)
    when (status) {
      CICallStatus.Pending -> if (sent) {
        Icon(Icons.Outlined.Call, stringResource(R.string.icon_descr_call_pending_sent))
@@ -38,7 +38,7 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat
      CICallStatus.Progress -> Icon(Icons.Filled.PhoneInTalk, stringResource(R.string.icon_descr_call_progress), tint = SimplexGreen)
      CICallStatus.Ended -> Row {
        Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_ended), tint = HighOrLowlight, modifier = Modifier.padding(end = 4.dp))
-        Text(durationText(duration), color = HighOrLowlight)
+        Text(status.duration(duration), color = HighOrLowlight)
      }
      CICallStatus.Error -> {}
    }
@@ -1,34 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.*
-
-@Composable
-fun CIChatFeatureView(
-  chatItem: ChatItem,
-  feature: Feature,
-  iconColor: Color,
-  icon: ImageVector? = null
-) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(icon ?: feature.iconFilled, feature.text, Modifier.size(18.dp), tint = iconColor)
-    Text(
-      chatEventText(chatItem),
-      Modifier,
-      // this is important. Otherwise, aligning will be bad because annotated string has a Span with size 12.sp
-      fontSize = 12.sp
-    )
-  }
-}
@@ -18,38 +18,32 @@ import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
 fun CIEventView(ci: ChatItem) {
-  @Composable
-  fun chatEventTextView(text: AnnotatedString) {
-    Text(text, style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp))
+  fun withGroupEventStyle(builder: AnnotatedString.Builder, text: String) {
+    return builder.withStyle(SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)) { append(text) }
  }

  Surface {
    Row(
      Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.CenterVertically
+      verticalAlignment = Alignment.Bottom
    ) {
-      val memberDisplayName = ci.memberDisplayName
-      if (memberDisplayName != null) {
-        chatEventTextView(
-          buildAnnotatedString {
-            withStyle(chatEventStyle) { append(memberDisplayName) }
+      Text(
+        buildAnnotatedString {
+          val memberDisplayName = ci.memberDisplayName
+          if (memberDisplayName != null) {
+            withGroupEventStyle(this, memberDisplayName)
            append(" ")
-          }.plus(chatEventText(ci))
-        )
-      } else {
-        chatEventTextView(chatEventText(ci))
-      }
+          }
+          withGroupEventStyle(this, ci.content.text)
+          append(" ")
+          withGroupEventStyle(this, ci.timestampText)
+        },
+        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
+      )
    }
  }
 }

-val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)
-
-fun chatEventText(ci: ChatItem): AnnotatedString =
-  buildAnnotatedString {
-    withStyle(chatEventStyle) { append(ci.content.text + "  " + ci.timestampText) }
-  }
-
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -1,54 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun CIFeaturePreferenceView(
-  chatItem: ChatItem,
-  contact: Contact?,
-  feature: ChatFeature,
-  allowed: FeatureAllowed,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
-) {
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.spacedBy(4.dp)
-  ) {
-    Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = HighOrLowlight)
-    if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
-      val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
-      val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
-      val acceptTextId = if (setParam) R.string.accept_feature_set_1_day else R.string.accept_feature
-      val param = if (setParam) 86400 else null
-      val annotatedText = buildAnnotatedString {
-        withStyle(chatEventStyle) { append(chatItem.content.text + "  ") }
-        withAnnotation(tag = "Accept", annotation = "Accept") {
-          withStyle(acceptStyle) { append(generalGetString(acceptTextId) + "  ") }
-        }
-        withStyle(chatEventStyle) { append(chatItem.timestampText) }
-      }
-      fun accept(offset: Int): Boolean = annotatedText.getStringAnnotations(tag = "Accept", start = offset, end = offset).isNotEmpty()
-      ClickableText(
-        annotatedText,
-        onClick = { if (accept(it)) { acceptFeature(contact, feature, param) } },
-        shouldConsumeEvent = ::accept
-      )
-    } else {
-      Text(chatItem.content.text + "  " + chatItem.timestampText,
-        fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)
-    }
-  }
-}
@@ -174,14 +174,14 @@ fun CIFileView(
 class ChatItemProvider: PreviewParameterProvider<ChatItem> {
  private val sentFile = ChatItem(
    chatDir = CIDirection.DirectSnd(),
-    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.SndSent(), itemEdited = true),
+    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.SndSent(), itemDeleted = false, itemEdited = true, editable = false),
    content = CIContent.SndMsgContent(msgContent = MsgContent.MCFile("")),
    quotedItem = null,
    file = CIFile.getSample(fileStatus = CIFileStatus.SndComplete)
  )
  private val fileChatItemWtFile = ChatItem(
    chatDir = CIDirection.DirectRcv(),
-    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), ),
+    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), itemDeleted = false, itemEdited = false, editable = false),
    content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile("")),
    quotedItem = null,
    file = null
@@ -205,6 +205,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
 fun PreviewCIFileFramedItemView(@PreviewParameter(ChatItemProvider::class) chatItem: ChatItem) {
  val showMenu = remember { mutableStateOf(false) }
  SimpleXTheme {
-    FramedItemView(ChatInfo.Direct.sampleData, chatItem, linkMode = SimplexLinkMode.DESCRIPTION, showMenu = showMenu, receiveFile = {})
+    FramedItemView(ChatInfo.Direct.sampleData, chatItem, showMenu = showMenu, receiveFile = {})
  }
 }
@@ -1,46 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import SectionSpacer
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun CIInvalidJSONView(json: String) {
-  Row(Modifier
-    .clickable { ModalManager.shared.showModal(true) { InvalidJSONView(json) } }
-    .padding(horizontal = 10.dp, vertical = 6.dp)
-  ) {
-    Text(stringResource(R.string.invalid_data), color = Color.Red, fontStyle = FontStyle.Italic)
-  }
-}
-
-@Composable
-fun InvalidJSONView(json: String) {
-  Column {
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    SectionView {
-      val context = LocalContext.current
-      SettingsActionItem(Icons.Outlined.Share, generalGetString(R.string.share_verb), click = {
-        shareText(context, json)
-      })
-    }
-    Column(Modifier.padding(DEFAULT_PADDING).fillMaxWidth().verticalScroll(rememberScrollState())) {
-      Text(json)
-    }
-  }
-}
@@ -3,86 +3,61 @@ package chat.simplex.app.views.chat.item
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Circle
-import androidx.compose.material.icons.outlined.Edit
-import androidx.compose.material.icons.outlined.Timer
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.HighOrLowlight
 import kotlinx.datetime.Clock

@Composable
-fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = HighOrLowlight) {
-  Row(Modifier.padding(start = 3.dp), verticalAlignment = Alignment.CenterVertically) {
-    if (chatItem.isDeletedContent) {
-      Text(
-        chatItem.timestampText,
-        color = metaColor,
-        fontSize = 14.sp,
-        modifier = Modifier.padding(start = 3.dp)
-      )
-    } else {
-      CIMetaText(chatItem.meta, timedMessagesTTL, metaColor)
+fun CIMetaView(chatItem: ChatItem, metaColor: Color = HighOrLowlight) {
+  Row(verticalAlignment = Alignment.CenterVertically) {
+    if (!chatItem.isDeletedContent) {
+      if (chatItem.meta.itemEdited) {
+        Icon(
+          Icons.Filled.Edit,
+          modifier = Modifier.height(12.dp).padding(end = 1.dp),
+          contentDescription = stringResource(R.string.icon_descr_edited),
+          tint = metaColor,
+        )
+      }
+      CIStatusView(chatItem.meta.itemStatus, metaColor)
    }
+    Text(
+      chatItem.timestampText,
+      color = metaColor,
+      fontSize = 14.sp,
+      modifier = Modifier.padding(start = 3.dp)
+    )
  }
 }

+
@Composable
-// changing this function requires updating reserveSpaceForMeta
-private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
-  if (meta.itemEdited) {
-    StatusIconText(Icons.Outlined.Edit, color)
-    Spacer(Modifier.width(3.dp))
-  }
-  if (meta.disappearing) {
-    StatusIconText(Icons.Outlined.Timer, color)
-    val ttl = meta.itemTimed?.ttl
-    if (ttl != chatTTL) {
-      Text(TimedMessagesPreference.shortTtlText(ttl), color = color, fontSize = 13.sp)
+fun CIStatusView(status: CIStatus, metaColor: Color = HighOrLowlight) {
+  when (status) {
+    is CIStatus.SndSent -> {
+      Icon(Icons.Filled.Check, stringResource(R.string.icon_descr_sent_msg_status_sent), Modifier.height(12.dp), tint = metaColor)
    }
-    Spacer(Modifier.width(4.dp))
-  }
-  val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color)
-  if (statusIcon != null) {
-    val (icon, statusColor) = statusIcon
-    StatusIconText(icon, statusColor)
-    Spacer(Modifier.width(4.dp))
-  } else if (!meta.disappearing) {
-    StatusIconText(Icons.Filled.Circle, Color.Transparent)
-    Spacer(Modifier.width(4.dp))
-  }
-  Text(meta.timestampText, color = color, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
-}
-
-// the conditions in this function should match CIMetaText
-fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?): String {
-  val iconSpace = "    "
-  var res = ""
-  if (meta.itemEdited) res += iconSpace
-  if (meta.itemTimed != null) {
-    res += iconSpace
-    val ttl = meta.itemTimed.ttl
-    if (ttl != chatTTL) {
-      res += TimedMessagesPreference.shortTtlText(ttl)
+    is CIStatus.SndErrorAuth -> {
+      Icon(Icons.Filled.Close,  stringResource(R.string.icon_descr_sent_msg_status_unauthorized_send), Modifier.height(12.dp), tint = Color.Red)
    }
+    is CIStatus.SndError -> {
+      Icon(Icons.Filled.WarningAmber, stringResource(R.string.icon_descr_sent_msg_status_send_failed), Modifier.height(12.dp), tint = Color.Yellow)
+    }
+    is CIStatus.RcvNew -> {
+      Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_received_msg_status_unread), Modifier.height(12.dp), tint = MaterialTheme.colors.primary)
+    }
+    else -> {}
  }
-  if (meta.statusIcon(HighOrLowlight) != null || !meta.disappearing) {
-    res += iconSpace
-  }
-  return res + meta.timestampText
-}
-
-@Composable
-private fun StatusIconText(icon: ImageVector, color: Color) {
-  Icon(icon, null, Modifier.height(12.dp), tint = color)
 }

@Preview
@@ -91,8 +66,7 @@ fun PreviewCIMetaView() {
  CIMetaView(
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-    ),
-    null
+    )
  )
 }

@@ -103,8 +77,7 @@ fun PreviewCIMetaViewUnread() {
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
      status = CIStatus.RcvNew()
-    ),
-    null
+    )
  )
 }

@@ -114,9 +87,8 @@ fun PreviewCIMetaViewSendFailed() {
  CIMetaView(
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      status = CIStatus.SndError("CMD SYNTAX")
-    ),
-    null
+      status = CIStatus.SndError(AgentErrorType.CMD(CommandErrorType.SYNTAX()))
+    )
  )
 }

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

@@ -137,8 +108,7 @@ fun PreviewCIMetaViewSendSent() {
  CIMetaView(
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello", status = CIStatus.SndSent()
-    ),
-    null
+    )
  )
 }

@@ -149,8 +119,7 @@ fun PreviewCIMetaViewEdited() {
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
      itemEdited = true
-    ),
-    null
+    )
  )
 }

@@ -162,8 +131,7 @@ fun PreviewCIMetaViewEditedUnread() {
      1, CIDirection.DirectRcv(), Clock.System.now(), "hello",
      itemEdited = true,
      status=CIStatus.RcvNew()
-    ),
-    null
+    )
  )
 }

@@ -175,8 +143,7 @@ fun PreviewCIMetaViewEditedSent() {
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
      itemEdited = true,
      status=CIStatus.SndSent()
-    ),
-    null
+    )
  )
 }

@@ -184,7 +151,6 @@ fun PreviewCIMetaViewEditedSent() {
@Composable
 fun PreviewCIMetaViewDeletedContent() {
  CIMetaView(
-    chatItem = ChatItem.getDeletedContentSampleData(),
-    null
+    chatItem = ChatItem.getDeletedContentSampleData()
  )
 }
@@ -1,6 +1,5 @@
 package chat.simplex.app.views.chat.item

-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -19,26 +18,26 @@ import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.*
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-
-// TODO refactor https://github.com/simplex-chat/simplex-chat/pull/1451#discussion_r1033429901
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive

@Composable
 fun CIVoiceView(
-  providedDurationSec: Int,
+  durationSec: Int,
  file: CIFile?,
  edited: Boolean,
  sent: Boolean,
  hasText: Boolean,
  ci: ChatItem,
-  timedMessagesTTL: Int?,
-  longClick: () -> Unit,
+  metaColor: Color
 ) {
  Row(
-    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = 6.dp, end = 6.dp),
+    Modifier.padding(top = 4.dp, bottom = 6.dp, start = 6.dp, end = 6.dp),
    verticalAlignment = Alignment.CenterVertically
  ) {
    if (file != null) {
@@ -46,27 +45,86 @@ fun CIVoiceView(
      val filePath = remember(file.filePath, file.fileStatus) { getLoadedFilePath(context, file) }
      var brokenAudio by rememberSaveable(file.filePath) { mutableStateOf(false) }
      val audioPlaying = rememberSaveable(file.filePath) { mutableStateOf(false) }
-      val progress = rememberSaveable(file.filePath) { mutableStateOf(0) }
-      val duration = rememberSaveable(file.filePath) { mutableStateOf(providedDurationSec * 1000) }
-      val play = {
-        AudioPlayer.play(filePath, audioPlaying, progress, duration, true)
+      val audioInfo = remember(file.filePath) {
+        file.audioInfo.value = file.audioInfo.value.copy(durationMs = durationSec * 1000)
+        file.audioInfo
+      }
+      val play = play@{
+        audioPlaying.value = AudioPlayer.start(filePath ?: return@play, audioInfo.value.progressMs) {
+          // If you want to preserve the position after switching a track, remove this line
+          audioInfo.value = ProgressAndDuration(0, audioInfo.value.durationMs)
+          audioPlaying.value = false
+        }
        brokenAudio = !audioPlaying.value
      }
      val pause = {
-        AudioPlayer.pause(audioPlaying, progress)
+        audioInfo.value = ProgressAndDuration(AudioPlayer.pause(), audioInfo.value.durationMs)
+        audioPlaying.value = false
      }
-      val text = remember {
-        derivedStateOf {
-          val time = when {
-            audioPlaying.value || progress.value != 0 -> progress.value
-            else -> duration.value
+      AudioInfoUpdater(filePath, audioPlaying, audioInfo)
+
+      val time = if (audioPlaying.value) audioInfo.value.progressMs else audioInfo.value.durationMs
+      val minWidth = with(LocalDensity.current) { 45.sp.toDp() }
+      val text = String.format("%02d:%02d", time / 1000 / 60, time / 1000 % 60)
+      if (hasText) {
+        VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, audioInfo, brokenAudio, play, pause)
+        Text(
+          text,
+          Modifier
+            .padding(start = 12.dp, end = 5.dp)
+            .widthIn(min = minWidth),
+          color = HighOrLowlight,
+          fontSize = 16.sp,
+          textAlign = TextAlign.Start,
+          maxLines = 1
+        )
+      } else {
+        if (sent) {
+          Row {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+              Spacer(Modifier.height(56.dp))
+              Text(
+                text,
+                Modifier
+                  .padding(end = 12.dp)
+                  .widthIn(min = minWidth),
+                color = HighOrLowlight,
+                fontSize = 16.sp,
+                maxLines = 1
+              )
+            }
+            Column {
+              VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, audioInfo, brokenAudio, play, pause)
+              Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+                CIMetaView(ci, metaColor)
+              }
+            }
+          }
+        } else {
+          Row {
+            Column {
+              VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, audioInfo, brokenAudio, play, pause)
+              Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+                CIMetaView(ci, metaColor)
+              }
+            }
+            Row(verticalAlignment = Alignment.CenterVertically) {
+              Text(
+                text,
+                Modifier
+                  .padding(start = 12.dp)
+                  .widthIn(min = minWidth),
+                color = HighOrLowlight,
+                fontSize = 16.sp,
+                maxLines = 1
+              )
+              Spacer(Modifier.height(56.dp))
+            }
          }
-          durationText(time / 1000)
        }
      }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick)
    } else {
-      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick)
+      VoiceMsgIndicator(null, false, sent, hasText, null, false, {}, {})
      val metaReserve = if (edited)
        "                     "
      else
@@ -76,73 +134,6 @@ fun CIVoiceView(
  }
 }

-@Composable
-private fun VoiceLayout(
-  file: CIFile,
-  ci: ChatItem,
-  text: State<String>,
-  audioPlaying: State<Boolean>,
-  progress: State<Int>,
-  duration: State<Int>,
-  brokenAudio: Boolean,
-  sent: Boolean,
-  hasText: Boolean,
-  timedMessagesTTL: Int?,
-  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
-) {
-  when {
-    hasText -> {
-      Spacer(Modifier.width(6.dp))
-      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-      DurationText(text, PaddingValues(start = 12.dp))
-    }
-    sent -> {
-      Row {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          Spacer(Modifier.height(56.dp))
-          DurationText(text, PaddingValues(end = 12.dp))
-        }
-        Column {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
-            CIMetaView(ci, timedMessagesTTL)
-          }
-        }
-      }
-    }
-    else -> {
-      Row {
-        Column {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
-          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
-            CIMetaView(ci, timedMessagesTTL)
-          }
-        }
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          DurationText(text, PaddingValues(start = 12.dp))
-          Spacer(Modifier.height(56.dp))
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun DurationText(text: State<String>, padding: PaddingValues) {
-  val minWidth = with(LocalDensity.current) { 45.sp.toDp() }
-  Text(
-    text.value,
-    Modifier
-      .padding(padding)
-      .widthIn(min = minWidth),
-    color = HighOrLowlight,
-    fontSize = 16.sp,
-    maxLines = 1
-  )
-}
-
@Composable
 private fun PlayPauseButton(
  audioPlaying: Boolean,
@@ -153,21 +144,17 @@ private fun PlayPauseButton(
  enabled: Boolean,
  error: Boolean,
  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
+  pause: () -> Unit
 ) {
  Surface(
+    onClick = { if (!audioPlaying) play() else pause() },
    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
    color = if (sent) SentColorLight else ReceivedColorLight,
    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
  ) {
    Box(
      Modifier
-        .defaultMinSize(minWidth = 56.dp, minHeight = 56.dp)
-        .combinedClickable(
-          onClick = { if (!audioPlaying) play() else pause() },
-          onLongClick = longClick
-        ),
+        .defaultMinSize(minWidth = 56.dp, minHeight = 56.dp),
      contentAlignment = Alignment.Center
    ) {
      Icon(
@@ -186,19 +173,17 @@ private fun VoiceMsgIndicator(
  audioPlaying: Boolean,
  sent: Boolean,
  hasText: Boolean,
-  progress: State<Int>?,
-  duration: State<Int>?,
+  audioInfo: State<ProgressAndDuration>?,
  error: Boolean,
  play: () -> Unit,
-  pause: () -> Unit,
-  longClick: () -> Unit
+  pause: () -> Unit
 ) {
-  val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
+  val strokeWidth = with(LocalDensity.current){ 3.dp.toPx() }
  val strokeColor = MaterialTheme.colors.primary
-  if (file != null && file.loaded && progress != null && duration != null) {
-    val angle = 360f * (progress.value.toDouble() / duration.value).toFloat()
+  if (file != null && file.loaded && audioInfo != null) {
+    val angle = 360f * (audioInfo.value.progressMs.toDouble() / audioInfo.value.durationMs).toFloat()
    if (hasText) {
-      IconButton({ if (!audioPlaying) play() else pause() }, Modifier.size(56.dp).drawRingModifier(angle, strokeColor, strokeWidth)) {
+      IconButton({ if (!audioPlaying) play() else pause() }, Modifier.drawRingModifier(angle, strokeColor, strokeWidth)) {
        Icon(
          imageVector = if (audioPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
          contentDescription = null,
@@ -207,13 +192,12 @@ private fun VoiceMsgIndicator(
        )
      }
    } else {
-      PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause, longClick = longClick)
+      PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause)
    }
  } else {
    if (file?.fileStatus == CIFileStatus.RcvInvitation
      || file?.fileStatus == CIFileStatus.RcvTransfer
-      || file?.fileStatus == CIFileStatus.RcvAccepted
-    ) {
+      || file?.fileStatus == CIFileStatus.RcvAccepted) {
      Box(
        Modifier
          .size(56.dp)
@@ -223,7 +207,7 @@ private fun VoiceMsgIndicator(
        ProgressIndicator()
      }
    } else {
-      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, false, false, {}, {}, longClick)
+      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, false, false, {}, {})
    }
  }
 }
@@ -258,3 +242,26 @@ private fun ProgressIndicator() {
    strokeWidth = 4.dp
  )
 }
+
+@Composable
+fun AudioInfoUpdater(
+  filePath: String?,
+  audioPlaying: MutableState<Boolean>,
+  audioInfo: MutableState<ProgressAndDuration>
+) {
+  LaunchedEffect(filePath) {
+    if (filePath != null && audioInfo.value.durationMs == 0) {
+      audioInfo.value = ProgressAndDuration(audioInfo.value.progressMs, AudioPlayer.duration(filePath))
+    }
+  }
+  LaunchedEffect(audioPlaying.value) {
+    while (isActive && audioPlaying.value) {
+      audioInfo.value = AudioPlayer.progressAndDurationOrEnded()
+      if (audioInfo.value.progressMs == audioInfo.value.durationMs) {
+        audioInfo.value = ProgressAndDuration(0, audioInfo.value.durationMs)
+        audioPlaying.value = false
+      }
+      delay(50)
+    }
+  }
+}
@@ -1,7 +1,5 @@
 package chat.simplex.app.views.chat.item

-import android.Manifest
-import android.os.Build
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -22,16 +20,12 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.ComposeContextItem
 import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.helpers.*
-import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.datetime.Clock

-// TODO refactor so that FramedItemView can show all CIContent items if they're deleted (see Swift code)
-
@Composable
 fun ChatItemView(
  cInfo: ChatInfo,
@@ -40,25 +34,18 @@ fun ChatItemView(
  imageProvider: (() -> ImageGalleryProvider)? = null,
  showMember: Boolean = false,
  useLinkPreviews: Boolean,
-  linkMode: SimplexLinkMode,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  receiveFile: (Long) -> Unit,
  joinGroup: (Long) -> Unit,
  acceptCall: (Contact) -> Unit,
  scrollToItem: (Long) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
 ) {
  val context = LocalContext.current
  val uriHandler = LocalUriHandler.current
  val sent = cItem.chatDir.sent
  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
  val showMenu = remember { mutableStateOf(false) }
-  val revealed = remember { mutableStateOf(false) }
-  val fullDeleteAllowed = remember(cInfo) { cInfo.featureEnabled(ChatFeature.FullDelete) }
  val saveFileLauncher = rememberSaveFileLauncher(cxt = context, ciFile = cItem.file)
-  val onLinkLongClick = { _: String -> showMenu.value = true }
-  val live = composeState.value.liveMessage != null
-
  Box(
    modifier = Modifier
      .padding(bottom = 4.dp)
@@ -71,7 +58,7 @@ fun ChatItemView(
          showMsgDeliveryErrorAlert(generalGetString(R.string.message_delivery_error_desc))
        }
        is CIStatus.SndError -> {
-          showMsgDeliveryErrorAlert(generalGetString(R.string.unknown_error) + ": ${cItem.meta.itemStatus.agentError}")
+          showMsgDeliveryErrorAlert(generalGetString(R.string.unknown_error) + ": ${cItem.meta.itemStatus.agentError.string}")
        }
        else -> {}
      }
@@ -81,44 +68,26 @@ fun ChatItemView(
        .clip(RoundedCornerShape(18.dp))
        .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
    ) {
-      @Composable
-      fun framedItemView() {
-        FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
-      }
-
-      fun deleteMessageQuestionText(): String {
-        return if (fullDeleteAllowed) {
-          generalGetString(R.string.delete_message_cannot_be_undone_warning)
+      @Composable fun ContentItem() {
+        if (cItem.file == null && cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
+          EmojiItemView(cItem)
        } else {
-          generalGetString(R.string.delete_message_mark_deleted_warning)
+          val onLinkLongClick = { _: String -> showMenu.value = true }
+          FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, showMenu, receiveFile, onLinkLongClick, scrollToItem)
        }
-      }
-
-      fun moderateMessageQuestionText(): String {
-        return if (fullDeleteAllowed) {
-          generalGetString(R.string.moderate_message_will_be_deleted_warning)
-        } else {
-          generalGetString(R.string.moderate_message_will_be_marked_warning)
-        }
-      }
-
-      @Composable
-      fun MsgContentItemDropdownMenu() {
        DropdownMenu(
          expanded = showMenu.value,
          onDismissRequest = { showMenu.value = false },
          Modifier.width(220.dp)
        ) {
-          if (cItem.meta.itemDeleted == null && !live) {
-            ItemAction(stringResource(R.string.reply_verb), Icons.Outlined.Reply, onClick = {
-              if (composeState.value.editing) {
-                composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-              } else {
-                composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-              }
-              showMenu.value = false
-            })
-          }
+          ItemAction(stringResource(R.string.reply_verb), Icons.Outlined.Reply, onClick = {
+            if (composeState.value.editing) {
+              composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+            } else {
+              composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+            }
+            showMenu.value = false
+          })
          ItemAction(stringResource(R.string.share_verb), Icons.Outlined.Share, onClick = {
            val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
            when {
@@ -134,16 +103,9 @@ fun ChatItemView(
          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
            val filePath = getLoadedFilePath(context, cItem.file)
            if (filePath != null) {
-              val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
              ItemAction(stringResource(R.string.save_verb), Icons.Outlined.SaveAlt, onClick = {
                when (cItem.content.msgContent) {
-                  is MsgContent.MCImage -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
-                      saveImage(context, cItem.file)
-                    } else {
-                      writePermissionState.launchPermissionRequest()
-                    }
-                  }
+                  is MsgContent.MCImage -> saveImage(context, cItem.file)
                  is MsgContent.MCFile -> saveFileLauncher.launch(cItem.file?.fileName)
                  is MsgContent.MCVoice -> saveFileLauncher.launch(cItem.file?.fileName)
                  else -> {}
@@ -152,84 +114,40 @@ fun ChatItemView(
              })
            }
          }
-          if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
+          if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice) {
            ItemAction(stringResource(R.string.edit_verb), Icons.Filled.Edit, onClick = {
              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
              showMenu.value = false
            })
          }
-          if (cItem.meta.itemDeleted != null && revealed.value) {
-            ItemAction(
-              stringResource(R.string.hide_verb),
-              Icons.Outlined.VisibilityOff,
-              onClick = {
-                revealed.value = false
-                showMenu.value = false
-              }
-            )
-          }
-          if (!(live && cItem.meta.isLive)) {
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-          val groupInfo = cItem.memberToModerate(cInfo)?.first
-          if (groupInfo != null) {
-            ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
-          }
-        }
-      }
-
-      @Composable
-      fun MarkedDeletedItemDropdownMenu() {
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          if (!cItem.isDeletedContent) {
-            ItemAction(
-              stringResource(R.string.reveal_verb),
-              Icons.Outlined.Visibility,
-              onClick = {
-                revealed.value = true
-                showMenu.value = false
-              }
-            )
-          }
-          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-        }
-      }
-
-      @Composable
-      fun ContentItem() {
-        val mc = cItem.content.msgContent
-        if (cItem.meta.itemDeleted != null && !revealed.value) {
-          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          MarkedDeletedItemDropdownMenu()
-        } else if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
-          if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-            EmojiItemView(cItem, cInfo.timedMessagesTTL)
-            MsgContentItemDropdownMenu()
-          } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-            CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") })
-            MsgContentItemDropdownMenu()
-          } else {
-            framedItemView()
-            MsgContentItemDropdownMenu()
-          }
-        } else {
-          framedItemView()
-          MsgContentItemDropdownMenu()
+          ItemAction(
+            stringResource(R.string.delete_verb),
+            Icons.Outlined.Delete,
+            onClick = {
+              showMenu.value = false
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
+          )
        }
      }

      @Composable fun DeletedItem() {
-        DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        DeletedItemView(cItem, showMember = showMember)
        DropdownMenu(
          expanded = showMenu.value,
          onDismissRequest = { showMenu.value = false },
          Modifier.width(220.dp)
        ) {
-          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
+          ItemAction(
+            stringResource(R.string.delete_verb),
+            Icons.Outlined.Delete,
+            onClick = {
+              showMenu.value = false
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
+          )
        }
      }

@@ -244,68 +162,18 @@ fun ChatItemView(
        is CIContent.RcvDeleted -> DeletedItem()
        is CIContent.SndCall -> CallItem(c.status, c.duration)
        is CIContent.RcvCall -> CallItem(c.status, c.duration)
-        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, showMember = showMember)
        is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
        is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
        is CIContent.RcvGroupEventContent -> CIEventView(cItem)
        is CIContent.SndGroupEventContent -> CIEventView(cItem)
        is CIContent.RcvConnEventContent -> CIEventView(cItem)
        is CIContent.SndConnEventContent -> CIEventView(cItem)
-        is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-        is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-        is CIContent.RcvChatPreference -> {
-          val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
-          CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
-        }
-        is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, HighOrLowlight, icon = c.feature.icon,)
-        is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-        is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-        is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
-        is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
-        is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
      }
    }
  }
 }

-@Composable
-fun DeleteItemAction(
-  cItem: ChatItem,
-  showMenu: MutableState<Boolean>,
-  questionText: String,
-  deleteMessage: (Long, CIDeleteMode) -> Unit
-) {
-  ItemAction(
-    stringResource(R.string.delete_verb),
-    Icons.Outlined.Delete,
-    onClick = {
-      showMenu.value = false
-      deleteMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
-    },
-    color = Color.Red
-  )
-}
-
-@Composable
-fun ModerateItemAction(
-  cItem: ChatItem,
-  questionText: String,
-  showMenu: MutableState<Boolean>,
-  deleteMessage: (Long, CIDeleteMode) -> Unit
-) {
-  ItemAction(
-    stringResource(R.string.moderate_verb),
-    Icons.Outlined.Flag,
-    onClick = {
-      showMenu.value = false
-      moderateMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
-    },
-    color = Color.Red
-  )
-}
-
@Composable
 fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
  DropdownMenuItem(onClick) {
@@ -323,10 +191,10 @@ fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Colo
  }
 }

-fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
+fun deleteMessageAlertDialog(chatItem: ChatItem, deleteMessage: (Long, CIDeleteMode) -> Unit) {
  AlertManager.shared.showAlertDialogButtons(
    title = generalGetString(R.string.delete_message__question),
-    text = questionText,
+    text = generalGetString(R.string.delete_message_cannot_be_undone_warning),
    buttons = {
      Row(
        Modifier
@@ -350,18 +218,6 @@ fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMes
  )
 }

-fun moderateMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMessage: (Long, CIDeleteMode) -> Unit) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_member_message__question),
-    text = questionText,
-    confirmText = generalGetString(R.string.delete_verb),
-    destructive = true,
-    onConfirm = {
-      deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
-    }
-  )
-}
-
 private fun showMsgDeliveryErrorAlert(description: String) {
  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.message_delivery_error_title),
@@ -379,14 +235,12 @@ fun PreviewChatItemView() {
        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
      ),
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
      deleteMessage = { _, _ -> },
      receiveFile = {},
      joinGroup = {},
      acceptCall = { _ -> },
      scrollToItem = {},
-      acceptFeature = { _, _, _ -> }
    )
  }
 }
@@ -399,14 +253,12 @@ fun PreviewChatItemViewDeletedContent() {
      ChatInfo.Direct.sampleData,
      ChatItem.getDeletedContentSampleData(),
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
      deleteMessage = { _, _ -> },
      receiveFile = {},
      joinGroup = {},
      acceptCall = { _ -> },
      scrollToItem = {},
-      acceptFeature = { _, _, _ -> }
    )
  }
 }
@@ -1,7 +1,8 @@
 package chat.simplex.app.views.chat.item

 import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
@@ -17,11 +18,10 @@ import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
-fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  val sent = ci.chatDir.sent
+fun DeletedItemView(ci: ChatItem, showMember: Boolean = false) {
  Surface(
    shape = RoundedCornerShape(18.dp),
-    color = if (sent) SentColorLight else ReceivedColorLight,
+    color = ReceivedColorLight,
  ) {
    Row(
      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -35,7 +35,7 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean =
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
        modifier = Modifier.padding(end = 8.dp)
      )
-      CIMetaView(ci, timedMessagesTTL)
+      CIMetaView(ci)
    }
  }
 }
@@ -49,8 +49,7 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean =
 fun PreviewDeletedItemView() {
  SimpleXTheme {
    DeletedItemView(
-      ChatItem.getDeletedContentSampleData(),
-      null
+      ChatItem.getDeletedContentSampleData()
    )
  }
 }
@@ -15,13 +15,13 @@ val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp)
 val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp)

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

@@ -5,9 +5,8 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Flag
+import androidx.compose.material.icons.filled.InsertDriveFile
+import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -15,22 +14,19 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.*
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.util.fastMap
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.helpers.ChatItemLinkView
+import chat.simplex.app.views.helpers.base64ToBitmap
 import kotlinx.datetime.Clock
-import kotlin.math.min

 val SentColorLight = Color(0x1E45B8FF)
 val ReceivedColorLight = Color(0x20B1B0B5)
@@ -44,14 +40,12 @@ fun FramedItemView(
  uriHandler: UriHandler? = null,
  imageProvider: (() -> ImageGalleryProvider)? = null,
  showMember: Boolean = false,
-  linkMode: SimplexLinkMode,
  showMenu: MutableState<Boolean>,
  receiveFile: (Long) -> Unit,
  onLinkLongClick: (link: String) -> Unit = {},
  scrollToItem: (Long) -> Unit = {},
 ) {
  val sent = ci.chatDir.sent
-  val chatTTL = chatInfo.timedMessagesTTL

  fun membership(): GroupMember? {
    return if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.membership else null
@@ -63,40 +57,13 @@ fun FramedItemView(
      Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
      contentAlignment = Alignment.TopStart
    ) {
+      val text = if (qi.content is MsgContent.MCVoice && qi.text.isEmpty())
+        qi.content.toTextWithDuration(true)
+      else
+        qi.text
      MarkdownText(
-        qi.text, qi.formattedText, sender = qi.sender(membership()), senderBold = true, maxLines = 3,
-        style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface),
-        linkMode = linkMode
-      )
-    }
-  }
-
-  @Composable
-  fun FramedItemHeader(caption: String, italic: Boolean, icon: ImageVector? = null) {
-    Row(
-      Modifier
-        .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
-        .fillMaxWidth()
-        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (ci.quotedItem == null) 6.dp else 0.dp),
-      horizontalArrangement = Arrangement.spacedBy(4.dp),
-    ) {
-      if (icon != null) {
-        Icon(
-          icon,
-          caption,
-          Modifier.size(18.dp),
-          tint = if (isInDarkTheme()) FileDark else FileLight
-        )
-      }
-      Text(
-        buildAnnotatedString {
-          withStyle(SpanStyle(fontSize = 12.sp, fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal, color = HighOrLowlight)) {
-            append(caption)
-          }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis
+        text, qi.formattedText, sender = qi.sender(membership()), senderBold = true, maxLines = 3,
+        style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface)
      )
    }
  }
@@ -130,7 +97,7 @@ fun FramedItemView(
            ciQuotedMsgView(qi)
          }
          Icon(
-            if (qi.content is MsgContent.MCFile) Icons.Filled.InsertDriveFile else Icons.Filled.Mic,
+            if (qi.content is MsgContent.MCFile) Icons.Filled.InsertDriveFile else Icons.Filled.PlayArrow,
            if (qi.content is MsgContent.MCFile) stringResource(R.string.icon_descr_file) else stringResource(R.string.voice_message),
            Modifier
              .padding(top = 6.dp, end = 4.dp)
@@ -143,16 +110,7 @@ fun FramedItemView(
    }
  }

-  @Composable
-  fun ciFileView(ci: ChatItem, text: String) {
-    CIFileView(ci.file, ci.meta.itemEdited, receiveFile)
-    if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(ci, chatTTL, showMember, linkMode = linkMode, uriHandler)
-    }
-  }
-
-  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage) && !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null
-
+  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVoice) && ci.content.text.isEmpty() && ci.quotedItem == null
  Box(Modifier
    .clip(RoundedCornerShape(18.dp))
    .background(
@@ -166,17 +124,8 @@ fun FramedItemView(
    Box(contentAlignment = Alignment.BottomEnd) {
      Column(Modifier.width(IntrinsicSize.Max)) {
        PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
-          if (ci.meta.itemDeleted != null) {
-            if (ci.meta.itemDeleted is CIDeleted.Moderated) {
-              FramedItemHeader(String.format(stringResource(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, Icons.Outlined.Flag)
-            } else {
-              FramedItemHeader(stringResource(R.string.marked_deleted_description), true, Icons.Outlined.Delete)
-            }
-          } else if (ci.meta.isLive) {
-            FramedItemHeader(stringResource(R.string.live), false)
-          }
          ci.quotedItem?.let { ciQuoteView(it) }
-          if (ci.file == null && ci.formattedText == null && !ci.meta.isLive && isShortEmoji(ci.content.text)) {
+          if (ci.file == null && ci.formattedText == null && isShortEmoji(ci.content.text)) {
            Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
              Column(
                Modifier
@@ -192,36 +141,37 @@ fun FramedItemView(
            when (val mc = ci.content.msgContent) {
              is MsgContent.MCImage -> {
                CIImageView(image = mc.image, file = ci.file, imageProvider ?: return@PriorityLayout, showMenu, receiveFile)
-                if (mc.text == "" && !ci.meta.isLive) {
+                if (mc.text == "") {
                  metaColor = Color.White
                } else {
-                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
+                  CIMarkdownText(ci, showMember, uriHandler)
                }
              }
              is MsgContent.MCVoice -> {
-                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") })
+                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, mc.text != "" || ci.quotedItem != null, ci, metaColor)
                if (mc.text != "") {
-                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
+                  CIMarkdownText(ci, showMember, uriHandler)
                }
              }
-              is MsgContent.MCFile -> ciFileView(ci, mc.text)
-              is MsgContent.MCUnknown ->
-                if (ci.file == null) {
-                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
-                } else {
-                  ciFileView(ci, mc.text)
+              is MsgContent.MCFile -> {
+                CIFileView(ci.file, ci.meta.itemEdited, receiveFile)
+                if (mc.text != "") {
+                  CIMarkdownText(ci, showMember, uriHandler)
                }
+              }
              is MsgContent.MCLink -> {
                ChatItemLinkView(mc.preview)
-                CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
+                CIMarkdownText(ci, showMember, uriHandler, onLinkLongClick)
              }
-              else -> CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler, onLinkLongClick)
+              else -> CIMarkdownText(ci, showMember, uriHandler, onLinkLongClick)
            }
          }
        }
      }
-      Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
-        CIMetaView(ci, chatTTL, metaColor)
+      if (ci.content.msgContent !is MsgContent.MCVoice || ci.content.text.isNotEmpty()) {
+        Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
+          CIMetaView(ci, metaColor)
+        }
      }
    }
  }
@@ -230,29 +180,20 @@ fun FramedItemView(
@Composable
 fun CIMarkdownText(
  ci: ChatItem,
-  chatTTL: Int?,
  showMember: Boolean,
-  linkMode: SimplexLinkMode,
  uriHandler: UriHandler?,
  onLinkLongClick: (link: String) -> Unit = {}
 ) {
  Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-    val text = if (ci.meta.isLive) ci.content.msgContent?.text ?: ci.text else ci.text
    MarkdownText(
-      text, if (text.isEmpty()) emptyList() else ci.formattedText, if (showMember) ci.memberDisplayName else null,
-      meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
+      ci.content.text, ci.formattedText, if (showMember) ci.memberDisplayName else null,
+      metaText = ci.timestampText, edited = ci.meta.itemEdited,
      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick
    )
  }
 }

 const val CHAT_IMAGE_LAYOUT_ID = "chatImage"
-/**
- * Equal to [androidx.compose.ui.unit.Constraints.MaxFocusMask], which is 0x3FFFF - 1
- * Other values make a crash `java.lang.IllegalArgumentException: Can't represent a width of 123456 and height of 9909 in Constraints`
- * See [androidx.compose.ui.unit.Constraints.createConstraints]
- * */
-const val MAX_SAFE_WIDTH = 0x3FFFF - 1

@Composable
 fun PriorityLayout(
@@ -260,17 +201,6 @@ fun PriorityLayout(
  priorityLayoutId: String,
  content: @Composable () -> Unit
 ) {
-  /**
-  * Limiting max value for height + width in order to not crash the app, see [androidx.compose.ui.unit.Constraints.createConstraints]
-  * */
-  fun maxSafeHeight(width: Int) = when { // width bits + height bits should be <= 31
-    width < 0x1FFF /*MaxNonFocusMask*/ -> 0x3FFFF - 1 /* MaxFocusMask */ // 13 bits width + 18 bits height
-    width < 0x7FFF /*MinNonFocusMask*/ -> 0xFFFF - 1 /* MinFocusMask */ // 15 bits width + 16 bits height
-    width < 0xFFFF /*MinFocusMask*/ -> 0x7FFF - 1 /* MinFocusMask */ // 16 bits width + 15 bits height
-    width < 0x3FFFF /*MaxFocusMask*/ -> 0x1FFF - 1 /* MaxNonFocusMask */ // 18 bits width + 13 bits height
-    else -> 0x1FFF // shouldn't happen since width is limited already
-  }
-
  Layout(
    content = content,
    modifier = modifier
@@ -282,11 +212,9 @@ fun PriorityLayout(
      if (it.layoutId == priorityLayoutId)
        imagePlaceable!!
      else
-        it.measure(constraints.copy(maxWidth = imagePlaceable?.width ?: min(MAX_SAFE_WIDTH, constraints.maxWidth))) }
-    // Limit width for every other element to width of important element and height for a sum of all elements.
-    val width = imagePlaceable?.measuredWidth ?: min(MAX_SAFE_WIDTH, placeables.maxOf { it.width })
-    val height = minOf(maxSafeHeight(width), placeables.sumOf { it.height })
-    layout(width, height) {
+        it.measure(constraints.copy(maxWidth = imagePlaceable?.width ?: constraints.maxWidth)) }
+    // Limit width for every other element to width of important element and height for a sum of all elements
+    layout(imagePlaceable?.measuredWidth ?: placeables.maxOf { it.width }, placeables.sumOf { it.height }) {
      var y = 0
      placeables.forEach {
        it.place(0, y)
@@ -310,7 +238,6 @@ fun PreviewTextItemViewSnd(@PreviewParameter(EditedProvider::class) edited: Bool
      ChatItem.getSampleData(
        1, CIDirection.DirectSnd(), Clock.System.now(), "hello", itemEdited = edited,
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -327,7 +254,6 @@ fun PreviewTextItemViewRcv(@PreviewParameter(EditedProvider::class) edited: Bool
      ChatItem.getSampleData(
        1, CIDirection.DirectRcv(), Clock.System.now(), "hello", itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -348,7 +274,6 @@ fun PreviewTextItemViewLong(@PreviewParameter(EditedProvider::class) edited: Boo
        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -370,7 +295,6 @@ fun PreviewTextItemViewQuote(@PreviewParameter(EditedProvider::class) edited: Bo
        quotedItem = CIQuote.getSample(1, Clock.System.now(), "hi", chatDir = CIDirection.DirectRcv()),
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -392,7 +316,6 @@ fun PreviewTextItemViewEmoji(@PreviewParameter(EditedProvider::class) edited: Bo
        quotedItem = CIQuote.getSample(1, Clock.System.now(), "Lorem ipsum dolor sit amet", chatDir = CIDirection.DirectRcv()),
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -421,7 +344,6 @@ fun PreviewQuoteWithTextAndImage(@PreviewParameter(EditedProvider::class) edited
        quotedItem = ciQuote,
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -450,7 +372,6 @@ fun PreviewQuoteWithLongTextAndImage(@PreviewParameter(EditedProvider::class) ed
        quotedItem = ciQuote,
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -478,7 +399,6 @@ fun PreviewQuoteWithLongTextAndFile(@PreviewParameter(EditedProvider::class) edi
        quotedItem = ciQuote,
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -77,14 +77,12 @@ fun ImageFullScreenView(imageProvider: () -> ImageGalleryProvider, close: () ->
      val image = provider.getImage(index)
      if (image == null) {
        // No such image. Let's shrink total pages size or scroll to start of the list of pages to remove blank page automatically
-        SideEffect {
-          scope.launch {
-            when (settledCurrentPage) {
-              index - 1 -> provider.totalImagesSize.value = settledCurrentPage + 1
-              index + 1 -> {
-                provider.scrollToStart()
-                pagerState.scrollToPage(0)
-              }
+        scope.launch {
+          when (settledCurrentPage) {
+            index - 1 -> provider.totalImagesSize.value = settledCurrentPage + 1
+            index + 1 -> {
+              provider.scrollToStart()
+              pagerState.scrollToPage(0)
            }
          }
        }
@@ -22,7 +22,7 @@ import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.generalGetString

@Composable
-fun IntegrityErrorItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
+fun IntegrityErrorItemView(ci: ChatItem, showMember: Boolean = false) {
  Surface(
    Modifier.clickable(onClick = {
      AlertManager.shared.showAlertMsg(
@@ -45,7 +45,7 @@ fun IntegrityErrorItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boo
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
        modifier = Modifier.padding(end = 8.dp)
      )
-      CIMetaView(ci, timedMessagesTTL)
+      CIMetaView(ci)
    }
  }
 }
@@ -59,8 +59,7 @@ fun IntegrityErrorItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boo
 fun IntegrityErrorItemViewPreview() {
  SimpleXTheme {
    IntegrityErrorItemView(
-      ChatItem.getDeletedContentSampleData(),
-      null
+      ChatItem.getDeletedContentSampleData()
    )
  }
 }
@@ -1,72 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.CIDeleted
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (ci.chatDir.sent) SentColorLight else ReceivedColorLight,
-  ) {
-    Row(
-      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Box(Modifier.fillMaxWidth().weight(1f)) {
-        if (ci.meta.itemDeleted is CIDeleted.Moderated) {
-          MarkedDeletedText(String.format(generalGetString(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName))
-        } else {
-          MarkedDeletedText(generalGetString(R.string.marked_deleted_description))
-        }
-      }
-      CIMetaView(ci, timedMessagesTTL)
-    }
-  }
-}
-
-@Composable
-private fun MarkedDeletedText(text: String) {
-  Text(
-    buildAnnotatedString {
-      // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
-      withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(text) }
-    },
-    style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-    modifier = Modifier.padding(end = 8.dp),
-    maxLines = 1,
-    overflow = TextOverflow.Ellipsis,
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewMarkedDeletedItemView() {
-  SimpleXTheme {
-    DeletedItemView(
-      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted()),
-      null
-    )
-  }
-}
@@ -1,30 +1,20 @@
 package chat.simplex.app.views.chat.item

-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.util.Log
-import androidx.annotation.IntRange
 import androidx.compose.foundation.text.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import androidx.core.text.BidiFormatter
-import chat.simplex.app.TAG
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.views.helpers.detectGesture
-import kotlinx.coroutines.*

 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
@@ -46,101 +36,42 @@ fun appendSender(b: AnnotatedString.Builder, sender: String?, senderBold: Boolea
  }
 }

-private val noTyping: AnnotatedString = AnnotatedString("   ")
-
-private val typingIndicators: List<AnnotatedString> = listOf(
-  typing(FontWeight.Black) + typing() + typing(),
-  typing(FontWeight.Bold) + typing(FontWeight.Black) + typing(),
-  typing() + typing(FontWeight.Bold) + typing(FontWeight.Black),
-  typing() + typing() + typing(FontWeight.Bold)
-)
-
-
-private fun typingIndicator(recent: Boolean, @IntRange (from = 0, to = 4) typingIdx: Int): AnnotatedString = buildAnnotatedString {
-  pushStyle(SpanStyle(color = HighOrLowlight, fontFamily = FontFamily.Monospace, letterSpacing = (-1).sp))
-  append(if (recent) typingIndicators[typingIdx] else noTyping)
-}
-
-private fun typing(w: FontWeight = FontWeight.Light): AnnotatedString =
-  AnnotatedString(".", SpanStyle(fontWeight = w))
-
@Composable
 fun MarkdownText (
-  text: CharSequence,
+  text: String,
  formattedText: List<FormattedText>? = null,
  sender: String? = null,
-  meta: CIMeta? = null,
-  chatTTL: Int? = null,
+  metaText: String? = null,
+  edited: Boolean = false,
  style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
  maxLines: Int = Int.MAX_VALUE,
  overflow: TextOverflow = TextOverflow.Clip,
  uriHandler: UriHandler? = null,
  senderBold: Boolean = false,
  modifier: Modifier = Modifier,
-  linkMode: SimplexLinkMode,
-  inlineContent: Map<String, InlineTextContent>? = null,
  onLinkLongClick: (link: String) -> Unit = {}
 ) {
  val textLayoutDirection = remember (text) {
    if (BidiFormatter.getInstance().isRtl(text.subSequence(0, kotlin.math.min(50, text.length)))) LayoutDirection.Rtl else LayoutDirection.Ltr
  }
-  val reserve = if (textLayoutDirection != LocalLayoutDirection.current && meta != null) {
-    "\n"
-  } else if (meta != null) {
-    reserveSpaceForMeta(meta, chatTTL)
-  } else {
-    "    "
+  val reserve = when {
+    textLayoutDirection != LocalLayoutDirection.current && metaText != null -> "\n"
+    edited -> "        "
+    else -> "    "
  }
-  val scope = rememberCoroutineScope()
  CompositionLocalProvider(
    LocalLayoutDirection provides if (textLayoutDirection != LocalLayoutDirection.current)
      if (LocalLayoutDirection.current == LayoutDirection.Ltr) LayoutDirection.Rtl else LayoutDirection.Ltr
    else
      LocalLayoutDirection.current
  ) {
-    var timer: Job? by remember { mutableStateOf(null) }
-    var typingIdx by rememberSaveable { mutableStateOf(0) }
-    fun stopTyping() {
-      timer?.cancel()
-      timer = null
-    }
-    fun switchTyping() {
-      if (meta != null && meta.isLive && meta.recent) {
-        timer = timer ?: scope.launch {
-          while (isActive) {
-            typingIdx = (typingIdx + 1) % typingIndicators.size
-            delay(250)
-          }
-        }
-      } else {
-        stopTyping()
-      }
-    }
-    if (meta?.isLive == true) {
-      val activity = LocalContext.current as Activity
-      LaunchedEffect(meta.recent, meta.isLive) {
-        switchTyping()
-      }
-      DisposableEffect(Unit) {
-        val orientation = activity.resources.configuration.orientation
-        onDispose {
-          if (orientation == activity.resources.configuration.orientation) {
-            stopTyping()
-          }
-        }
-      }
-    }
    if (formattedText == null) {
      val annotatedText = buildAnnotatedString {
        appendSender(this, sender, senderBold)
-        if (text is String) append(text)
-        else if (text is AnnotatedString) append(text)
-        if (meta?.isLive == true) {
-          append(typingIndicator(meta.recent, typingIdx))
-        }
-        if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
+        append(text)
+        if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
      }
-      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow, inlineContent = inlineContent ?: mapOf())
+      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
    } else {
      var hasLinks = false
      val annotatedText = buildAnnotatedString {
@@ -148,29 +79,22 @@ fun MarkdownText (
        for (ft in formattedText) {
          if (ft.format == null) append(ft.text)
          else {
-            val link = ft.link(linkMode)
+            val link = ft.link
            if (link != null) {
              hasLinks = true
-              val ftStyle = if (ft.format is Format.SimplexLink && !ft.format.trustedUri && linkMode == SimplexLinkMode.BROWSER) {
-                SpanStyle(color = Color.Red, textDecoration = TextDecoration.Underline)
-              } else {
-                ft.format.style
-              }
+              val ftStyle = ft.format.style
              withAnnotation(tag = "URL", annotation = link) {
-                withStyle(ftStyle) { append(ft.viewText(linkMode)) }
+                withStyle(ftStyle) { append(ft.text) }
              }
            } else {
              withStyle(ft.format.style) { append(ft.text) }
            }
          }
        }
-        if (meta?.isLive == true) {
-          append(typingIndicator(meta.recent, typingIdx))
-        }
        // With RTL language set globally links looks bad sometimes, better to add a new line to bo sure everything looks good
        /*if (metaText != null && hasLinks && LocalLayoutDirection.current == LayoutDirection.Rtl)
          withStyle(reserveTimestampStyle) { append("\n" + metaText) }
-        else */if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
+        else */if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
      }
      if (hasLinks && uriHandler != null) {
        ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
@@ -180,15 +104,7 @@ fun MarkdownText (
          },
          onClick = { offset ->
            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
-                try {
-                  uriHandler.openUri(annotation.item)
-                } catch (e: ActivityNotFoundException) {
-                  // It can happen, for example, when you click on a text 0.00001 but don't have any app that can catch
-                  // `tel:` scheme in url installed on a device (no phone app or contacts, maybe)
-                  Log.e(TAG, "Open url: ${e.stackTraceToString()}")
-                }
-              }
+              .firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) }
          },
          shouldConsumeEvent = { offset ->
            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset).any()
@@ -19,8 +19,6 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.annotatedStringResource
-import chat.simplex.app.views.helpers.openUriCatching
-import chat.simplex.app.views.usersettings.MarkdownHelpView
 import chat.simplex.app.views.usersettings.simplexTeamUri

 val bold = SpanStyle(fontWeight = FontWeight.Bold)
@@ -37,7 +35,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
    Text(
      annotatedStringResource(R.string.you_can_connect_to_simplex_chat_founder),
      modifier = Modifier.clickable(onClick = {
-        uriHandler.openUriCatching(simplexTeamUri)
+        uriHandler.openUri(simplexTeamUri)
      }),
      lineHeight = 22.sp
    )
@@ -78,15 +76,6 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
      Text(annotatedStringResource(R.string.desktop_scan_QR_code_from_app_via_scan_QR_code), lineHeight = 22.sp)
      Text(annotatedStringResource(R.string.mobile_tap_open_in_mobile_app_then_tap_connect_in_app), lineHeight = 22.sp)
    }
-
-    Column(
-      Modifier.padding(vertical = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(stringResource(R.string.markdown_in_messages), style = MaterialTheme.typography.h2)
-      MarkdownHelpView()
-    }
  }
 }

@@ -11,20 +11,15 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
 import chat.simplex.app.views.chat.group.deleteGroupDialog
 import chat.simplex.app.views.chat.group.leaveGroupDialog
-import chat.simplex.app.views.chat.item.InvalidJSONView
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.ContactConnectionInfoView
@@ -38,25 +33,22 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
    chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
  }
  val stopped = chatModel.chatRunning.value == false
-  val linkMode by remember { chatModel.controller.appPrefs.simplexLinkMode.state }
  LaunchedEffect(chat.id) {
    showMenu.value = false
    delay(500L)
  }
  when (chat.chatInfo) {
-    is ChatInfo.Direct -> {
-      val contactNetworkStatus = chatModel.contactNetworkStatus(chat.chatInfo.contact)
+    is ChatInfo.Direct ->
      ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat, chatModel.draft.value, chatModel.draftChatId.value, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, contactNetworkStatus, stopped, linkMode) },
+        chatLinkPreview = { ChatPreviewView(chat, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, stopped) },
        click = { directChatAction(chat.chatInfo, chatModel) },
        dropdownMenuItems = { ContactMenuItems(chat, chatModel, showMenu, showMarkRead) },
        showMenu,
        stopped
      )
-    }
    is ChatInfo.Group ->
      ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat, chatModel.draft.value, chatModel.draftChatId.value, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, null, stopped, linkMode) },
+        chatLinkPreview = { ChatPreviewView(chat, chatModel.incognito.value, chatModel.currentUser.value?.profile?.displayName, stopped) },
        click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
        dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, showMarkRead) },
        showMenu,
@@ -82,18 +74,6 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
        showMenu,
        stopped
      )
-    is ChatInfo.InvalidJSON ->
-      ChatListNavLinkLayout(
-        chatLinkPreview = {
-          InvalidDataView()
-        },
-        click = {
-          ModalManager.shared.showModal(true) { InvalidJSONView(chat.chatInfo.json) }
-        },
-        dropdownMenuItems = null,
-        showMenu,
-        stopped
-      )
  }
 }

@@ -301,7 +281,7 @@ fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatMo
    if (chatModel.incognito.value) Icons.Filled.TheaterComedy else Icons.Outlined.Check,
    color = if (chatModel.incognito.value) Indigo else MaterialTheme.colors.onBackground,
    onClick = {
-      acceptContactRequest(chatInfo.apiId, chatInfo, true, chatModel)
+      acceptContactRequest(chatInfo, chatModel)
      showMenu.value = false
    }
  )
@@ -339,29 +319,6 @@ fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel:
  )
 }

-@Composable
-private fun InvalidDataView() {
-  Row {
-    ProfileImage(72.dp, null, Icons.Filled.AccountCircle, HighOrLowlight)
-    Column(
-      modifier = Modifier
-        .padding(horizontal = 8.dp)
-        .weight(1F)
-    ) {
-      Text(
-        stringResource(R.string.invalid_data),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h3,
-        fontWeight = FontWeight.Bold,
-        color = Color.Red
-      )
-      val height = with(LocalDensity.current) { 46.sp.toDp() }
-      Spacer(Modifier.height(height))
-    }
-  }
-}
-
 fun markChatRead(c: Chat, chatModel: ChatModel) {
  var chat = c
  withApi {
@@ -409,16 +366,16 @@ fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel
    title = generalGetString(R.string.accept_connection_request__question),
    text = generalGetString(R.string.if_you_choose_to_reject_the_sender_will_not_be_notified),
    confirmText = if (chatModel.incognito.value) generalGetString(R.string.accept_contact_incognito_button) else generalGetString(R.string.accept_contact_button),
-    onConfirm = { acceptContactRequest(contactRequest.apiId, contactRequest, true, chatModel) },
+    onConfirm = { acceptContactRequest(contactRequest, chatModel) },
    dismissText = generalGetString(R.string.reject_contact_button),
    onDismiss = { rejectContactRequest(contactRequest, chatModel) }
  )
 }

-fun acceptContactRequest(apiId: Long, contactRequest: ChatInfo.ContactRequest?, isCurrentUser: Boolean, chatModel: ChatModel) {
+fun acceptContactRequest(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
  withApi {
-    val contact = chatModel.controller.apiAcceptContactRequest(apiId)
-    if (contact != null && isCurrentUser && contactRequest != null) {
+    val contact = chatModel.controller.apiAcceptContactRequest(contactRequest.apiId)
+    if (contact != null) {
      val chat = Chat(ChatInfo.Direct(contact), listOf())
      chatModel.replaceChat(contactRequest.id, chat)
    }
@@ -627,13 +584,9 @@ fun PreviewChatListNavLinkDirect() {
            ),
            chatStats = Chat.ChatStats()
          ),
-          null,
-          null,
          false,
          null,
-          null,
-          stopped = false,
-          linkMode = SimplexLinkMode.DESCRIPTION
+          stopped = false
        )
      },
      click = {},
@@ -668,13 +621,9 @@ fun PreviewChatListNavLinkGroup() {
            ),
            chatStats = Chat.ChatStats()
          ),
-          null,
-          null,
          false,
          null,
-          null,
-          stopped = false,
-          linkMode = SimplexLinkMode.DESCRIPTION
+          stopped = false
        )
      },
      click = {},
@@ -4,7 +4,6 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -14,60 +13,41 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.unit.*
-import chat.simplex.app.*
+import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.NewChatSheet
-import chat.simplex.app.views.onboarding.WhatsNewView
-import chat.simplex.app.views.onboarding.shouldShowWhatsNew
 import chat.simplex.app.views.usersettings.SettingsView
 import chat.simplex.app.views.usersettings.simplexTeamUri
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch

@Composable
 fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
-  val newChatSheetState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
-  val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
+  val newChatSheetState by rememberSaveable(stateSaver = NewChatSheetState.saver()) { mutableStateOf(MutableStateFlow(NewChatSheetState.GONE)) }
  val showNewChatSheet = {
-    newChatSheetState.value = AnimatedViewState.VISIBLE
+    newChatSheetState.value = NewChatSheetState.VISIBLE
  }
  val hideNewChatSheet: (animated: Boolean) -> Unit = { animated ->
-    if (animated) newChatSheetState.value = AnimatedViewState.HIDING
-    else newChatSheetState.value = AnimatedViewState.GONE
-  }
-  LaunchedEffect(Unit) {
-    if (shouldShowWhatsNew(chatModel)) {
-      delay(1000L)
-      ModalManager.shared.showCustomModal { close -> WhatsNewView(close = close) }
-    }
+    if (animated) newChatSheetState.value = NewChatSheetState.HIDING
+    else newChatSheetState.value = NewChatSheetState.GONE
  }
  LaunchedEffect(chatModel.clearOverlays.value) {
    if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
  }
-  LaunchedEffect(chatModel.appOpenUrl.value) {
-    val url = chatModel.appOpenUrl.value
-    if (url != null) {
-      chatModel.appOpenUrl.value = null
-      connectIfOpenedViaUri(url, chatModel)
-    }
-  }
  var searchInList by rememberSaveable { mutableStateOf("") }
  val scaffoldState = rememberScaffoldState()
-  val scope = rememberCoroutineScope()
-  val switchingUsers = rememberSaveable { mutableStateOf(false) }
  Scaffold(
-    topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } },
+    topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, stopped) { searchInList = it.trim() } },
    scaffoldState = scaffoldState,
    drawerContent = { SettingsView(chatModel, setPerformLA) },
    floatingActionButton = {
@@ -100,7 +80,7 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped:
      ) {
        if (chatModel.chats.isNotEmpty()) {
          ChatList(chatModel, search = searchInList)
-        } else if (!switchingUsers.value) {
+        } else {
          Box(Modifier.fillMaxSize()) {
            if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
              OnboardingButtons(showNewChatSheet)
@@ -114,17 +94,6 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped:
  if (searchInList.isEmpty()) {
    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
  }
-  UserPicker(chatModel, userPickerState, switchingUsers) {
-    scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-  }
-  if (switchingUsers.value) {
-    Box(
-      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
-      contentAlignment = Alignment.Center
-    ) {
-      ProgressIndicator()
-    }
-  }
 }

@Composable
@@ -132,7 +101,7 @@ private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
  Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.Bottom) {
    val uriHandler = LocalUriHandler.current
    ConnectButton(generalGetString(R.string.chat_with_developers)) {
-      uriHandler.openUriCatching(simplexTeamUri)
+      uriHandler.openUri(simplexTeamUri)
    }
    Spacer(Modifier.height(DEFAULT_PADDING))
    ConnectButton(generalGetString(R.string.tap_to_start_new_chat), openNewChatSheet)
@@ -170,7 +139,7 @@ private fun ConnectButton(text: String, onClick: () -> Unit) {
 }

@Composable
-private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, userPickerState: MutableStateFlow<AnimatedViewState>, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
+private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, stopped: Boolean, onSearchValueChanged: (String) -> Unit) {
  var showSearch by rememberSaveable { mutableStateOf(false) }
  val hideSearchOnBack = { onSearchValueChanged(""); showSearch = false }
  if (showSearch) {
@@ -203,23 +172,10 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
  val scope = rememberCoroutineScope()
  DefaultTopAppBar(
    navigationButton = {
-      if (showSearch) {
+      if (showSearch)
        NavigationButtonBack(hideSearchOnBack)
-      } else if (chatModel.users.isEmpty()) {
+      else
        NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
-      } else {
-        val users by remember { derivedStateOf { chatModel.users.toList() } }
-        val allRead = users
-          .filter { u -> !u.user.activeUser && !u.user.hidden }
-          .all { u -> u.unreadCount == 0 }
-        UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
-          if (users.size == 1) {
-            scope.launch { drawerState.open() }
-          } else {
-            userPickerState.value = AnimatedViewState.VISIBLE
-          }
-        }
-      }
    },
    title = {
      Row(verticalAlignment = Alignment.CenterVertically) {
@@ -246,47 +202,6 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
  Divider(Modifier.padding(top = AppBarHeight))
 }

-@Composable
-private fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
-  IconButton(onClick = onButtonClicked) {
-    Box {
-      ProfileImage(
-        image = image,
-        size = 37.dp
-      )
-      if (!allRead) {
-        unreadBadge()
-      }
-    }
-  }
-}
-
-@Composable
-private fun BoxScope.unreadBadge(text: String? = "") {
-  Text(
-    text ?: "",
-    color = MaterialTheme.colors.onPrimary,
-    fontSize = 6.sp,
-    modifier = Modifier
-      .background(MaterialTheme.colors.primary, shape = CircleShape)
-      .badgeLayout()
-      .padding(horizontal = 3.dp)
-      .padding(vertical = 1.dp)
-      .align(Alignment.TopEnd)
-  )
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier
-      .padding(horizontal = 2.dp)
-      .size(30.dp),
-    color = HighOrLowlight,
-    strokeWidth = 2.5.dp
-  )
-}
-
 private var lazyListState = 0 to 0

@Composable
@@ -4,20 +4,17 @@ import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.InlineTextContent
-import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.NotificationsOff
 import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -25,22 +22,11 @@ import androidx.compose.ui.unit.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.ComposePreview
-import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.chat.item.MarkdownText
 import chat.simplex.app.views.helpers.*

@Composable
-fun ChatPreviewView(
-  chat: Chat,
-  chatModelDraft: ComposeState?,
-  chatModelDraftChatId: ChatId?,
-  chatModelIncognito: Boolean,
-  currentUserProfileDisplayName: String?,
-  contactNetworkStatus: NetworkStatus?,
-  stopped: Boolean,
-  linkMode: SimplexLinkMode
-) {
+fun ChatPreviewView(chat: Chat, chatModelIncognito: Boolean, currentUserProfileDisplayName: String?, stopped: Boolean) {
  val cInfo = chat.chatInfo

  @Composable
@@ -77,58 +63,11 @@ fun ChatPreviewView(
    )
  }

-  @Composable
-  fun VerifiedIcon() {
-    Icon(Icons.Outlined.VerifiedUser, null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = HighOrLowlight)
-  }
-
-  fun messageDraft(draft: ComposeState): Pair<AnnotatedString, Map<String, InlineTextContent>> {
-    fun attachment(): Pair<ImageVector, String?>? =
-      when (draft.preview) {
-        is ComposePreview.FilePreview -> Icons.Filled.InsertDriveFile to draft.preview.fileName
-        is ComposePreview.ImagePreview -> Icons.Outlined.Image to null
-        is ComposePreview.VoicePreview -> Icons.Filled.PlayArrow to durationText(draft.preview.durationMs / 1000)
-        else -> null
-      }
-
-    val attachment = attachment()
-    val text = buildAnnotatedString {
-      appendInlineContent(id = "editIcon")
-      append(" ")
-      if (attachment != null) {
-        appendInlineContent(id = "attachmentIcon")
-        if (attachment.second != null) {
-          append(attachment.second as String)
-        }
-        append(" ")
-      }
-      append(draft.message)
-    }
-    val inlineContent: Map<String, InlineTextContent> = mapOf(
-      "editIcon" to InlineTextContent(
-        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
-      ) {
-        Icon(Icons.Outlined.EditNote, null, tint = MaterialTheme.colors.primary)
-      },
-      "attachmentIcon" to InlineTextContent(
-        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
-      ) {
-        Icon(attachment?.first ?: Icons.Outlined.EditNote, null, tint = HighOrLowlight)
-      }
-    )
-    return text to inlineContent
-  }
-
  @Composable
  fun chatPreviewTitle() {
    when (cInfo) {
      is ChatInfo.Direct ->
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (cInfo.contact.verified) {
-            VerifiedIcon()
-          }
-          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else HighOrLowlight)
-        }
+        chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else HighOrLowlight)
      is ChatInfo.Group ->
        when (cInfo.groupInfo.membership.memberStatus) {
          GroupMemberStatus.MemInvited -> chatPreviewTitleText(if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary)
@@ -143,30 +82,15 @@ fun ChatPreviewView(
  fun chatPreviewText(chatModelIncognito: Boolean) {
    val ci = chat.chatItems.lastOrNull()
    if (ci != null) {
-      val (text: CharSequence, inlineTextContent) = when {
-        chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { messageDraft(chatModelDraft) }
-        ci.meta.itemDeleted == null -> ci.text to null
-        else -> generalGetString(R.string.marked_deleted_description) to null
-      }
-      val formattedText = when {
-        chatModelDraftChatId == chat.id && chatModelDraft != null -> null
-        ci.meta.itemDeleted == null -> ci.formattedText
-        else -> null
-      }
      MarkdownText(
-        text,
-        formattedText,
-        sender = when {
-          chatModelDraftChatId == chat.id && chatModelDraft != null -> null
-          cInfo is ChatInfo.Group && !ci.chatDir.sent -> ci.memberDisplayName
-          else -> null
-        },
-        linkMode = linkMode,
+        ci.text,
+        ci.formattedText,
+        sender = if (cInfo is ChatInfo.Group && !ci.chatDir.sent) ci.memberDisplayName else null,
        senderBold = true,
+        metaText = null,
        maxLines = 2,
        overflow = TextOverflow.Ellipsis,
        style = MaterialTheme.typography.body1.copy(color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
-        inlineContent = inlineTextContent,
        modifier = Modifier.fillMaxWidth(),
      )
    } else {
@@ -254,7 +178,7 @@ fun ChatPreviewView(
          Modifier.padding(top = 52.dp),
          contentAlignment = Alignment.Center
        ) {
-          ChatStatusImage(contactNetworkStatus)
+          ChatStatusImage(chat)
        }
      }
    }
@@ -277,9 +201,10 @@ fun unreadCountStr(n: Int): String {
 }

@Composable
-fun ChatStatusImage(s: NetworkStatus?) {
-  val descr = s?.statusString
-  if (s is NetworkStatus.Error) {
+fun ChatStatusImage(chat: Chat) {
+  val s = chat.serverInfo.networkStatus
+  val descr = s.statusString
+  if (s is Chat.NetworkStatus.Error) {
    Icon(
      Icons.Outlined.ErrorOutline,
      contentDescription = descr,
@@ -287,7 +212,7 @@ fun ChatStatusImage(s: NetworkStatus?) {
      modifier = Modifier
        .size(19.dp)
    )
-  } else if (s !is NetworkStatus.Connected) {
+  } else if (s !is Chat.NetworkStatus.Connected) {
    CircularProgressIndicator(
      Modifier
        .padding(horizontal = 2.dp)
@@ -307,6 +232,6 @@ fun ChatStatusImage(s: NetworkStatus?) {
@Composable
 fun PreviewChatPreviewView() {
  SimpleXTheme {
-    ChatPreviewView(Chat.sampleData, null, null, false, "", contactNetworkStatus = NetworkStatus.Connected(), stopped = false, linkMode = SimplexLinkMode.DESCRIPTION)
+    ChatPreviewView(Chat.sampleData, false, "", stopped = false)
  }
 }
@@ -29,7 +29,7 @@ fun ShareListNavLinkView(chat: Chat, chatModel: ChatModel) {
        click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
        stopped
      )
-    is ChatInfo.ContactRequest, is ChatInfo.ContactConnection, is ChatInfo.InvalidJSON -> {}
+    is ChatInfo.ContactRequest, is ChatInfo.ContactConnection -> {}
  }
 }

@@ -1,213 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import SectionItemViewSpaceBetween
-import android.util.Log
-import androidx.compose.animation.core.*
-import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.*
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.*
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import kotlin.math.roundToInt
-
-@Composable
-fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedViewState>, switchingUsers: MutableState<Boolean>, openSettings: () -> Unit) {
-  val scope = rememberCoroutineScope()
-  var newChat by remember { mutableStateOf(userPickerState.value) }
-  val users by remember {
-    derivedStateOf {
-      chatModel.users
-        .filter { u -> u.user.activeUser || !u.user.hidden }
-        .sortedByDescending { it.user.activeUser }
-    }
-  }
-  val animatedFloat = remember { Animatable(if (newChat.isVisible()) 0f else 1f) }
-  LaunchedEffect(Unit) {
-    launch {
-      userPickerState.collect {
-        newChat = it
-        launch {
-          animatedFloat.animateTo(if (newChat.isVisible()) 1f else 0f, newChatSheetAnimSpec())
-          if (newChat.isHiding()) userPickerState.value = AnimatedViewState.GONE
-        }
-      }
-    }
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { newChat.isVisible() }
-      .distinctUntilChanged()
-      .filter { it }
-      .collect {
-        try {
-          val updatedUsers = chatModel.controller.listUsers().sortedByDescending { it.user.activeUser }
-          var same = users.size == updatedUsers.size
-          if (same) {
-            for (i in 0 until minOf(users.size, updatedUsers.size)) {
-              val prev = updatedUsers[i].user
-              val next = users[i].user
-              if (prev.userId != next.userId || prev.activeUser != next.activeUser || prev.chatViewName != next.chatViewName || prev.image != next.image) {
-                same = false
-                break
-              }
-            }
-          }
-          if (!same) {
-            chatModel.users.clear()
-            chatModel.users.addAll(updatedUsers)
-          }
-        } catch (e: Exception) {
-          Log.e(TAG, "Error updating users ${e.stackTraceToString()}")
-        }
-      }
-  }
-  val xOffset = with(LocalDensity.current) { 10.dp.roundToPx() }
-  val maxWidth = with(LocalDensity.current) { LocalConfiguration.current.screenWidthDp * density }
-  Box(Modifier
-    .fillMaxSize()
-    .offset { IntOffset(if (newChat.isGone()) -maxWidth.roundToInt() else xOffset, 0) }
-    .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = { userPickerState.value = AnimatedViewState.HIDING })
-    .padding(bottom = 10.dp, top = 10.dp)
-    .graphicsLayer {
-      alpha = animatedFloat.value
-      translationY = (animatedFloat.value - 1) * xOffset
-    }
-  ) {
-    Column(
-      Modifier
-        .widthIn(min = 220.dp)
-        .width(IntrinsicSize.Min)
-        .height(IntrinsicSize.Min)
-        .shadow(8.dp, MaterialTheme.shapes.medium, clip = false)
-        .background(MaterialTheme.colors.background, MaterialTheme.shapes.medium)
-    ) {
-      Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
-        users.forEach { u ->
-          UserProfilePickerItem(u.user, u.unreadCount, openSettings = {
-            openSettings()
-            userPickerState.value = AnimatedViewState.GONE
-          }) {
-            userPickerState.value = AnimatedViewState.HIDING
-            if (!u.user.activeUser) {
-              scope.launch {
-                val job = launch {
-                  delay(500)
-                  switchingUsers.value = true
-                }
-                chatModel.controller.changeActiveUser(u.user.userId, null)
-                job.cancel()
-                switchingUsers.value = false
-              }
-            }
-          }
-          Divider(Modifier.requiredHeight(1.dp))
-          if (u.user.activeUser) Divider(Modifier.requiredHeight(0.5.dp))
-        }
-      }
-      SettingsPickerItem {
-        openSettings()
-        userPickerState.value = AnimatedViewState.GONE
-      }
-    }
-  }
-}
-
-@Composable
-fun UserProfilePickerItem(u: User, unreadCount: Int = 0, onLongClick: () -> Unit = {}, openSettings: () -> Unit = {}, onClick: () -> Unit) {
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .sizeIn(minHeight = 46.dp)
-      .combinedClickable(
-        onClick = if (u.activeUser) openSettings else onClick,
-        onLongClick = onLongClick,
-        interactionSource = remember { MutableInteractionSource() },
-        indication = if (!u.activeUser) LocalIndication.current else null
-      )
-      .padding(PaddingValues(start = 8.dp, end = DEFAULT_PADDING)),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    UserProfileRow(u)
-    if (u.activeUser) {
-        Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-    } else if (u.hidden) {
-        Icon(Icons.Outlined.Lock, null, Modifier.size(20.dp), tint = HighOrLowlight)
-    } else if (unreadCount > 0) {
-      Row {
-        Text(
-          unreadCountStr(unreadCount),
-          color = Color.White,
-          fontSize = 11.sp,
-          modifier = Modifier
-            .background(if (u.showNtfs) MaterialTheme.colors.primary else HighOrLowlight, shape = CircleShape)
-            .sizeIn(minWidth = 20.dp, minHeight = 20.dp)
-            .padding(horizontal = 3.dp)
-            .padding(vertical = 1.dp),
-          textAlign = TextAlign.Center,
-          maxLines = 1
-        )
-        Spacer(Modifier.width(2.dp))
-      }
-    } else if (!u.showNtfs) {
-      Icon(Icons.Outlined.NotificationsOff, null, Modifier.size(20.dp), tint = HighOrLowlight)
-    }  else {
-      Box(Modifier.size(20.dp))
-    }
-  }
-}
-
-@Composable
-fun UserProfileRow(u: User) {
-  Row(
-    Modifier
-      .widthIn(max = LocalConfiguration.current.screenWidthDp.dp * 0.7f)
-      .padding(vertical = 8.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    ProfileImage(
-      image = u.image,
-      size = 54.dp
-    )
-    Text(
-      u.displayName,
-      modifier = Modifier
-        .padding(start = 8.dp, end = 8.dp),
-      fontWeight = if (u.activeUser) FontWeight.Medium else FontWeight.Normal
-    )
-  }
-}
-
-@Composable
-private fun SettingsPickerItem(onClick: () -> Unit) {
-  SectionItemViewSpaceBetween(onClick, minHeight = 68.dp) {
-    val text = generalGetString(R.string.settings_section_title_settings).lowercase().capitalize(Locale.current)
-    Text(
-      text,
-      color = MaterialTheme.colors.onBackground,
-    )
-    Icon(Icons.Outlined.Settings, text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-  }
-}
@@ -1,6 +1,5 @@
 package chat.simplex.app.views.database

-import SectionDivider
 import SectionItemView
 import SectionItemViewSpaceBetween
 import SectionTextFooter
@@ -26,13 +25,13 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.datetime.Clock
 import kotlin.math.log2

@@ -162,9 +161,7 @@ fun DatabaseEncryptionLayout(
      }

      if (!initialRandomDBPassphrase.value && chatDbEncrypted == true) {
-        SectionDivider()
-
-        PassphraseField(
+        DatabaseKeyField(
          currentKey,
          generalGetString(R.string.current_passphrase),
          modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -173,9 +170,7 @@ fun DatabaseEncryptionLayout(
        )
      }

-      SectionDivider()
-
-      PassphraseField(
+      DatabaseKeyField(
        newKey,
        generalGetString(R.string.new_passphrase),
        modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -206,9 +201,7 @@ fun DatabaseEncryptionLayout(
          !validKey(newKey.value) ||
          progressIndicator.value

-      SectionDivider()
-
-      PassphraseField(
+      DatabaseKeyField(
        confirmNewKey,
        generalGetString(R.string.confirm_new_passphrase),
        modifier = Modifier.padding(horizontal = DEFAULT_PADDING),
@@ -219,9 +212,7 @@ fun DatabaseEncryptionLayout(
        }),
      )

-      SectionDivider()
-
-      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled, minHeight = TextFieldDefaults.MinHeight) {
+      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled) {
        Text(generalGetString(R.string.update_database_passphrase), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
      }
    }
@@ -294,10 +285,9 @@ fun SavePassphraseSetting(
  initialRandomDBPassphrase: Boolean,
  storedKey: Boolean,
  progressIndicator: Boolean,
-  minHeight: Dp = TextFieldDefaults.MinHeight,
  onCheckedChange: (Boolean) -> Unit,
 ) {
-  SectionItemView(minHeight = minHeight) {
+  SectionItemView {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(
        if (storedKey) Icons.Filled.VpnKey else Icons.Filled.VpnKeyOff,
@@ -359,14 +349,13 @@ private fun operationEnded(m: ChatModel, progressIndicator: MutableState<Boolean

@OptIn(ExperimentalComposeUiApi::class)
@Composable
-fun PassphraseField(
+fun DatabaseKeyField(
  key: MutableState<String>,
  placeholder: String,
  modifier: Modifier = Modifier,
  showStrength: Boolean = false,
  isValid: (String) -> Boolean,
  keyboardActions: KeyboardActions = KeyboardActions(),
-  dependsOn: MutableState<String>? = null,
 ) {
  var valid by remember { mutableStateOf(validKey(key.value)) }
  var showKey by remember { mutableStateOf(false) }
@@ -447,13 +436,6 @@ fun PassphraseField(
      )
    }
  )
-  LaunchedEffect(Unit) {
-    snapshotFlow { dependsOn?.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(state.value.text)
-      }
-  }
 }

 // based on https://generatepasswords.org/how-to-calculate-entropy/
@@ -206,7 +206,7 @@ private fun restoreDb(restoreDbFromBackup: MutableState<Boolean>, prefs: AppPref

@Composable
 private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onClick: (() -> Unit)? = null) {
-  PassphraseField(
+  DatabaseKeyField(
    text,
    generalGetString(R.string.enter_passphrase),
    isValid = ::validKey,
@@ -8,6 +8,7 @@ import SectionView
 import android.content.Context
 import android.content.res.Configuration
 import android.net.Uri
+import android.os.FileUtils
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.ManagedActivityResultLauncher
@@ -26,8 +27,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
@@ -39,7 +38,6 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.*
 import kotlinx.coroutines.*
 import kotlinx.datetime.*
-import org.apache.commons.io.IOUtils
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -86,11 +84,8 @@ fun DatabaseView(
      chatArchiveTime,
      chatLastStart,
      chatDbDeleted.value,
-      m.controller.appPrefs.privacyFullBackup,
      appFilesCountAndSize,
      chatItemTTL,
-      m.currentUser.value,
-      m.users,
      startChat = { startChat(m, runChat, chatLastStart, m.chatDbChanged) },
      stopChatAlert = { stopChatAlert(m, runChat, context) },
      exportArchive = { exportArchive(context, m, progressIndicator, chatArchiveName, chatArchiveTime, chatArchiveFile, saveArchiveLauncher) },
@@ -131,17 +126,14 @@ fun DatabaseLayout(
  chatDbChanged: Boolean,
  useKeyChain: Boolean,
  chatDbEncrypted: Boolean?,
-  initialRandomDBPassphrase: SharedPreference<Boolean>,
+  initialRandomDBPassphrase: Preference<Boolean>,
  importArchiveLauncher: ManagedActivityResultLauncher<String, Uri?>,
  chatArchiveName: MutableState<String?>,
  chatArchiveTime: MutableState<Instant?>,
  chatLastStart: MutableState<Instant?>,
  chatDbDeleted: Boolean,
-  privacyFullBackup: SharedPreference<Boolean>,
  appFilesCountAndSize: MutableState<Pair<Int, Long>>,
  chatItemTTL: MutableState<ChatItemTTL>,
-  currentUser: User?,
-  users: List<UserInfo>,
  startChat: () -> Unit,
  stopChatAlert: () -> Unit,
  exportArchive: () -> Unit,
@@ -154,27 +146,10 @@ fun DatabaseLayout(
  val operationsDisabled = !stopped || progressIndicator

  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = DEFAULT_BOTTOM_PADDING),
+    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.your_chat_database))
-
-    SectionView(stringResource(R.string.messages_section_title).uppercase()) {
-      SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!progressIndicator && !chatDbChanged), onChatItemTTLSelected) }
-    }
-    SectionTextFooter(
-      remember(currentUser?.displayName) {
-        buildAnnotatedString {
-          append(generalGetString(R.string.messages_section_description) + " ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append(currentUser?.displayName ?: "")
-          }
-          append(".")
-        }
-      }
-    )
-    SectionSpacer()
-
    SectionView(stringResource(R.string.run_chat_section)) {
      RunChatSetting(runChat, stopped, chatDbDeleted, startChat, stopChatAlert)
    }
@@ -190,8 +165,6 @@ fun DatabaseLayout(
        disabled = operationsDisabled
      )
      SectionDivider()
-      AppDataBackupPreference(privacyFullBackup, initialRandomDBPassphrase)
-      SectionDivider()
      SettingsActionItem(
        Icons.Outlined.IosShare,
        stringResource(R.string.export_database),
@@ -247,14 +220,16 @@ fun DatabaseLayout(
    )
    SectionSpacer()

-    SectionView(stringResource(R.string.files_and_media_section).uppercase()) {
+    SectionView(stringResource(R.string.data_section)) {
+      SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!progressIndicator && !chatDbChanged), onChatItemTTLSelected) }
+      SectionDivider()
      val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
      SectionItemView(
        deleteAppFilesAndMedia,
        disabled = deleteFilesDisabled
      ) {
        Text(
-          stringResource(if (users.size > 1) R.string.delete_files_and_media_for_all_users else R.string.delete_files_and_media_all),
+          stringResource(R.string.delete_files_and_media),
          color = if (deleteFilesDisabled) HighOrLowlight else Color.Red
        )
      }
@@ -270,36 +245,6 @@ fun DatabaseLayout(
  }
 }

-@Composable
-private fun AppDataBackupPreference(privacyFullBackup: SharedPreference<Boolean>, initialRandomDBPassphrase: SharedPreference<Boolean>) {
-  SectionItemView {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Icon(Icons.Outlined.Backup, stringResource(R.string.full_backup), tint = HighOrLowlight)
-      Spacer(Modifier.padding(horizontal = 4.dp))
-      val prefState = remember { mutableStateOf(privacyFullBackup.get()) }
-      Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-        Text(stringResource(R.string.full_backup), Modifier.padding(end = 24.dp))
-        Spacer(Modifier.fillMaxWidth().weight(1f))
-        Switch(
-          checked = prefState.value,
-          onCheckedChange = {
-            if (initialRandomDBPassphrase.get()) {
-              exportProhibitedAlert()
-            } else {
-              privacyFullBackup.set(it)
-              prefState.value = it
-            }
-          },
-          colors = SwitchDefaults.colors(
-            checkedThumbColor = MaterialTheme.colors.primary,
-            uncheckedThumbColor = HighOrLowlight
-          )
-        )
-      }
-    }
-  }
-}
-
 private fun setChatItemTTLAlert(
  m: ChatModel, selectedChatItemTTL: MutableState<ChatItemTTL>,
  progressIndicator: MutableState<Boolean>,
@@ -620,7 +565,7 @@ private fun saveArchiveFromUri(context: Context, importedArchiveUri: Uri): Strin
    if (inputStream != null && archiveName != null) {
      val archivePath = "${context.cacheDir}/$archiveName"
      val destFile = File(archivePath)
-      IOUtils.copy(inputStream, FileOutputStream(destFile))
+      FileUtils.copy(inputStream, FileOutputStream(destFile))
      archivePath
    } else {
      Log.e(TAG, "saveArchiveFromUri null inputStream")
@@ -738,17 +683,14 @@ fun PreviewDatabaseLayout() {
      chatDbChanged = false,
      useKeyChain = false,
      chatDbEncrypted = false,
-      initialRandomDBPassphrase = SharedPreference({ true }, {}),
+      initialRandomDBPassphrase = Preference({ true }, {}),
      importArchiveLauncher = rememberGetContentLauncher {},
      chatArchiveName = remember { mutableStateOf("dummy_archive") },
      chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
      chatLastStart = remember { mutableStateOf(Clock.System.now()) },
      chatDbDeleted = false,
-      privacyFullBackup = SharedPreference({ true }, {}),
      appFilesCountAndSize = remember { mutableStateOf(0 to 0L) },
      chatItemTTL = remember { mutableStateOf(ChatItemTTL.None) },
-      currentUser = User.sampleData,
-      users = listOf(UserInfo.sampleData),
      startChat = {},
      stopChatAlert = {},
      exportArchive = {},
@@ -1,20 +1,11 @@
 package chat.simplex.app.views.helpers

 import android.util.Log
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.window.Dialog
 import chat.simplex.app.R
 import chat.simplex.app.TAG
-import chat.simplex.app.ui.theme.*

 class AlertManager {
  var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
@@ -44,36 +35,6 @@ class AlertManager {
    }
  }

-  fun showAlertDialogButtonsColumn(
-    title: String,
-    text: AnnotatedString? = null,
-    buttons: @Composable () -> Unit,
-  ) {
-    showAlert {
-      Dialog(onDismissRequest = this::hideAlert) {
-        Column(Modifier.background(MaterialTheme.colors.background, MaterialTheme.shapes.medium)) {
-          Text(title,
-            Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING, bottom = if (text == null) DEFAULT_PADDING else DEFAULT_PADDING_HALF),
-            fontSize = 15.sp,
-            fontWeight = FontWeight.SemiBold
-          )
-          if (text != null) {
-            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-              Text(
-                text,
-                Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
-                fontSize = 14.sp,
-              )
-            }
-          }
-          CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-            buttons()
-          }
-        }
-      }
-    }
-  }
-
  fun showAlertDialog(
    title: String,
    text: String? = null,
@@ -106,41 +67,6 @@ class AlertManager {
    }
  }

-  fun showAlertDialogStacked(
-    title: String,
-    text: String? = null,
-    confirmText: String = generalGetString(R.string.ok),
-    onConfirm: (() -> Unit)? = null,
-    dismissText: String = generalGetString(R.string.cancel_verb),
-    onDismiss: (() -> Unit)? = null,
-    onDismissRequest: (() -> Unit)? = null,
-    destructive: Boolean = false
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = { onDismissRequest?.invoke(); hideAlert() },
-        title = { Text(title) },
-        text = alertText,
-        buttons = {
-          Column(
-            Modifier.fillMaxWidth().padding(horizontal = 8.dp).padding(top = 16.dp, bottom = 2.dp),
-            horizontalAlignment = Alignment.End
-          ) {
-            TextButton(onClick = {
-              onDismiss?.invoke()
-              hideAlert()
-            }) { Text(dismissText) }
-            TextButton(onClick = {
-              onConfirm?.invoke()
-              hideAlert()
-            }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
-          }
-        },
-      )
-    }
-  }
-
  fun showAlertMsg(
    title: String, text: String? = null,
    confirmText: String = generalGetString(R.string.ok), onConfirm: (() -> Unit)? = null
@@ -176,4 +102,4 @@ class AlertManager {
  companion object {
    val shared = AlertManager()
  }
-}
+}
@@ -4,7 +4,6 @@ import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -12,7 +11,7 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.ui.theme.*

@Composable
-fun CloseSheetBar(close: () -> Unit, endButtons: @Composable RowScope.() -> Unit = {}) {
+fun CloseSheetBar(close: () -> Unit) {
  Column(
    Modifier
      .fillMaxWidth()
@@ -21,19 +20,9 @@ fun CloseSheetBar(close: () -> Unit, endButtons: @Composable RowScope.() -> Unit
  ) {
    Row(
      Modifier
+        .width(TitleInsetWithIcon - AppBarHorizontalPadding)
        .padding(top = 4.dp), // Like in DefaultAppBar
-      content = {
-        Row(
-          Modifier.fillMaxWidth().height(TextFieldDefaults.MinHeight),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically
-        ) {
-          NavigationButtonBack(close)
-          Row {
-            endButtons()
-          }
-        }
-      }
+      content = { NavigationButtonBack(close) }
    )
  }
 }
@@ -41,7 +30,7 @@ fun CloseSheetBar(close: () -> Unit, endButtons: @Composable RowScope.() -> Unit
@Composable
 fun AppBarTitle(title: String, withPadding: Boolean = true) {
  val padding = if (withPadding)
-    PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING)
+    PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING )
  else
    PaddingValues(bottom = DEFAULT_PADDING)
  Text(
@@ -34,7 +34,7 @@ fun DefaultTopAppBar(
      if (!showSearch) {
        title?.invoke()
      } else {
-        SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), alwaysVisible = false, onSearchValueChanged)
+        SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), onSearchValueChanged)
      }
    },
    backgroundColor = if (isInDarkTheme()) ToolbarDark else ToolbarLight,
@@ -53,15 +53,6 @@ fun NavigationButtonBack(onButtonClicked: () -> Unit) {
  }
 }

-@Composable
-fun ShareButton(onButtonClicked: () -> Unit) {
-  IconButton(onButtonClicked) {
-    Icon(
-      Icons.Outlined.Share, stringResource(R.string.share_verb), tint = MaterialTheme.colors.primary
-    )
-  }
-}
-
@Composable
 fun NavigationButtonMenu(onButtonClicked: () -> Unit) {
  IconButton(onClick = onButtonClicked) {
@@ -1,13 +1,9 @@
-@file:UseSerializers(UriSerializer::class)
 package chat.simplex.app.views.helpers

+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.runtime.saveable.Saver
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder

 sealed class SharedContent {
  data class Text(val text: String): SharedContent()
@@ -15,7 +11,7 @@ sealed class SharedContent {
  data class File(val text: String, val uri: Uri): SharedContent()
 }

-enum class AnimatedViewState {
+enum class NewChatSheetState {
  VISIBLE, HIDING, GONE;
  fun isVisible(): Boolean {
    return this == VISIBLE
@@ -27,7 +23,7 @@ enum class AnimatedViewState {
    return this == GONE
  }
  companion object {
-    fun saver(): Saver<MutableStateFlow<AnimatedViewState>, *> = Saver(
+    fun saver(): Saver<MutableStateFlow<NewChatSheetState>, *> = Saver(
      save = { it.value.toString() },
      restore = {
        MutableStateFlow(valueOf(it))
@@ -36,16 +32,7 @@ enum class AnimatedViewState {
  }
 }

-
-@Serializer(forClass = Uri::class)
-object UriSerializer : KSerializer<Uri> {
-  override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
-  override fun serialize(encoder: Encoder, value: Uri) = encoder.encodeString(value.toString())
-  override fun deserialize(decoder: Decoder): Uri = Uri.parse(decoder.decodeString())
-}
-
-@Serializable
 sealed class UploadContent {
-  @Serializable data class SimpleImage(val uri: Uri): UploadContent()
-  @Serializable data class AnimatedImage(val uri: Uri): UploadContent()
+  data class SimpleImage(val uri: Uri): UploadContent()
+  data class AnimatedImage(val uri: Uri): UploadContent()
 }
@@ -10,12 +10,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
 import chat.simplex.app.ui.theme.HighOrLowlight

@Composable
@@ -30,7 +27,7 @@ fun <T> ExposedDropDownSettingRow(
  onSelected: (T) -> Unit
 ) {
  Row(
-    Modifier.fillMaxWidth().padding(vertical = 10.dp),
+    Modifier.fillMaxWidth(),
    verticalAlignment = Alignment.CenterVertically,
  ) {
    var expanded by remember { mutableStateOf(false) }
@@ -43,7 +40,9 @@ fun <T> ExposedDropDownSettingRow(
        tint = iconTint
      )
    }
-    Text(title, Modifier.weight(1f), color = if (enabled.value) Color.Unspecified else HighOrLowlight)
+    Text(title, color = if (enabled.value) Color.Unspecified else HighOrLowlight)
+
+    Spacer(Modifier.fillMaxWidth().weight(1f))

    ExposedDropdownMenuBox(
      expanded = expanded,
@@ -56,10 +55,8 @@ fun <T> ExposedDropDownSettingRow(
        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.End
      ) {
-        val maxWidth = with(LocalDensity.current){ 180.sp.toDp() }
        Text(
          values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
-          Modifier.widthIn(max = maxWidth),
          maxLines = 1,
          overflow = TextOverflow.Ellipsis,
          color = HighOrLowlight
@@ -3,7 +3,6 @@ package chat.simplex.app.views.helpers
 import android.Manifest
 import android.app.Activity
 import android.content.*
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.graphics.*
 import android.net.Uri
@@ -33,9 +32,11 @@ import androidx.core.content.FileProvider
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.json
+import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.chat.PickFromGallery
 import chat.simplex.app.views.newchat.ActionButton
 import kotlinx.serialization.builtins.*
+import kotlinx.serialization.decodeFromString
 import java.io.ByteArrayOutputStream
 import java.io.File
 import kotlin.math.min
@@ -113,7 +114,7 @@ fun base64ToBitmap(base64ImageString: String): Bitmap {
 class CustomTakePicturePreview(var uri: Uri?, var tmpFile: File?): ActivityResultContract<Void?, Uri?>() {
  @CallSuper
  override fun createIntent(context: Context, input: Void?): Intent {
-    tmpFile = File.createTempFile("image", ".bmp", File(getAppFilesDirectory(SimplexApp.context)))
+    tmpFile = File.createTempFile("image", ".bmp", context.filesDir)
    // Since the class should return Uri, the file should be deleted somewhere else. And in order to be sure, delegate this to system
    tmpFile?.deleteOnExit()
    uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", tmpFile!!)
@@ -176,25 +177,6 @@ fun rememberGetContentLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLaunche
 fun rememberGetMultipleContentsLauncher(cb: (List<Uri>) -> Unit): ManagedActivityResultLauncher<String, List<Uri>> =
  rememberLauncherForActivityResult(contract = ActivityResultContracts.GetMultipleContents(), cb)

-fun ManagedActivityResultLauncher<Void?, Uri?>.launchWithFallback() {
-  try {
-    launch(null)
-  } catch (e: ActivityNotFoundException) {
-    // No Activity found to handle Intent android.media.action.IMAGE_CAPTURE
-    // Means, no system camera app (Android 11+ requirement)
-    // https://developer.android.com/about/versions/11/behavior-changes-11#media-capture
-    Log.e(TAG, "Camera launcher: " + e.stackTraceToString())
-
-    try {
-      // Try to open any camera just to capture an image, will not be returned like with previous intent
-      SimplexApp.context.startActivity(Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA).also { it.addFlags(FLAG_ACTIVITY_NEW_TASK) })
-    } catch (e: ActivityNotFoundException) {
-      // No camera apps available at all
-      Log.e(TAG, "Camera launcher2: " + e.stackTraceToString())
-    }
-  }
-}
-
@Composable
 fun GetImageBottomSheet(
  imageBitmap: MutableState<Uri?>,
@@ -204,19 +186,25 @@ fun GetImageBottomSheet(
  val context = LocalContext.current
  val processPickedImage = { uri: Uri? ->
    if (uri != null) {
-      val bitmap = getBitmapFromUri(uri)
-      if (bitmap != null) {
-        imageBitmap.value = uri
-        onImageChange(bitmap)
-      }
+      val source = ImageDecoder.createSource(context.contentResolver, uri)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      imageBitmap.value = uri
+      onImageChange(bitmap)
+    }
+  }
+  val galleryLauncher = rememberLauncherForActivityResult(contract = PickFromGallery()) { processPickedImage(it) }
+  val galleryLauncherFallback = rememberGetContentLauncher { processPickedImage(it) }
+  val cameraLauncher = rememberCameraLauncher { uri: Uri? ->
+    if (uri != null) {
+      imageBitmap.value = uri
+      val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      onImageChange(bitmap)
    }
  }
-  val galleryLauncher = rememberLauncherForActivityResult(contract = PickFromGallery(), processPickedImage)
-  val galleryLauncherFallback = rememberGetContentLauncher(processPickedImage)
-  val cameraLauncher = rememberCameraLauncher(processPickedImage)
  val permissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
    if (isGranted) {
-      cameraLauncher.launchWithFallback()
+      cameraLauncher.launch(null)
      hideBottomSheet()
    } else {
      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
@@ -240,7 +228,7 @@ fun GetImageBottomSheet(
      ActionButton(null, stringResource(R.string.use_camera_button), icon = Icons.Outlined.PhotoCamera) {
        when (PackageManager.PERMISSION_GRANTED) {
          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
-            cameraLauncher.launchWithFallback()
+            cameraLauncher.launch(null)
            hideBottomSheet()
          }
          else -> {
@@ -20,13 +20,12 @@ fun ModalView(
  close: () -> Unit,
  background: Color = MaterialTheme.colors.background,
  modifier: Modifier = Modifier,
-  endButtons: @Composable RowScope.() -> Unit = {},
  content: @Composable () -> Unit,
 ) {
  BackHandler(onBack = close)
  Surface(Modifier.fillMaxSize()) {
    Column(Modifier.background(background)) {
-      CloseSheetBar(close, endButtons)
+      CloseSheetBar(close)
      Box(modifier) { content() }
    }
  }
@@ -38,9 +37,9 @@ class ModalManager {
  private val toRemove = mutableSetOf<Int>()
  private var oldViewChanging = AtomicBoolean(false)

-  fun showModal(settings: Boolean = false, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable () -> Unit) {
+  fun showModal(settings: Boolean = false, content: @Composable () -> Unit) {
    showCustomModal { close ->
-      ModalView(close, if (!settings || isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight, endButtons = endButtons, content = content)
+      ModalView(close, if (!settings || isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight, content = content)
    }
  }

@@ -1,36 +1,45 @@
 package chat.simplex.app.views.helpers

-import android.app.Application
-import android.content.Context
 import android.media.*
-import android.media.AudioManager.AudioPlaybackCallback
-import android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED
 import android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED
 import android.os.Build
 import android.util.Log
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.Saver
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatItem
-import chat.simplex.app.views.helpers.AudioPlayer.duration
-import kotlinx.coroutines.*
 import java.io.*
+import java.text.SimpleDateFormat
+import java.util.*

 interface Recorder {
-  fun start(onProgressUpdate: (position: Int?, finished: Boolean) -> Unit): String
-  fun stop(): Int
+  val recordingInProgress: MutableState<Boolean>
+  fun start(onStop: () -> Unit): String
+  fun stop()
+  fun cancel(filePath: String, recordingInProgress: MutableState<Boolean>)
+}
+
+data class ProgressAndDuration(
+  val progressMs: Int = 0,
+  val durationMs: Int = 0
+) {
+  companion object {
+    val Saver
+      get() = Saver<MutableState<ProgressAndDuration>, Pair<Int, Int>>(
+        save = { it.value.progressMs to it.value.durationMs },
+        restore = { mutableStateOf(ProgressAndDuration(it.first, it.second)) }
+      )
+  }
 }

 class RecorderNative(private val recordedBytesLimit: Long): Recorder {
  companion object {
    // Allows to stop the recorder from outside without having the recorder in a variable
    var stopRecording: (() -> Unit)? = null
-    const val extension = "m4a"
  }
+  override val recordingInProgress = mutableStateOf(false)
  private var recorder: MediaRecorder? = null
-  private var progressJob: Job? = null
-  private var filePath: String? = null
-  private var recStartedAt: Long? = null
  private fun initRecorder() =
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
      MediaRecorder(SimplexApp.context)
@@ -38,8 +47,9 @@ class RecorderNative(private val recordedBytesLimit: Long): Recorder {
      MediaRecorder()
    }

-  override fun start(onProgressUpdate: (position: Int?, finished: Boolean) -> Unit): String {
+  override fun start(onStop: () -> Unit): String {
    AudioPlayer.stop()
+    recordingInProgress.value = true
    val rec: MediaRecorder
    recorder = initRecorder().also { rec = it }
    rec.setAudioSource(MediaRecorder.AudioSource.MIC)
@@ -48,39 +58,28 @@ class RecorderNative(private val recordedBytesLimit: Long): Recorder {
    rec.setAudioChannels(1)
    rec.setAudioSamplingRate(16000)
    rec.setAudioEncodingBitRate(16000)
-    rec.setMaxDuration(MAX_VOICE_MILLIS_FOR_SENDING)
+    rec.setMaxDuration(-1)
    rec.setMaxFileSize(recordedBytesLimit)
-    val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
-    val fileToSave = File.createTempFile(generateNewFileName(SimplexApp.context, "voice", "${extension}_"), ".tmp", tmpDir)
-    fileToSave.deleteOnExit()
-    val path = fileToSave.absolutePath
-    filePath = path
-    rec.setOutputFile(path)
+    val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+    val filePath = getAppFilePath(SimplexApp.context, uniqueCombine(SimplexApp.context, getAppFilePath(SimplexApp.context, "voice_${timestamp}.m4a")))
+    rec.setOutputFile(filePath)
    rec.prepare()
    rec.start()
-    recStartedAt = System.currentTimeMillis()
-    progressJob = CoroutineScope(Dispatchers.Default).launch {
-      while(isActive) {
-        onProgressUpdate(progress(), false)
-        delay(50)
-      }
-    }.apply {
-      invokeOnCompletion {
-        onProgressUpdate(realDuration(path), true)
-      }
-    }
-    rec.setOnInfoListener { _, what, _ ->
-      if (what == MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED || what == MEDIA_RECORDER_INFO_MAX_DURATION_REACHED) {
+    rec.setOnInfoListener { mr, what, extra ->
+      if (what == MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED) {
        stop()
+        onStop()
      }
    }
-    stopRecording = { stop() }
-    return path
+    stopRecording = { stop(); onStop() }
+    return filePath
  }

-  override fun stop(): Int {
-    val path = filePath ?: return 0
+  override fun stop() {
+    if (!recordingInProgress.value) return
    stopRecording = null
+    recordingInProgress.value = false
+    recorder?.metrics?.
    runCatching {
      recorder?.stop()
    }
@@ -88,25 +87,16 @@ class RecorderNative(private val recordedBytesLimit: Long): Recorder {
      recorder?.reset()
    }
    runCatching {
+      // release all resources
      recorder?.release()
    }
-    // Await coroutine finishes in order to send real duration to it's listener
-    runBlocking {
-      progressJob?.cancelAndJoin()
-    }
-    progressJob = null
-    filePath = null
    recorder = null
-    return (realDuration(path) ?: 0).also { recStartedAt = null }
  }

-  private fun progress(): Int? = recStartedAt?.let { (System.currentTimeMillis() - it).toInt() }
-
-  /**
-  * Return real duration from [AudioPlayer] if it's possible (should always be possible).
-  * As a fallback, return internally counted duration
-  * */
-  private fun realDuration(path: String): Int? = duration(path) ?: progress()
+  override fun cancel(filePath: String, recordingInProgress: MutableState<Boolean>) {
+    stop()
+    runCatching { File(filePath).delete() }.getOrElse { Log.d(TAG, "Unable to delete a file: ${it.stackTraceToString()}") }
+  }
 }

 object AudioPlayer {
@@ -117,17 +107,6 @@ object AudioPlayer {
        .setUsage(AudioAttributes.USAGE_MEDIA)
        .build()
    )
-    (SimplexApp.context.getSystemService(Context.AUDIO_SERVICE) as AudioManager)
-      .registerAudioPlaybackCallback(object: AudioPlaybackCallback() {
-        override fun onPlaybackConfigChanged(configs: MutableList<AudioPlaybackConfiguration>?) {
-          if (configs?.any { it.audioAttributes.usage == AudioAttributes.USAGE_VOICE_COMMUNICATION } == true) {
-            // In a process of making a call
-            RecorderNative.stopRecording?.invoke()
-            stop()
-          }
-          super.onPlaybackConfigChanged(configs)
-        }
-      }, null)
  }
  private val helperPlayer: MediaPlayer =  MediaPlayer().apply {
        setAudioAttributes(
@@ -137,79 +116,55 @@ object AudioPlayer {
            .build()
        )
  }
-  // Filepath: String, onProgressUpdate
-  private val currentlyPlaying: MutableState<Pair<String, (position: Int?, state: TrackState) -> Unit>?> = mutableStateOf(null)
-  private var progressJob: Job? = null
+  // Filepath: String, onStop: () -> Unit
+  private val currentlyPlaying: MutableState<Pair<String, () -> Unit>?> = mutableStateOf(null)

-  enum class TrackState {
-    PLAYING, PAUSED, REPLACED
-  }
-
-  // Returns real duration of the track
-  private fun start(filePath: String, seek: Int? = null, onProgressUpdate: (position: Int?, state: TrackState) -> Unit): Int? {
+  fun start(filePath: String, seek: Int? = null, onStop: () -> Unit): Boolean {
    if (!File(filePath).exists()) {
      Log.e(TAG, "No such file: $filePath")
-      return null
+      return false
    }

    RecorderNative.stopRecording?.invoke()
    val current = currentlyPlaying.value
    if (current == null || current.first != filePath) {
-      stopListener()
      player.reset()
+      // Notify prev audio listener about stop
+      current?.second?.invoke()
      runCatching {
        player.setDataSource(filePath)
      }.onFailure {
        Log.e(TAG, it.stackTraceToString())
        AlertManager.shared.showAlertMsg(generalGetString(R.string.unknown_error), it.message)
-        return null
+        return false
      }
      runCatching { player.prepare() }.onFailure {
        // Can happen when audio file is broken
        Log.e(TAG, it.stackTraceToString())
        AlertManager.shared.showAlertMsg(generalGetString(R.string.unknown_error), it.message)
-        return null
+        return false
      }
    }
    if (seek != null) player.seekTo(seek)
    player.start()
-    currentlyPlaying.value = filePath to onProgressUpdate
-    progressJob = CoroutineScope(Dispatchers.Default).launch {
-      onProgressUpdate(player.currentPosition, TrackState.PLAYING)
-      while(isActive && player.isPlaying) {
-        // Even when current position is equal to duration, the player has isPlaying == true for some time,
-        // so help to make the playback stopped in UI immediately
-        if (player.currentPosition == player.duration) {
-          onProgressUpdate(player.currentPosition, TrackState.PLAYING)
-          break
-        }
-        delay(50)
-        onProgressUpdate(player.currentPosition, TrackState.PLAYING)
-      }
-      /*
-      * Since coroutine is still NOT canceled, means player ended (no stop/no pause). But in some cases
-      * the player can show position != duration even if they actually equal.
-      * Let's say to a listener that the position == duration in case of coroutine finished without cancel
-      * */
-      if (isActive) {
-        onProgressUpdate(player.duration, TrackState.PAUSED)
-      }
-      onProgressUpdate(null, TrackState.PAUSED)
+    // Repeated calls to play/pause on the same track will not recompose all dependent views
+    if (currentlyPlaying.value?.first != filePath) {
+      currentlyPlaying.value = filePath to onStop
    }
-    return player.duration
+    return true
  }

-  private fun pause(): Int {
-    progressJob?.cancel()
-    progressJob = null
+  fun pause(): Int {
    player.pause()
    return player.currentPosition
  }

  fun stop() {
-    if (currentlyPlaying.value == null) return
+    if (!player.isPlaying) return
+    // Notify prev audio listener about stop
+    currentlyPlaying.value?.second?.invoke()
+    currentlyPlaying.value = null
    player.stop()
-    stopListener()
  }

  fun stop(item: ChatItem) = stop(item.file?.fileName)
@@ -221,59 +176,16 @@ object AudioPlayer {
    }
  }

-  private fun stopListener() {
-    val afterCoroutineCancel: CompletionHandler = {
-      // Notify prev audio listener about stop
-      currentlyPlaying.value?.second?.invoke(null, TrackState.REPLACED)
-      currentlyPlaying.value = null
-    }
-    /** Preventing race by calling a code AFTER coroutine ends, so [TrackState] will be:
-     * [TrackState.PLAYING] -> [TrackState.PAUSED] -> [TrackState.REPLACED] (in this order)
-     * */
-    if (progressJob != null) {
-      progressJob?.invokeOnCompletion(afterCoroutineCancel)
-    } else {
-      afterCoroutineCancel(null)
-    }
-    progressJob?.cancel()
-    progressJob = null
-  }
+  /**
+   * If player starts playing at 2637 ms in a track 2816 ms long (these numbers are just an example),
+   * it will stop immediately after start but will not change currentPosition, so it will not be equal to duration.
+   * However, it sets isPlaying to false. Let's do it ourselves in order to prevent endless waiting loop
+   * */
+  fun progressAndDurationOrEnded(): ProgressAndDuration =
+    ProgressAndDuration(if (player.isPlaying) player.currentPosition else player.duration, player.duration)

-  fun play(
-    filePath: String?,
-    audioPlaying: MutableState<Boolean>,
-    progress: MutableState<Int>,
-    duration: MutableState<Int>,
-    resetOnEnd: Boolean,
-  ) {
-    if (progress.value == duration.value) {
-      progress.value = 0
-    }
-    val realDuration = start(filePath ?: return, progress.value) { pro, state ->
-      if (pro != null) {
-        progress.value = pro
-      }
-      if (pro == null || pro == duration.value) {
-        audioPlaying.value = false
-        if (pro == duration.value) {
-          progress.value = if (resetOnEnd) 0 else duration.value
-        } else if (state == TrackState.REPLACED) {
-          progress.value = 0
-        }
-      }
-    }
-    audioPlaying.value = realDuration != null
-    // Update to real duration instead of what was received in ChatInfo
-    realDuration?.let { duration.value = it }
-  }
-
-  fun pause(audioPlaying: MutableState<Boolean>, pro: MutableState<Int>) {
-    pro.value = pause()
-    audioPlaying.value = false
-  }
-
-  fun duration(filePath: String): Int? {
-    var res: Int? = null
+  fun duration(filePath: String): Int {
+    var res = 0
    kotlin.runCatching {
      helperPlayer.setDataSource(filePath)
      helperPlayer.prepare()
@@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -30,18 +29,15 @@ import kotlinx.coroutines.delay

@OptIn(ExperimentalComposeUiApi::class)
@Composable
-fun SearchTextField(modifier: Modifier, placeholder: String, alwaysVisible: Boolean, onValueChange: (String) -> Unit) {
+fun SearchTextField(modifier: Modifier, placeholder: String, onValueChange: (String) -> Unit) {
  var searchText by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
  val focusRequester = remember { FocusRequester() }
-  val focusManager = LocalFocusManager.current
  val keyboard = LocalSoftwareKeyboardController.current

-  if (!alwaysVisible) {
-    LaunchedEffect(Unit) {
-      focusRequester.requestFocus()
-      delay(200)
-      keyboard?.show()
-    }
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
+    delay(200)
+    keyboard?.show()
  }

  DisposableEffect(Unit) {
@@ -91,14 +87,7 @@ fun SearchTextField(modifier: Modifier, placeholder: String, alwaysVisible: Bool
          Text(placeholder)
        },
        trailingIcon = if (searchText.text.isNotEmpty()) {{
-          IconButton({
-            if (alwaysVisible) {
-              keyboard?.hide()
-              focusManager.clearFocus()
-            }
-            searchText = TextFieldValue("");
-            onValueChange("")
-          }) {
+          IconButton({ searchText = TextFieldValue(""); onValueChange("") }) {
            Icon(Icons.Default.Close, stringResource(R.string.icon_descr_close_button), tint = MaterialTheme.colors.primary,)
          }
        }} else null,
@@ -1,5 +1,4 @@
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
@@ -11,8 +10,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.app.ui.theme.*
@@ -34,28 +31,6 @@ fun SectionView(title: String? = null, padding: PaddingValues = PaddingValues(),
  }
 }

-@Composable
-fun SectionView(
-  title: String,
-  icon: ImageVector,
-  iconTint: Color = HighOrLowlight,
-  leadingIcon: Boolean = false,
-  padding: PaddingValues = PaddingValues(),
-  content: (@Composable ColumnScope.() -> Unit)
-) {
-  Column {
-    val iconSize = with(LocalDensity.current) { 21.sp.toDp() }
-    Row(Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), verticalAlignment = Alignment.CenterVertically) {
-      if (leadingIcon) Icon(icon, null, Modifier.padding(end = 4.dp).size(iconSize), tint = iconTint)
-      Text(title, color = HighOrLowlight, style = MaterialTheme.typography.body2, fontSize = 12.sp)
-      if (!leadingIcon) Icon(icon, null, Modifier.padding(start = 4.dp).size(iconSize), tint = iconTint)
-    }
-    Surface(color = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
-      Column(Modifier.padding(padding).fillMaxWidth()) { content() }
-    }
-  }
-}
-
@Composable
 fun <T> SectionViewSelectable(
  title: String?,
@@ -81,18 +56,12 @@ fun <T> SectionViewSelectable(
 }

@Composable
-fun SectionItemView(
-  click: (() -> Unit)? = null,
-  minHeight: Dp = 46.dp,
-  disabled: Boolean = false,
-  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
-  content: (@Composable RowScope.() -> Unit)
-) {
+fun SectionItemView(click: (() -> Unit)? = null, minHeight: Dp = 46.dp, disabled: Boolean = false, content: (@Composable RowScope.() -> Unit)) {
  val modifier = Modifier
    .fillMaxWidth()
    .sizeIn(minHeight = minHeight)
  Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
+    if (click == null || disabled) modifier.padding(horizontal = DEFAULT_PADDING) else modifier.clickable(onClick = click).padding(horizontal = DEFAULT_PADDING),
    verticalAlignment = Alignment.CenterVertically
  ) {
    content()
@@ -102,7 +71,6 @@ fun SectionItemView(
@Composable
 fun SectionItemViewSpaceBetween(
  click: (() -> Unit)? = null,
-  onLongClick: (() -> Unit)? = null,
  minHeight: Dp = 46.dp,
  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
  disabled: Boolean = false,
@@ -112,7 +80,7 @@ fun SectionItemViewSpaceBetween(
    .fillMaxWidth()
    .sizeIn(minHeight = minHeight)
  Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.combinedClickable(onClick = click, onLongClick = onLongClick).padding(padding),
+    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
    horizontalArrangement = Arrangement.SpaceBetween,
    verticalAlignment = Alignment.CenterVertically
  ) {
@@ -161,11 +129,6 @@ fun <T> SectionItemWithValue(

@Composable
 fun SectionTextFooter(text: String) {
-  SectionTextFooter(AnnotatedString(text))
-}
-
-@Composable
-fun SectionTextFooter(text: AnnotatedString) {
  Text(
    text,
    Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
@@ -195,13 +158,9 @@ fun SectionSpacer() {
 }

@Composable
-fun InfoRow(title: String, value: String, icon: ImageVector? = null, iconTint: Color? = null) {
+fun InfoRow(title: String, value: String) {
  SectionItemViewSpaceBetween {
-    Row {
-      val iconSize = with(LocalDensity.current) { 21.sp.toDp() }
-      if (icon != null) Icon(icon, title, Modifier.padding(end = 8.dp).size(iconSize), tint = iconTint ?: HighOrLowlight)
-      Text(title)
-    }
+    Text(title)
    Text(value, color = HighOrLowlight)
  }
 }
@@ -1,6 +1,5 @@
 package chat.simplex.app.views.helpers

-import android.Manifest
 import android.content.*
 import android.net.Uri
 import android.provider.MediaStore
@@ -82,7 +81,6 @@ fun imageMimeType(fileName: String): String {
  }
 }

-/** Before calling, make sure the user allows to write to external storage [Manifest.permission.WRITE_EXTERNAL_STORAGE] */
 fun saveImage(cxt: Context, ciFile: CIFile?) {
  val filePath = getLoadedFilePath(cxt, ciFile)
  val fileName = ciFile?.fileName
@@ -28,22 +28,6 @@ fun SimpleButton(text: String, icon: ImageVector,
  }
 }

-@Composable
-fun SimpleButton(
-  text: String, icon: ImageVector,
-  color: Color = MaterialTheme.colors.primary,
-  disabled: Boolean,
-  click: () -> Unit
-) {
-  SimpleButtonFrame(click, disabled = disabled) {
-    Icon(
-      icon, text, tint = if (disabled) HighOrLowlight else color,
-      modifier = Modifier.padding(end = 8.dp)
-    )
-    Text(text, style = MaterialTheme.typography.caption, color = if (disabled) HighOrLowlight else color)
-  }
-}
-
@Composable
 fun SimpleButtonIconEnded(
  text: String,
@@ -12,28 +12,21 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.app.ui.theme.HighOrLowlight

@Composable
-fun TextEditor(
-  modifier: Modifier,
-  text: MutableState<String>,
-  border: Boolean = true,
-  fontSize: TextUnit = 14.sp,
-  background: Color = MaterialTheme.colors.background,
-  onChange: ((String) -> Unit)? = null
-) {
+fun TextEditor(modifier: Modifier, text: MutableState<String>) {
  BasicTextField(
    value = text.value,
-    onValueChange = { text.value = it; onChange?.invoke(it) },
+    onValueChange = { text.value = it },
    textStyle = TextStyle(
-      fontFamily = FontFamily.Monospace, fontSize = fontSize,
+      fontFamily = FontFamily.Monospace, fontSize = 14.sp,
      color = MaterialTheme.colors.onBackground
    ),
    keyboardOptions = KeyboardOptions.Default.copy(
@@ -44,17 +37,17 @@ fun TextEditor(
    cursorBrush = SolidColor(HighOrLowlight),
    decorationBox = { innerTextField ->
      Surface(
-        shape = if (border) RoundedCornerShape(10.dp) else RectangleShape,
-        border = if (border) BorderStroke(1.dp, MaterialTheme.colors.secondary) else null
+        shape = RoundedCornerShape(10.dp),
+        border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
      ) {
        Row(
-          Modifier.background(background),
+          Modifier.background(MaterialTheme.colors.background),
          verticalAlignment = Alignment.Top
        ) {
          Box(
            Modifier
              .weight(1f)
-              .padding(vertical = 5.dp, horizontal = if (border) 7.dp else DEFAULT_PADDING)
+              .padding(vertical = 5.dp, horizontal = 7.dp)
          ) {
            innerTextField()
          }
@@ -1,17 +1,13 @@
 package chat.simplex.app.views.helpers

-import android.app.Activity
-import android.app.Application
-//import android.app.LocaleManager
-import android.content.ActivityNotFoundException
+import android.R.attr.factor
+import android.R.color
 import android.content.Context
-import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.*
 import android.graphics.Typeface
-import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.os.*
+import android.os.FileUtils
 import android.provider.OpenableColumns
 import android.text.Spanned
 import android.text.SpannedString
@@ -32,14 +28,11 @@ import androidx.compose.ui.text.style.BaselineShift
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.*
 import androidx.core.content.FileProvider
+import androidx.core.net.toFile
 import androidx.core.text.HtmlCompat
 import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
+import chat.simplex.app.model.CIFile
 import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import org.apache.commons.io.IOUtils
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -50,9 +43,6 @@ fun withApi(action: suspend CoroutineScope.() -> Unit): Job = withScope(GlobalSc
 fun withScope(scope: CoroutineScope, action: suspend CoroutineScope.() -> Unit): Job =
  scope.launch { withContext(Dispatchers.Main, action) }

-fun withBGApi(action: suspend CoroutineScope.() -> Unit): Job =
-  CoroutineScope(Dispatchers.Default).launch(block = action)
-
 enum class KeyboardState {
  Opened, Closed
 }
@@ -235,7 +225,7 @@ const val MAX_IMAGE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
 const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE

 const val MAX_VOICE_SIZE_FOR_SENDING: Long = 94680 // 6 chunks * 15780 bytes per chunk
-const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 43_000
+const val MAX_VOICE_MILLIS_FOR_SENDING: Long = 43_000 // approximately is ok

 const val MAX_FILE_SIZE: Long = 8000000

@@ -251,11 +241,6 @@ fun getAppFilePath(context: Context, fileName: String): String {
  return "${getAppFilesDirectory(context)}/$fileName"
 }

-fun getAppFileUri(fileName: String): Uri {
-  return Uri.parse("${getAppFilesDirectory(SimplexApp.context)}/$fileName")
-}
-
-
 fun getLoadedFilePath(context: Context, file: CIFile?): String? {
  return if (file?.filePath != null && file.loaded) {
    val filePath = getAppFilePath(context, file.filePath)
@@ -325,14 +310,6 @@ fun getFileName(context: Context, uri: Uri): String? {
  }
 }

-fun getAppFilePath(context: Context, uri: Uri): String? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    getAppFilePath(context, cursor.getString(nameIndex))
-  }
-}
-
 fun getFileSize(context: Context, uri: Uri): Long? {
  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
    val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
@@ -341,48 +318,9 @@ fun getFileSize(context: Context, uri: Uri): Long? {
  }
 }

-fun getBitmapFromUri(uri: Uri, withAlertOnException: Boolean = true): Bitmap? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeBitmap(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      null
-    }
-  } else {
-    BitmapFactory.decodeFile(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
-fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeDrawable(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
-      null
-    }
-  } else {
-    Drawable.createFromPath(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
 fun saveImage(context: Context, uri: Uri): String? {
-  val bitmap = getBitmapFromUri(uri) ?: return null
+  val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
+  val bitmap = ImageDecoder.decodeBitmap(source)
  return saveImage(context, bitmap)
 }

@@ -390,7 +328,8 @@ fun saveImage(context: Context, image: Bitmap): String? {
  return try {
    val ext = if (image.hasAlpha()) "png" else "jpg"
    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
-    val fileToSave = generateNewFileName(context, "IMG", ext)
+    val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+    val fileToSave = uniqueCombine(context, "IMG_${timestamp}.$ext")
    val file = File(getAppFilePath(context, fileToSave))
    val output = FileOutputStream(file)
    dataResized.writeTo(output)
@@ -413,7 +352,8 @@ fun saveAnimImage(context: Context, uri: Uri): String? {
    }
    // Just in case the image has a strange extension
    if (ext.length < 3 || ext.length > 4) ext = "gif"
-    val fileToSave = generateNewFileName(context, "IMG", ext)
+    val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+    val fileToSave = uniqueCombine(context, "IMG_${timestamp}.$ext")
    val file = File(getAppFilePath(context, fileToSave))
    val output = FileOutputStream(file)
    context.contentResolver.openInputStream(uri)!!.use { input ->
@@ -428,24 +368,6 @@ fun saveAnimImage(context: Context, uri: Uri): String? {
  }
 }

-fun saveTempImageUncompressed(image: Bitmap, asPng: Boolean): File? {
-  return try {
-    val ext = if (asPng) "png" else "jpg"
-    val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
-    return File(tmpDir.absolutePath + File.separator + generateNewFileName(SimplexApp.context, "IMG", ext)).apply {
-      outputStream().use { out ->
-        image.compress(if (asPng) Bitmap.CompressFormat.PNG else Bitmap.CompressFormat.JPEG, 85, out)
-        out.flush()
-      }
-      deleteOnExit()
-      SimplexApp.context.chatModel.filesToDelete.add(this)
-    }
-  } catch (e: Exception) {
-    Log.e(TAG, "Util.kt saveTempImageUncompressed error: ${e.message}")
-    null
-  }
-}
-
 fun saveFileFromUri(context: Context, uri: Uri): String? {
  return try {
    val inputStream = context.contentResolver.openInputStream(uri)
@@ -453,7 +375,7 @@ fun saveFileFromUri(context: Context, uri: Uri): String? {
    if (inputStream != null && fileToSave != null) {
      val destFileName = uniqueCombine(context, fileToSave)
      val destFile = File(getAppFilePath(context, destFileName))
-      IOUtils.copy(inputStream, FileOutputStream(destFile))
+      FileUtils.copy(inputStream, FileOutputStream(destFile))
      destFileName
    } else {
      Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri null inputStream")
@@ -465,23 +387,15 @@ fun saveFileFromUri(context: Context, uri: Uri): String? {
  }
 }

-fun generateNewFileName(context: Context, prefix: String, ext: String): String {
-  val sdf = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
-  sdf.timeZone = TimeZone.getTimeZone("GMT")
-  val timestamp = sdf.format(Date())
-  return uniqueCombine(context, "${prefix}_$timestamp.$ext")
-}
-
 fun uniqueCombine(context: Context, fileName: String): String {
-  val orig = File(fileName)
-  val name = orig.nameWithoutExtension
-  val ext = orig.extension
-  fun tryCombine(n: Int): String {
+  fun tryCombine(fileName: String, n: Int): String {
+    val name = File(fileName).nameWithoutExtension
+    val ext = File(fileName).extension
    val suffix = if (n == 0) "" else "_$n"
    val f = "$name$suffix.$ext"
-    return if (File(getAppFilePath(context, f)).exists()) tryCombine(n + 1) else f
+    return if (File(getAppFilePath(context, f)).exists()) tryCombine(fileName, n + 1) else f
  }
-  return tryCombine(0)
+  return tryCombine(fileName, 0)
 }

 fun formatBytes(bytes: Long): String {
@@ -548,48 +462,3 @@ val LongRange.Companion.saver
    save = { it.value.first to it.value.last },
    restore = { mutableStateOf(it.first..it.second) }
    )
-
-/* Make sure that T class has @Serializable annotation */
-inline fun <reified T> serializableSaver(): Saver<T, *> = Saver(
-    save = { json.encodeToString(it) },
-    restore = { json.decodeFromString(it) }
-  )
-
-fun saveAppLocale(pref: SharedPreference<String?>, activity: Activity, languageCode: String? = null) {
-//  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//    val localeManager = SimplexApp.context.getSystemService(LocaleManager::class.java)
-//    localeManager.applicationLocales = LocaleList(Locale.forLanguageTag(languageCode ?: return))
-//  } else {
-    pref.set(languageCode)
-    if (languageCode == null) {
-      activity.applyLocale(SimplexApp.context.defaultLocale)
-    }
-    activity.recreate()
-//  }
-}
-
-fun Activity.applyAppLocale(pref: SharedPreference<String?>) {
-//  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-    val lang = pref.get()
-    if (lang == null || lang == Locale.getDefault().language) return
-    applyLocale(Locale.forLanguageTag(lang))
-//  }
-}
-
-private fun Activity.applyLocale(locale: Locale) {
-  Locale.setDefault(locale)
-  val appConf = Configuration(SimplexApp.context.resources.configuration).apply { setLocale(locale) }
-  val activityConf = Configuration(resources.configuration).apply { setLocale(locale) }
-  @Suppress("DEPRECATION")
-  SimplexApp.context.resources.updateConfiguration(appConf, resources.displayMetrics)
-  @Suppress("DEPRECATION")
-  resources.updateConfiguration(activityConf, resources.displayMetrics)
-}
-
-fun UriHandler.openUriCatching(uri: String) {
-  try {
-    openUri(uri)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, e.stackTraceToString())
-  }
-}
@@ -47,7 +47,7 @@ fun AddGroupView(chatModel: ChatModel, close: () -> Unit) {
          setGroupMembers(groupInfo, chatModel)
          close.invoke()
          ModalManager.shared.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, true, chatModel, close)
+            AddGroupMembersView(groupInfo, chatModel, close)
          }
        }
      }
@@ -134,13 +134,7 @@ fun AddGroupLayout(chatModelIncognito: Boolean, createGroup: (GroupProfile) -> U
          val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
          if (enabled) {
            CreateGroupButton(MaterialTheme.colors.primary, Modifier
-              .clickable {
-                createGroup(GroupProfile(
-                  displayName = displayName.value,
-                  fullName = fullName.value,
-                  image = profileImage.value
-                ))
-              }
+              .clickable { createGroup(GroupProfile(displayName.value, fullName.value, profileImage.value)) }
              .padding(8.dp))
          } else {
            CreateGroupButton(HighOrLowlight, Modifier.padding(8.dp))
@@ -37,7 +37,7 @@ import kotlinx.coroutines.launch
 import kotlin.math.roundToInt

@Composable
-fun NewChatSheet(chatModel: ChatModel, newChatSheetState: StateFlow<AnimatedViewState>, stopped: Boolean, closeNewChatSheet: (animated: Boolean) -> Unit) {
+fun NewChatSheet(chatModel: ChatModel, newChatSheetState: StateFlow<NewChatSheetState>, stopped: Boolean, closeNewChatSheet: (animated: Boolean) -> Unit) {
  if (newChatSheetState.collectAsState().value.isVisible()) BackHandler { closeNewChatSheet(true) }
  NewChatSheetLayout(
    newChatSheetState,
@@ -63,7 +63,7 @@ private val icons = listOf(Icons.Outlined.AddLink, Icons.Outlined.QrCode, Icons.

@Composable
 private fun NewChatSheetLayout(
-  newChatSheetState: StateFlow<AnimatedViewState>,
+  newChatSheetState: StateFlow<NewChatSheetState>,
  stopped: Boolean,
  addContact: () -> Unit,
  connectViaLink: () -> Unit,
@@ -216,7 +216,7 @@ fun ActionButton(
 private fun PreviewNewChatSheet() {
  SimpleXTheme {
    NewChatSheetLayout(
-      MutableStateFlow(AnimatedViewState.VISIBLE),
+      MutableStateFlow(NewChatSheetState.VISIBLE),
      stopped = false,
      addContact = {},
      connectViaLink = {},
@@ -1,100 +1,32 @@
 package chat.simplex.app.views.newchat

 import android.graphics.Bitmap
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.platform.*
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.core.graphics.*
-import androidx.core.graphics.drawable.toBitmap
-import boofcv.alg.drawing.FiducialImageEngine
-import boofcv.alg.fiducial.qrcode.*
+import boofcv.alg.fiducial.qrcode.QrCodeEncoder
+import boofcv.alg.fiducial.qrcode.QrCodeGeneratorImage
 import boofcv.android.ConvertBitmap
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
 import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.launch

@Composable
-fun QRCode(
-  connReq: String,
-  modifier: Modifier = Modifier,
-  tintColor: Color = Color(0xff062d56),
-  withLogo: Boolean = true
-) {
-  val context = LocalContext.current
-  val scope = rememberCoroutineScope()
-
-  BoxWithConstraints {
-    val maxWidthInPx = with(LocalDensity.current) { maxWidth.roundToPx() }
-    val qr = remember(maxWidthInPx, connReq, tintColor, withLogo) {
-      qrCodeBitmap(connReq, maxWidthInPx).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
-        .let { if (withLogo) it.addLogo() else it }
-        .asImageBitmap()
-    }
-    Image(
-      bitmap = qr,
-      contentDescription = stringResource(R.string.image_descr_qr_code),
-      modifier
-        .clickable {
-          scope.launch {
-            val image = qrCodeBitmap(connReq, 1024).replaceColor(Color.Black.toArgb(), tintColor.toArgb())
-              .let { if (withLogo) it.addLogo() else it }
-            val file = saveTempImageUncompressed(image, false)
-            if (file != null) {
-              shareFile(context, "", file.absolutePath)
-            }
-          }
-        }
-    )
-  }
+fun QRCode(connReq: String, modifier: Modifier = Modifier) {
+  Image(
+    bitmap = qrCodeBitmap(connReq, 1024).asImageBitmap(),
+    contentDescription = stringResource(R.string.image_descr_qr_code),
+    modifier = modifier
+  )
 }

-fun qrCodeBitmap(content: String, size: Int = 1024): Bitmap {
-  val qrCode = QrCodeEncoder().addAutomatic(content).setError(QrCode.ErrorLevel.L).fixate()
-  /** See [QrCodeGeneratorImage.initialize] and [FiducialImageEngine.configure] for size calculation */
-  val numModules = QrCode.totalModules(qrCode.version)
-  val borderModule = 1
-  // val calculatedFinalWidth = (pixelsPerModule * numModules) + 2 * (borderModule * pixelsPerModule)
-  // size = (x * numModules) + 2 * (borderModule * x)
-  // size / x = numModules + 2 * borderModule
-  // x = size / (numModules + 2 * borderModule)
-  val pixelsPerModule = size / (numModules + 2 * borderModule)
-  // + 1 to make it with better quality
-  val renderer = QrCodeGeneratorImage(pixelsPerModule + 1)
-  renderer.borderModule = borderModule
+fun qrCodeBitmap(content: String, size: Int): Bitmap {
+  val qrCode = QrCodeEncoder().addAutomatic(content).fixate()
+  val renderer = QrCodeGeneratorImage(5)
  renderer.render(qrCode)
-  return ConvertBitmap.grayToBitmap(renderer.gray, Bitmap.Config.RGB_565).scale(size, size)
-}
-
-fun Bitmap.replaceColor(from: Int, to: Int): Bitmap {
-  val pixels = IntArray(width * height)
-  getPixels(pixels, 0, width, 0, 0, width, height)
-  var i = 0
-  while (i < pixels.size) {
-    if (pixels[i] == from) {
-      pixels[i] = to
-    }
-    i++
-  }
-  setPixels(pixels, 0, width, 0, 0, width, height)
-  return this
-}
-
-fun Bitmap.addLogo(): Bitmap = applyCanvas {
-  val radius = (width * 0.16f) / 2
-  val paint = android.graphics.Paint()
-  paint.color = android.graphics.Color.WHITE
-  drawCircle(width / 2f, height / 2f, radius, paint)
-  val logo = SimplexApp.context.resources.getDrawable(R.mipmap.icon_foreground, null).toBitmap()
-  val logoSize = (width * 0.24).toInt()
-  translate((width - logoSize) / 2f, (height - logoSize) / 2f)
-  drawBitmap(logo, null, android.graphics.Rect(0, 0, logoSize, logoSize), null)
+  return ConvertBitmap.grayToBitmap(renderer.gray, Bitmap.Config.RGB_565)
 }

@Preview
@@ -36,7 +36,7 @@ fun HowItWorks(user: User?, onboardingStage: MutableState<OnboardingStage?>? = n
      val uriHandler = LocalUriHandler.current
      Text(
        annotatedStringResource(R.string.read_more_in_github_with_link),
-        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat#readme") },
+        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat#readme") },
        lineHeight = 22.sp
      )
    } else {
@@ -16,12 +16,11 @@ import kotlinx.coroutines.launch
 enum class OnboardingStage {
  Step1_SimpleXInfo,
  Step2_CreateProfile,
-  Step3_SetNotificationsMode,
  OnboardingComplete
 }

@Composable
-fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
+fun CreateProfile(chatModel: ChatModel) {
  val scope = rememberCoroutineScope()
  val scrollState = rememberScrollState()
  val keyboardState by getKeyboardState()
@@ -34,10 +33,7 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
        .background(color = MaterialTheme.colors.background)
        .padding(20.dp)
    ) {
-      CreateProfilePanel(chatModel, close)
-      LaunchedEffect(Unit) {
-        setLastVersionDefault(chatModel)
-      }
+      CreateProfilePanel(chatModel)
      if (savedKeyboardState != keyboardState) {
        LaunchedEffect(keyboardState) {
          scope.launch {
@@ -1,68 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.NotificationsMode
-import chat.simplex.app.views.usersettings.changeNotificationsMode
-
-@Composable
-fun SetNotificationsMode(m: ChatModel) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .verticalScroll(rememberScrollState())
-        .padding(20.dp)
-    ) {
-      AppBarTitle(stringResource(R.string.onboarding_notifications_mode_title), false)
-      val currentMode = rememberSaveable { mutableStateOf(NotificationsMode.default) }
-      Text(stringResource(R.string.onboarding_notifications_mode_subtitle))
-      Spacer(Modifier.padding(DEFAULT_PADDING_HALF))
-      NotificationButton(currentMode, NotificationsMode.OFF, R.string.onboarding_notifications_mode_off, R.string.onboarding_notifications_mode_off_desc)
-      NotificationButton(currentMode, NotificationsMode.PERIODIC, R.string.onboarding_notifications_mode_periodic, R.string.onboarding_notifications_mode_periodic_desc)
-      NotificationButton(currentMode, NotificationsMode.SERVICE, R.string.onboarding_notifications_mode_service, R.string.onboarding_notifications_mode_service_desc)
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-      Box(Modifier.fillMaxWidth().padding(bottom = 16.dp), contentAlignment = Alignment.Center) {
-        OnboardingActionButton(R.string.use_chat, OnboardingStage.OnboardingComplete, m.onboardingStage) {
-          changeNotificationsMode(currentMode.value, m)
-        }
-      }
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-    }
-}
-
-@Composable
-private fun NotificationButton(currentMode: MutableState<NotificationsMode>, mode: NotificationsMode, @StringRes title: Int, @StringRes description: Int) {
-  TextButton(
-    onClick = { currentMode.value = mode },
-    border = BorderStroke(1.dp, color = if (currentMode.value == mode) MaterialTheme.colors.primary else HighOrLowlight.copy(alpha = 0.5f)),
-    shape = RoundedCornerShape(15.dp),
-  ) {
-    Column(Modifier.padding(bottom = 6.dp).padding(horizontal = 8.dp)) {
-      Text(
-        stringResource(title),
-        style = MaterialTheme.typography.h2,
-        fontWeight = FontWeight.Medium,
-        color = if (currentMode.value == mode) MaterialTheme.colors.primary else HighOrLowlight,
-        modifier = Modifier.padding(bottom = 4.dp)
-      )
-      Text(annotatedStringResource(description), color = MaterialTheme.colors.onBackground, lineHeight = 24.sp)
-    }
-  }
-  Spacer(Modifier.height(DEFAULT_PADDING))
-}
@@ -18,12 +18,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.User
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ModalManager
+import chat.simplex.app.views.helpers.generalGetString

@Composable
 fun SimpleXInfo(chatModel: ChatModel, onboarding: Boolean = true) {
@@ -46,15 +48,15 @@ fun SimpleXInfoLayout(
      .verticalScroll(rememberScrollState())
      .padding(horizontal = DEFAULT_PADDING),
  ) {
-    Box(Modifier.fillMaxWidth().padding(top = 8.dp), contentAlignment = Alignment.Center) {
+    Box(Modifier.fillMaxWidth().padding(top = 24.dp, bottom = 8.dp), contentAlignment = Alignment.Center) {
      SimpleXLogo()
    }

-    Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 36.dp).padding(horizontal = 48.dp), textAlign = TextAlign.Center)
+    Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 24.dp), textAlign = TextAlign.Center)

-    InfoRow(painterResource(R.drawable.privacy), R.string.privacy_redefined, R.string.first_platform_without_user_ids, width = 80.dp)
+    InfoRow(painterResource(R.drawable.privacy), R.string.privacy_redefined, R.string.first_platform_without_user_ids)
    InfoRow(painterResource(R.drawable.shield), R.string.immune_to_spam_and_abuse, R.string.people_can_connect_only_via_links_you_share)
-    InfoRow(painterResource(if (isInDarkTheme()) R.drawable.decentralized_light else R.drawable.decentralized), R.string.decentralized, R.string.opensource_protocol_and_code_anybody_can_run_servers)
+    InfoRow(painterResource(R.drawable.decentralized), R.string.decentralized, R.string.opensource_protocol_and_code_anybody_can_run_servers)

    Spacer(Modifier.fillMaxHeight().weight(1f))

@@ -88,14 +90,14 @@ fun SimpleXLogo() {
 }

@Composable
-private fun InfoRow(icon: Painter, @StringRes titleId: Int, @StringRes textId: Int, width: Dp = 76.dp) {
-  Row(Modifier.padding(bottom = 27.dp), verticalAlignment = Alignment.Top) {
+private fun InfoRow(icon: Painter, @StringRes titleId: Int, @StringRes textId: Int) {
+  Row(Modifier.padding(bottom = 20.dp), verticalAlignment = Alignment.Top) {
    Image(icon, contentDescription = null, modifier = Modifier
-      .width(width)
-      .padding(top = 8.dp, start = 8.dp, end = 24.dp))
+      .width(60.dp)
+      .padding(top = 8.dp, end = 16.dp))
    Column(horizontalAlignment = Alignment.Start) {
      Text(stringResource(titleId), fontWeight = FontWeight.Bold, style = MaterialTheme.typography.h3, lineHeight = 24.sp)
-      Text(stringResource(textId), lineHeight = 24.sp, style = MaterialTheme.typography.body1)
+      Text(stringResource(textId), lineHeight = 24.sp, style = MaterialTheme.typography.caption)
    }
  }
 }
@@ -103,14 +105,14 @@ private fun InfoRow(icon: Painter, @StringRes titleId: Int, @StringRes textId: I
@Composable
 fun OnboardingActionButton(user: User?, onboardingStage: MutableState<OnboardingStage?>, onclick: (() -> Unit)? = null) {
  if (user == null) {
-    OnboardingActionButton(R.string.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, onboardingStage, onclick)
+    ActionButton(R.string.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, onboardingStage, onclick)
  } else {
-    OnboardingActionButton(R.string.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, onboardingStage, onclick)
+    ActionButton(R.string.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, onboardingStage, onclick)
  }
 }

@Composable
-fun OnboardingActionButton(
+private fun ActionButton(
  @StringRes labelId: Int,
  onboarding: OnboardingStage?,
  onboardingStage: MutableState<OnboardingStage?>,
@@ -1,338 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
-  val currentVersion = remember { mutableStateOf(versionDescriptions.lastIndex) }
-
-  @Composable
-  fun featureDescription(icon: ImageVector, titleId: Int, descrId: Int, link: String?) {
-    @Composable
-    fun linkButton(link: String) {
-      val uriHandler = LocalUriHandler.current
-      Icon(
-        Icons.Outlined.OpenInNew, stringResource(titleId), tint = MaterialTheme.colors.primary,
-        modifier = Modifier
-          .clickable { uriHandler.openUriCatching(link) }
-      )
-    }
-
-    Column(
-      horizontalAlignment = Alignment.Start
-    ) {
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        Icon(icon, stringResource(titleId), tint = HighOrLowlight)
-        Text(
-          generalGetString(titleId),
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          style = MaterialTheme.typography.h3,
-          fontWeight = FontWeight.Medium
-        )
-        if (link != null) {
-          linkButton(link)
-        }
-      }
-      Text(generalGetString(descrId))
-    }
-  }
-
-  @Composable
-  fun pagination() {
-    Row(
-      Modifier
-        .padding(bottom = 16.dp)
-    ) {
-      if (currentVersion.value > 0) {
-        val prev = currentVersion.value - 1
-        Surface(shape = RoundedCornerShape(20.dp)) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = prev }
-              .padding(8.dp)
-          ) {
-            Icon(Icons.Outlined.ArrowBackIosNew, "previous", tint = MaterialTheme.colors.primary)
-            Text(versionDescriptions[prev].version, color = MaterialTheme.colors.primary)
-          }
-        }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      if (currentVersion.value < versionDescriptions.lastIndex) {
-        val next = currentVersion.value + 1
-        Surface(shape = RoundedCornerShape(20.dp)) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = next }
-              .padding(8.dp)
-          ) {
-            Text(versionDescriptions[next].version, color = MaterialTheme.colors.primary)
-            Icon(Icons.Outlined.ArrowForwardIos, "next", tint = MaterialTheme.colors.primary)
-          }
-        }
-      }
-    }
-  }
-
-  val v = versionDescriptions[currentVersion.value]
-
-  ModalView(close = close) {
-    Column(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = DEFAULT_PADDING),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
-      Text(
-        String.format(generalGetString(R.string.new_in_version), v.version),
-        Modifier
-          .fillMaxWidth()
-          .padding(DEFAULT_PADDING),
-        textAlign = TextAlign.Center,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h1,
-        fontWeight = FontWeight.Normal,
-        color = HighOrLowlight
-      )
-
-      v.features.forEach { feature ->
-        featureDescription(feature.icon, feature.titleId, feature.descrId, feature.link)
-      }
-
-      if (!viaSettings) {
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(
-          Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
-        ) {
-          Text(
-            generalGetString(R.string.ok),
-            modifier = Modifier.clickable(onClick = close),
-            style = MaterialTheme.typography.h3,
-            color = MaterialTheme.colors.primary
-          )
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-      }
-
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-
-      pagination()
-    }
-  }
-}
-
-private data class FeatureDescription(
-  val icon: ImageVector,
-  val titleId: Int,
-  val descrId: Int,
-  val link: String? = null
-)
-
-private data class VersionDescription(
-  val version: String,
-  val features: List<FeatureDescription>
-)
-
-private val versionDescriptions: List<VersionDescription> = listOf(
-  VersionDescription(
-    version = "v4.2",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.VerifiedUser,
-        titleId = R.string.v4_2_security_assessment,
-        descrId = R.string.v4_2_security_assessment_desc,
-        link = "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html"
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Group,
-        titleId = R.string.v4_2_group_links,
-        descrId = R.string.v4_2_group_links_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Check,
-        titleId = R.string.v4_2_auto_accept_contact_requests,
-        descrId = R.string.v4_2_auto_accept_contact_requests_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.3",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Mic,
-        titleId = R.string.v4_3_voice_messages,
-        descrId = R.string.v4_3_voice_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.DeleteForever,
-        titleId = R.string.v4_3_irreversible_message_deletion,
-        descrId = R.string.v4_3_irreversible_message_deletion_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.WifiTethering,
-        titleId = R.string.v4_3_improved_server_configuration,
-        descrId = R.string.v4_3_improved_server_configuration_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.VisibilityOff,
-        titleId = R.string.v4_3_improved_privacy_and_security,
-        descrId = R.string.v4_3_improved_privacy_and_security_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.4",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Timer,
-        titleId = R.string.v4_4_disappearing_messages,
-        descrId = R.string.v4_4_disappearing_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Pending,
-        titleId = R.string.v4_4_live_messages,
-        descrId = R.string.v4_4_live_messages_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.VerifiedUser,
-        titleId = R.string.v4_4_verify_connection_security,
-        descrId = R.string.v4_4_verify_connection_security_desc
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_4_french_interface,
-        descrId = R.string.v4_4_french_interface_descr
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.5",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.ManageAccounts,
-        titleId = R.string.v4_5_multiple_chat_profiles,
-        descrId = R.string.v4_5_multiple_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.EditNote,
-        titleId = R.string.v4_5_message_draft,
-        descrId = R.string.v4_5_message_draft_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.SafetyDivider,
-        titleId = R.string.v4_5_transport_isolation,
-        descrId = R.string.v4_5_transport_isolation_descr,
-        link = "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation"
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Task,
-        titleId = R.string.v4_5_private_filenames,
-        descrId = R.string.v4_5_private_filenames_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Battery2Bar,
-        titleId = R.string.v4_5_reduced_battery_usage,
-        descrId = R.string.v4_5_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_5_italian_interface,
-        descrId = R.string.v4_5_italian_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.6",
-    features = listOf(
-      FeatureDescription(
-        icon = Icons.Outlined.Lock,
-        titleId = R.string.v4_6_hidden_chat_profiles,
-        descrId = R.string.v4_6_hidden_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Flag,
-        titleId = R.string.v4_6_group_moderation,
-        descrId = R.string.v4_6_group_moderation_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.MapsUgc,
-        titleId = R.string.v4_6_group_welcome_message,
-        descrId = R.string.v4_6_group_welcome_message_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Call,
-        titleId = R.string.v4_6_audio_video_calls,
-        descrId = R.string.v4_6_audio_video_calls_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Battery3Bar,
-        titleId = R.string.v4_6_reduced_battery_usage,
-        descrId = R.string.v4_6_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = Icons.Outlined.Translate,
-        titleId = R.string.v4_6_chinese_spanish_interface,
-        descrId = R.string.v4_6_chinese_spanish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
-      )
-    )
-  ),
-)
-
-private val lastVersion = versionDescriptions.last().version
-
-fun setLastVersionDefault(m: ChatModel) {
-  m.controller.appPrefs.whatsNewVersion.set(lastVersion)
-}
-
-fun shouldShowWhatsNew(m: ChatModel): Boolean {
-  val v = m.controller.appPrefs.whatsNewVersion.get()
-  setLastVersionDefault(m)
-  return v != lastVersion
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewWhatsNewView() {
-  SimpleXTheme {
-    WhatsNewView(
-      viaSettings = true,
-      close = {}
-    )
-  }
-}
@@ -33,7 +33,6 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
  val networkTCPConnectTimeout = remember { mutableStateOf(currentCfgVal.tcpConnectTimeout) }
  val networkTCPTimeout = remember { mutableStateOf(currentCfgVal.tcpTimeout) }
  val networkSMPPingInterval = remember { mutableStateOf(currentCfgVal.smpPingInterval) }
-  val networkSMPPingCount = remember { mutableStateOf(currentCfgVal.smpPingCount) }
  val networkEnableKeepAlive = remember { mutableStateOf(currentCfgVal.enableKeepAlive) }
  val networkTCPKeepIdle: MutableState<Int>
  val networkTCPKeepIntvl: MutableState<Int>
@@ -49,6 +48,10 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
  }

  fun buildCfg(): NetCfg {
+    val socksProxy = currentCfg.value.socksProxy
+    val tcpConnectTimeout = networkTCPConnectTimeout.value
+    val tcpTimeout = networkTCPTimeout.value
+    val smpPingInterval = networkSMPPingInterval.value
    val enableKeepAlive = networkEnableKeepAlive.value
    val tcpKeepAlive = if (enableKeepAlive) {
      val keepIdle = networkTCPKeepIdle.value
@@ -59,15 +62,11 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
      null
    }
    return NetCfg(
-      socksProxy = currentCfg.value.socksProxy,
-      hostMode = currentCfg.value.hostMode,
-      requiredHostMode = currentCfg.value.requiredHostMode,
-      sessionMode = currentCfg.value.sessionMode,
-      tcpConnectTimeout = networkTCPConnectTimeout.value,
-      tcpTimeout = networkTCPTimeout.value,
+      socksProxy = socksProxy,
+      tcpConnectTimeout = tcpConnectTimeout,
+      tcpTimeout = tcpTimeout,
      tcpKeepAlive = tcpKeepAlive,
-      smpPingInterval = networkSMPPingInterval.value,
-      smpPingCount = networkSMPPingCount.value
+      smpPingInterval = smpPingInterval
    )
  }

@@ -75,7 +74,6 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
    networkTCPConnectTimeout.value = cfg.tcpConnectTimeout
    networkTCPTimeout.value = cfg.tcpTimeout
    networkSMPPingInterval.value = cfg.smpPingInterval
-    networkSMPPingCount.value = cfg.smpPingCount
    networkEnableKeepAlive.value = cfg.enableKeepAlive
    if (cfg.tcpKeepAlive != null) {
      networkTCPKeepIdle.value = cfg.tcpKeepAlive.keepIdle
@@ -115,7 +113,6 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
    networkTCPConnectTimeout,
    networkTCPTimeout,
    networkSMPPingInterval,
-    networkSMPPingCount,
    networkEnableKeepAlive,
    networkTCPKeepIdle,
    networkTCPKeepIntvl,
@@ -132,7 +129,6 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
  networkTCPConnectTimeout: MutableState<Long>,
  networkTCPTimeout: MutableState<Long>,
  networkSMPPingInterval: MutableState<Long>,
-  networkSMPPingCount: MutableState<Int>,
  networkEnableKeepAlive: MutableState<Boolean>,
  networkTCPKeepIdle: MutableState<Int>,
  networkTCPKeepIntvl: MutableState<Int>,
@@ -174,14 +170,7 @@ fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
      SectionItemView {
        TimeoutSettingRow(
          stringResource(R.string.network_option_ping_interval), networkSMPPingInterval,
-          listOf(120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000), secondsLabel
-        )
-      }
-      SectionDivider()
-      SectionItemView {
-        IntSettingRow(
-          stringResource(R.string.network_option_ping_count), networkSMPPingCount,
-          listOf(1, 2, 3, 5, 8), ""
+          listOf(120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000), secondsLabel
        )
      }
      SectionDivider()
@@ -423,7 +412,6 @@ fun PreviewAdvancedNetworkSettingsLayout() {
      networkTCPConnectTimeout = remember { mutableStateOf(10_000000) },
      networkTCPTimeout = remember { mutableStateOf(10_000000) },
      networkSMPPingInterval = remember { mutableStateOf(10_000000) },
-      networkSMPPingCount = remember { mutableStateOf(3) },
      networkEnableKeepAlive = remember { mutableStateOf(true) },
      networkTCPKeepIdle = remember { mutableStateOf(10) },
      networkTCPKeepIntvl = remember { mutableStateOf(10) },
@@ -2,20 +2,13 @@ package chat.simplex.app.views.usersettings

 import SectionCustomFooter
 import SectionDivider
-import SectionItemView
 import SectionItemViewSpaceBetween
-import SectionItemWithValue
 import SectionSpacer
 import SectionView
-import android.app.Activity
 import android.content.ComponentName
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
@@ -24,7 +17,6 @@ import androidx.compose.material.MaterialTheme.colors
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Circle
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
@@ -32,19 +24,17 @@ import androidx.compose.ui.graphics.*
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import chat.simplex.app.*
 import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.SharedPreference
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import com.godaddy.android.colorpicker.*
-import kotlinx.coroutines.delay
-import java.util.*

 enum class AppIcon(val resId: Int) {
  DEFAULT(R.mipmap.icon),
@@ -52,7 +42,7 @@ enum class AppIcon(val resId: Int) {
 }

@Composable
-fun AppearanceView(m: ChatModel) {
+fun AppearanceView() {
  val appIcon = remember { mutableStateOf(findEnabledIcon()) }

  fun setAppIcon(newIcon: AppIcon) {
@@ -74,8 +64,12 @@ fun AppearanceView(m: ChatModel) {

  AppearanceLayout(
    appIcon,
-    m.controller.appPrefs.appLanguage,
    changeIcon = ::setAppIcon,
+    showThemeSelector = {
+      ModalManager.shared.showModal(true) {
+        ThemeSelectorView()
+      }
+    },
    editPrimaryColor = { primary ->
      ModalManager.shared.showModalCloseable { close ->
        ColorEditor(primary, close)
@@ -86,8 +80,8 @@ fun AppearanceView(m: ChatModel) {

@Composable fun AppearanceLayout(
  icon: MutableState<AppIcon>,
-  languagePref: SharedPreference<String?>,
  changeIcon: (AppIcon) -> Unit,
+  showThemeSelector: () -> Unit,
  editPrimaryColor: (Color) -> Unit,
 ) {
  Column(
@@ -95,37 +89,6 @@ fun AppearanceView(m: ChatModel) {
    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.appearance_settings))
-    SectionView(stringResource(R.string.settings_section_title_language), padding = PaddingValues()) {
-      val context = LocalContext.current
-//      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//        SectionItemWithValue(
-//          generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-//          remember { mutableStateOf("system") },
-//          listOf(ValueTitleDesc("system", generalGetString(R.string.change_verb), "")),
-//          onSelected = { openSystemLangPicker(context as? Activity ?: return@SectionItemWithValue) }
-//        )
-//      } else {
-        val state = rememberSaveable { mutableStateOf(languagePref.get() ?: "system") }
-        SectionItemView {
-          LangSelector(state) {
-            state.value = it
-            withApi {
-              delay(200)
-              val activity = context as? Activity
-              if (activity != null) {
-                if (it == "system") {
-                  saveAppLocale(languagePref, activity)
-                } else {
-                  saveAppLocale(languagePref, activity, it)
-                }
-              }
-            }
-          }
-        }
-//      }
-    }
-    SectionSpacer()
-
    SectionView(stringResource(R.string.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
      LazyRow {
        items(AppIcon.values().size, { index -> AppIcon.values()[index] }) { index ->
@@ -152,12 +115,8 @@ fun AppearanceView(m: ChatModel) {
    SectionSpacer()
    val currentTheme by CurrentColors.collectAsState()
    SectionView(stringResource(R.string.settings_section_title_themes)) {
-      SectionItemViewSpaceBetween {
-        val darkTheme = isSystemInDarkTheme()
-        val state = remember { derivedStateOf { currentTheme.second } }
-        ThemeSelector(state) {
-          ThemeManager.applyTheme(it.name, darkTheme)
-        }
+      SectionItemViewSpaceBetween(showThemeSelector) {
+        Text(generalGetString(R.string.theme))
      }
      SectionDivider()
      SectionItemViewSpaceBetween({ editPrimaryColor(currentTheme.first.primary) }) {
@@ -224,50 +183,6 @@ fun ColorPicker(initialColor: Color, onColorChanged: (Color) -> Unit) {
  )
 }

-@Composable
-private fun LangSelector(state: State<String>, onSelected: (String) -> Unit) {
-  // Should be the same as in app/build.gradle's `android.defaultConfig.resConfigs`
-  val supportedLanguages = mapOf(
-    "system" to generalGetString(R.string.language_system),
-    "en" to "English",
-    "cs" to "Čeština",
-    "de" to "Deutsch",
-    "es" to "Español",
-    "fr" to "Français",
-    "it" to "Italiano",
-    "nl" to "Nederlands",
-    "ru" to "Русский",
-    "zh-CN" to "简体中文"
-  )
-  val values by remember { mutableStateOf(supportedLanguages.map { it.key to it.value }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun ThemeSelector(state: State<DefaultTheme>, onSelected: (DefaultTheme) -> Unit) {
-  val darkTheme = isSystemInDarkTheme()
-  val values by remember { mutableStateOf(ThemeManager.allThemes(darkTheme).map { it.second to it.third }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.theme),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-//private fun openSystemLangPicker(activity: Activity) {
-//  activity.startActivity(Intent(Settings.ACTION_APP_LOCALE_SETTINGS, Uri.parse("package:" + SimplexApp.context.packageName)))
-//}
-
 private fun findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
  SimplexApp.context.packageManager.getComponentEnabledSetting(
    ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${icon.name.lowercase()}")
@@ -280,8 +195,8 @@ fun PreviewAppearanceSettings() {
  SimpleXTheme {
    AppearanceLayout(
      icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
-      languagePref = SharedPreference({ null }, {}),
      changeIcon = {},
+      showThemeSelector = {},
      editPrimaryColor = {},
    )
  }
@@ -2,7 +2,6 @@ package chat.simplex.app.views.usersettings

 import SectionDivider
 import SectionItemView
-import SectionTextFooter
 import SectionView
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -10,7 +9,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -32,8 +30,8 @@ fun CallSettingsView(m: ChatModel,

@Composable
 fun CallSettingsLayout(
-  webrtcPolicyRelay: SharedPreference<Boolean>,
-  callOnLockScreen: SharedPreference<CallOnLockScreen>,
+  webrtcPolicyRelay: Preference<Boolean>,
+  callOnLockScreen: Preference<CallOnLockScreen>,
  editIceServers: () -> Unit,
 ) {
  Column(
@@ -44,23 +42,16 @@ fun CallSettingsLayout(
    AppBarTitle(stringResource(R.string.your_calls))
    val lockCallState = remember { mutableStateOf(callOnLockScreen.get()) }
    SectionView(stringResource(R.string.settings_section_title_settings)) {
-      SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) }
+      SectionItemView() {
+        SharedPreferenceToggle(stringResource(R.string.connect_calls_via_relay), webrtcPolicyRelay)
+      }
      SectionDivider()

      val enabled = remember { mutableStateOf(true) }
      SectionItemView { LockscreenOpts(lockCallState, enabled, onSelected = { callOnLockScreen.set(it); lockCallState.value = it }) }
      SectionDivider()
-      SectionItemView() {
-        SharedPreferenceToggle(stringResource(R.string.always_use_relay), webrtcPolicyRelay)
-      }
+      SectionItemView(editIceServers) { Text(stringResource(R.string.webrtc_ice_servers)) }
    }
-    SectionTextFooter(
-      if (remember { webrtcPolicyRelay.state }.value) {
-        generalGetString(R.string.relay_server_protects_ip)
-      } else {
-        generalGetString(R.string.relay_server_if_necessary)
-      }
-    )
  }
 }

@@ -88,10 +79,9 @@ private fun LockscreenOpts(lockscreenOpts: State<CallOnLockScreen>, enabled: Sta
@Composable
 fun SharedPreferenceToggle(
  text: String,
-  preference: SharedPreference<Boolean>,
-  preferenceState: MutableState<Boolean>? = null,
-  onChange: ((Boolean) -> Unit)? = null,
-  ) {
+  preference: Preference<Boolean>,
+  preferenceState: MutableState<Boolean>? = null
+) {
  val prefState = preferenceState ?: remember { mutableStateOf(preference.get()) }
  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
    Text(text, Modifier.padding(end = 24.dp))
@@ -101,7 +91,6 @@ fun SharedPreferenceToggle(
      onCheckedChange = {
        preference.set(it)
        prefState.value = it
-        onChange?.invoke(it)
      },
      colors = SwitchDefaults.colors(
        checkedThumbColor = MaterialTheme.colors.primary,
@@ -117,12 +106,12 @@ fun SharedPreferenceToggleWithIcon(
  icon: ImageVector,
  stopped: Boolean = false,
  onClickInfo: () -> Unit,
-  preference: SharedPreference<Boolean>,
+  preference: Preference<Boolean>,
  preferenceState: MutableState<Boolean>? = null
 ) {
  val prefState = preferenceState ?: remember { mutableStateOf(preference.get()) }
  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    Text(text, Modifier.padding(end = 4.dp), color = if (stopped) HighOrLowlight else Color.Unspecified)
+    Text(text, Modifier.padding(end = 4.dp))
    Icon(
      icon,
      null,
@@ -146,7 +135,7 @@ fun SharedPreferenceToggleWithIcon(
 }

@Composable
-fun <T>SharedPreferenceRadioButton(text: String, prefState: MutableState<T>, preference: SharedPreference<T>, value: T) {
+fun <T>SharedPreferenceRadioButton(text: String, prefState: MutableState<T>, preference: Preference<T>, value: T) {
  Row(verticalAlignment = Alignment.CenterVertically) {
    Text(text)
    val colors = RadioButtonDefaults.colors(selectedColor = MaterialTheme.colors.primary)
@@ -3,9 +3,7 @@ package chat.simplex.app.views.usersettings
 import android.annotation.SuppressLint
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
-import android.util.Log
 import chat.simplex.app.R
-import chat.simplex.app.TAG
 import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.generalGetString
 import java.security.KeyStore
@@ -33,7 +31,7 @@ internal class Cryptor {
    val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
    val spec = GCMParameterSpec(128, iv)
    cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
-    return runCatching { String(cipher.doFinal(data))}.onFailure { Log.e(TAG, "doFinal: ${it.stackTraceToString()}") }.getOrNull()
+    return String(cipher.doFinal(data))
  }

  fun encryptText(text: String, alias: String): Pair<ByteArray, ByteArray> {
@@ -1,89 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionItemViewSpaceBetween
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.User
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chatlist.UserProfileRow
-import chat.simplex.app.views.database.PassphraseField
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun HiddenProfileView(
-  m: ChatModel,
-  user: User,
-  close: () -> Unit,
-) {
-  HiddenProfileLayout(
-    user,
-    saveProfilePassword = { hidePassword ->
-      withBGApi {
-        try {
-          val u = m.controller.apiHideUser(user.userId, hidePassword)
-          m.updateUser(u)
-          close()
-        } catch (e: Exception) {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.error_saving_user_password),
-            text = e.stackTraceToString()
-          )
-        }
-      }
-    }
-  )
-}
-
-@Composable
-private fun HiddenProfileLayout(
-  user: User,
-  saveProfilePassword: (String) -> Unit
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_BOTTOM_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.hide_profile))
-    SectionView(padding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
-      UserProfileRow(user)
-    }
-    SectionSpacer()
-
-    val hidePassword = rememberSaveable { mutableStateOf("") }
-    val confirmHidePassword = rememberSaveable { mutableStateOf("") }
-    val confirmValid by remember { derivedStateOf { confirmHidePassword.value == "" || hidePassword.value == confirmHidePassword.value } }
-    val saveDisabled by remember { derivedStateOf { hidePassword.value == "" || confirmHidePassword.value == "" || !confirmValid } }
-    SectionView(stringResource(R.string.hidden_profile_password).uppercase()) {
-      SectionItemView {
-        PassphraseField(hidePassword, generalGetString(R.string.password_to_show), isValid = { true }, showStrength = true)
-      }
-      SectionDivider()
-      SectionItemView {
-        PassphraseField(confirmHidePassword, stringResource(R.string.confirm_password), isValid = { confirmValid }, dependsOn = hidePassword)
-      }
-      SectionDivider()
-      SectionItemViewSpaceBetween({ saveProfilePassword(hidePassword.value) }, disabled = saveDisabled, minHeight = TextFieldDefaults.MinHeight) {
-        Text(generalGetString(R.string.save_profile_password), color = if (saveDisabled) HighOrLowlight else MaterialTheme.colors.primary)
-      }
-    }
-    SectionTextFooter(stringResource(R.string.to_reveal_profile_enter_password))
-  }
-}
@@ -17,13 +17,18 @@ import chat.simplex.app.model.Format
 import chat.simplex.app.model.FormatColor
 import chat.simplex.app.ui.theme.DEFAULT_PADDING
 import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.AppBarTitle
+import chat.simplex.app.views.helpers.generalGetString

@Composable
 fun MarkdownHelpView() {
  Column(
    Modifier
      .fillMaxWidth()
+      .verticalScroll(rememberScrollState())
+      .padding(horizontal = DEFAULT_PADDING)
  ) {
+    AppBarTitle(stringResource(R.string.how_to_use_markdown), false)
    Text(stringResource(R.string.you_can_use_markdown_to_format_messages__prompt))
    Spacer(Modifier.height(DEFAULT_PADDING))
    val bold = stringResource(R.string.bold)
@@ -25,27 +25,19 @@ fun NetworkAndServersView(
  chatModel: ChatModel,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
 ) {
  // It's not a state, just a one-time value. Shouldn't be used in any state-related situations
  val netCfg = remember { chatModel.controller.getNetCfg() }
  val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(netCfg.useSocksProxy) }
  val developerTools = chatModel.controller.appPrefs.developerTools.get()
  val onionHosts = remember { mutableStateOf(netCfg.onionHosts) }
-  val sessionMode = remember { mutableStateOf(netCfg.sessionMode) }
-
-  LaunchedEffect(Unit) {
-    chatModel.userSMPServersUnsaved.value = null
-  }

  NetworkAndServersLayout(
    developerTools = developerTools,
    networkUseSocksProxy = networkUseSocksProxy,
    onionHosts = onionHosts,
-    sessionMode = sessionMode,
    showModal = showModal,
    showSettingsModal = showSettingsModal,
-    showCustomModal = showCustomModal,
    toggleSocksProxy = { enable ->
      if (enable) {
        AlertManager.shared.showAlertMsg(
@@ -86,13 +78,9 @@ fun NetworkAndServersView(
        OnionHosts.PREFER -> generalGetString(R.string.network_use_onion_hosts_prefer_desc_in_alert)
        OnionHosts.REQUIRED -> generalGetString(R.string.network_use_onion_hosts_required_desc_in_alert)
      }
-      updateNetworkSettingsDialog(
-        title = generalGetString(R.string.update_onion_hosts_settings_question),
-        startsWith,
-        onDismiss = {
-          onionHosts.value = prevValue
-        }
-      ) {
+      updateOnionHostsDialog(startsWith, onDismiss = {
+        onionHosts.value = prevValue
+      }) {
        withApi {
          val newCfg = chatModel.controller.getNetCfg().withOnionHosts(it)
          val res = chatModel.controller.apiSetNetworkConfig(newCfg)
@@ -104,31 +92,6 @@ fun NetworkAndServersView(
          }
        }
      }
-    },
-    updateSessionMode = {
-      if (sessionMode.value == it) return@NetworkAndServersLayout
-      val prevValue = sessionMode.value
-      sessionMode.value = it
-      val startsWith = when (it) {
-        TransportSessionMode.User -> generalGetString(R.string.network_session_mode_user_description)
-        TransportSessionMode.Entity -> generalGetString(R.string.network_session_mode_entity_description)
-      }
-      updateNetworkSettingsDialog(
-        title = generalGetString(R.string.update_network_session_mode_question),
-        startsWith,
-        onDismiss = { sessionMode.value = prevValue }
-      ) {
-        withApi {
-          val newCfg = chatModel.controller.getNetCfg().copy(sessionMode = it)
-          val res = chatModel.controller.apiSetNetworkConfig(newCfg)
-          if (res) {
-            chatModel.controller.setNetCfg(newCfg)
-            sessionMode.value = it
-          } else {
-            sessionMode.value = prevValue
-          }
-        }
-      }
    }
  )
 }
@@ -137,13 +100,10 @@ fun NetworkAndServersView(
  developerTools: Boolean,
  networkUseSocksProxy: MutableState<Boolean>,
  onionHosts: MutableState<OnionHosts>,
-  sessionMode: MutableState<TransportSessionMode>,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
  toggleSocksProxy: (Boolean) -> Unit,
  useOnion: (OnionHosts) -> Unit,
-  updateSessionMode: (TransportSessionMode) -> Unit,
 ) {
  Column(
    Modifier.fillMaxWidth(),
@@ -152,19 +112,17 @@ fun NetworkAndServersView(
  ) {
    AppBarTitle(stringResource(R.string.network_and_servers))
    SectionView(generalGetString(R.string.settings_section_title_messages)) {
-      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showCustomModal { m, close -> SMPServersView(m, close) })
+      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showModal { SMPServersView(it) })
      SectionDivider()
      SectionItemView {
        UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
      }
      SectionDivider()
      UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
-      SectionDivider()
      if (developerTools) {
-        SessionModePicker(sessionMode, showSettingsModal, updateSessionMode)
        SectionDivider()
+        SettingsActionItem(Icons.Outlined.Cable, stringResource(R.string.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
      }
-      SettingsActionItem(Icons.Outlined.Cable, stringResource(R.string.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
    }
    Spacer(Modifier.height(8.dp))
    SectionView(generalGetString(R.string.settings_section_title_calls)) {
@@ -223,6 +181,7 @@ private fun UseOnionHosts(
    }
  }
  val onSelected = showModal {
+
    Column(
      Modifier.fillMaxWidth(),
      horizontalAlignment = Alignment.Start,
@@ -242,47 +201,14 @@ private fun UseOnionHosts(
  )
 }

-@Composable
-private fun SessionModePicker(
-  sessionMode: MutableState<TransportSessionMode>,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  updateSessionMode: (TransportSessionMode) -> Unit,
-) {
-  val values = remember {
-    TransportSessionMode.values().map {
-      when (it) {
-        TransportSessionMode.User -> ValueTitleDesc(TransportSessionMode.User, generalGetString(R.string.network_session_mode_user), generalGetString(R.string.network_session_mode_user_description))
-        TransportSessionMode.Entity -> ValueTitleDesc(TransportSessionMode.Entity, generalGetString(R.string.network_session_mode_entity), generalGetString(R.string.network_session_mode_entity_description))
-      }
-    }
-  }
-
-  SectionItemWithValue(
-    generalGetString(R.string.network_session_mode_transport_isolation),
-    sessionMode,
-    values,
-    icon = Icons.Outlined.SafetyDivider,
-    onSelected = showModal {
-      Column(
-        Modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.Start,
-      ) {
-        AppBarTitle(stringResource(R.string.network_session_mode_transport_isolation))
-        SectionViewSelectable(null, sessionMode, values, updateSessionMode)
-      }
-    }
-  )
-}
-
-private fun updateNetworkSettingsDialog(
-  title: String,
+private fun updateOnionHostsDialog(
  startsWith: String = "",
  message: String = generalGetString(R.string.updating_settings_will_reconnect_client_to_all_servers),
  onDismiss: () -> Unit,
  onConfirm: () -> Unit
 ) {
  AlertManager.shared.showAlertDialog(
-    title = title,
+    title = generalGetString(R.string.update_onion_hosts_settings_question),
    text = startsWith + "\n\n" + message,
    confirmText = generalGetString(R.string.update_network_settings_confirmation),
    onDismiss = onDismiss,
@@ -300,12 +226,9 @@ fun PreviewNetworkAndServersLayout() {
      networkUseSocksProxy = remember { mutableStateOf(true) },
      showModal = { {} },
      showSettingsModal = { {} },
-      showCustomModal = { {} },
      toggleSocksProxy = {},
      onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
-      sessionMode = remember { mutableStateOf(TransportSessionMode.User) },
      useOnion = {},
-      updateSessionMode = {},
    )
  }
 }
@@ -46,6 +46,25 @@ enum class NotificationPreviewMode {
 fun NotificationsSettingsView(
  chatModel: ChatModel,
 ) {
+  val onNotificationsModeSelected = { mode: NotificationsMode ->
+    chatModel.controller.appPrefs.notificationsMode.set(mode.name)
+    if (mode.requiresIgnoringBattery && !chatModel.controller.isIgnoringBatteryOptimizations(chatModel.controller.appContext)) {
+      chatModel.controller.appPrefs.backgroundServiceNoticeShown.set(false)
+    }
+    chatModel.notificationsMode.value = mode
+    SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
+    CoroutineScope(Dispatchers.Default).launch {
+      if (mode == NotificationsMode.SERVICE)
+        SimplexService.start(SimplexApp.context)
+      else
+        SimplexService.safeStopService(SimplexApp.context)
+    }
+
+    if (mode != NotificationsMode.PERIODIC) {
+      MessagesFetcherWorker.cancelAll()
+    }
+    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
+  }
  val onNotificationPreviewModeSelected = { mode: NotificationPreviewMode ->
    chatModel.controller.appPrefs.notificationPreviewMode.set(mode.name)
    chatModel.notificationPreviewMode.value = mode
@@ -57,7 +76,7 @@ fun NotificationsSettingsView(
    showPage = { page ->
      ModalManager.shared.showModalCloseable(true) {
          when (page) {
-            CurrentPage.NOTIFICATIONS_MODE -> NotificationsModeView(chatModel.notificationsMode) { changeNotificationsMode(it, chatModel) }
+            CurrentPage.NOTIFICATIONS_MODE -> NotificationsModeView(chatModel.notificationsMode, onNotificationsModeSelected)
            CurrentPage.NOTIFICATION_PREVIEW_MODE -> NotificationPreviewView(chatModel.notificationPreviewMode, onNotificationPreviewModeSelected)
          }
      }
@@ -140,7 +159,7 @@ fun NotificationPreviewView(
 }

 // mode, name, description
-private fun notificationModes(): List<ValueTitleDesc<NotificationsMode>> {
+fun notificationModes(): List<ValueTitleDesc<NotificationsMode>> {
  val res = ArrayList<ValueTitleDesc<NotificationsMode>>()
  res.add(
    ValueTitleDesc(
@@ -192,23 +211,3 @@ fun notificationPreviewModes(): List<ValueTitleDesc<NotificationPreviewMode>> {
  )
  return res
 }
-
-fun changeNotificationsMode(mode: NotificationsMode, chatModel: ChatModel) {
-  chatModel.controller.appPrefs.notificationsMode.set(mode.name)
-  if (mode.requiresIgnoringBattery && !chatModel.controller.isIgnoringBatteryOptimizations(chatModel.controller.appContext)) {
-    chatModel.controller.appPrefs.backgroundServiceNoticeShown.set(false)
-  }
-  chatModel.notificationsMode.value = mode
-  SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
-  CoroutineScope(Dispatchers.Default).launch {
-    if (mode == NotificationsMode.SERVICE)
-      SimplexService.start(SimplexApp.context)
-    else
-      SimplexService.safeStopService(SimplexApp.context)
-  }
-
-  if (mode != NotificationsMode.PERIODIC) {
-    MessagesFetcherWorker.cancelAll()
-  }
-  chatModel.controller.showBackgroundServiceNoticeIfNeeded()
-}
@@ -1,144 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun PreferencesView(m: ChatModel, user: User, close: () -> Unit,) {
-  var preferences by rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(user.fullPreferences) }
-  var currentPreferences by rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(preferences) }
-
-  fun savePrefs(afterSave: () -> Unit = {}) {
-    withApi {
-      val newProfile = user.profile.toProfile().copy(preferences = preferences.toPreferences())
-      val updatedProfile = m.controller.apiUpdateProfile(newProfile)
-      if (updatedProfile != null) {
-        m.updateCurrentUser(updatedProfile, preferences)
-        currentPreferences = preferences
-      }
-      afterSave()
-    }
-  }
-  ModalView(
-    close = {
-      if (preferences == currentPreferences) close()
-      else  showUnsavedChangesAlert({ savePrefs(close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    PreferencesLayout(
-      preferences,
-      currentPreferences,
-      applyPrefs = { preferences = it },
-      reset = { preferences = currentPreferences },
-      savePrefs = ::savePrefs,
-    )
-  }
-}
-
-@Composable
-private fun PreferencesLayout(
-  preferences: FullChatPreferences,
-  currentPreferences: FullChatPreferences,
-  applyPrefs: (FullChatPreferences) -> Unit,
-  reset: () -> Unit,
-  savePrefs: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-    horizontalAlignment = Alignment.Start,
-  ) {
-    AppBarTitle(stringResource(R.string.your_preferences))
-    val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.allow) }
-    TimedMessagesFeatureSection(timedMessages) {
-      applyPrefs(preferences.copy(timedMessages = TimedMessagesPreference(allow = if (it) FeatureAllowed.YES else FeatureAllowed.NO)))
-    }
-    SectionSpacer()
-    val allowFullDeletion = remember(preferences) { mutableStateOf(preferences.fullDelete.allow) }
-    FeatureSection(ChatFeature.FullDelete, allowFullDeletion) {
-      applyPrefs(preferences.copy(fullDelete = SimpleChatPreference(allow = it)))
-    }
-    SectionSpacer()
-    val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.allow) }
-    FeatureSection(ChatFeature.Voice, allowVoice) {
-      applyPrefs(preferences.copy(voice = SimpleChatPreference(allow = it)))
-    }
-    SectionSpacer()
-    ResetSaveButtons(
-      reset = reset,
-      save = savePrefs,
-      disabled = preferences == currentPreferences
-    )
-  }
-}
-
-@Composable
-private fun FeatureSection(feature: ChatFeature, allowFeature: State<FeatureAllowed>, onSelected: (FeatureAllowed) -> Unit) {
-  SectionView {
-    SectionItemView {
-      ExposedDropDownSettingRow(
-        feature.text,
-        FeatureAllowed.values().map { it to it.text },
-        allowFeature,
-        icon = feature.icon,
-        onSelected = onSelected
-      )
-    }
-  }
-  SectionTextFooter(feature.allowDescription(allowFeature.value))
-}
-
-@Composable
-private fun TimedMessagesFeatureSection(allowFeature: State<FeatureAllowed>, onSelected: (Boolean) -> Unit) {
-  SectionView {
-    SectionItemView {
-      PreferenceToggleWithIcon(
-        ChatFeature.TimedMessages.text,
-        ChatFeature.TimedMessages.icon,
-        HighOrLowlight,
-        allowFeature.value == FeatureAllowed.ALWAYS || allowFeature.value == FeatureAllowed.YES,
-        onSelected
-      )
-    }
-  }
-  SectionTextFooter(ChatFeature.TimedMessages.allowDescription(allowFeature.value))
-}
-
-@Composable
-private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
-  SectionView {
-    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-    SectionDivider()
-    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_contacts), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
-    }
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_contacts),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
@@ -1,85 +1,39 @@
 package chat.simplex.app.views.usersettings

 import SectionDivider
-import SectionItemView
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import android.view.WindowManager
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.*
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.views.helpers.AppBarTitle

@Composable
-fun PrivacySettingsView(
-  chatModel: ChatModel,
-  setPerformLA: (Boolean) -> Unit
-) {
+fun PrivacySettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
  Column(
    Modifier.fillMaxWidth(),
    horizontalAlignment = Alignment.Start
  ) {
-    val simplexLinkMode = chatModel.controller.appPrefs.simplexLinkMode
    AppBarTitle(stringResource(R.string.your_privacy))
    SectionView(stringResource(R.string.settings_section_title_device)) {
      ChatLockItem(chatModel.performLA, setPerformLA)
-      SectionDivider()
-      val context = LocalContext.current
-      SettingsPreferenceItem(Icons.Outlined.VisibilityOff, stringResource(R.string.protect_app_screen), chatModel.controller.appPrefs.privacyProtectScreen) { on ->
-        if (on) {
-          (context as? FragmentActivity)?.window?.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE
-          )
-        } else {
-          (context as? FragmentActivity)?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-      }
    }
    SectionSpacer()

    SectionView(stringResource(R.string.settings_section_title_chats)) {
      SettingsPreferenceItem(Icons.Outlined.Image, stringResource(R.string.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
      SectionDivider()
-      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
-      SectionDivider()
-      SectionItemView { SimpleXLinkOptions(chatModel.simplexLinkMode, onSelected = {
-        simplexLinkMode.set(it)
-        chatModel.simplexLinkMode.value = it
-      }) }
-    }
-    if (chatModel.simplexLinkMode.value == SimplexLinkMode.BROWSER) {
-      SectionTextFooter(stringResource(R.string.simplex_link_mode_browser_warning))
-    }
-  }
-}
-
-@Composable
-private fun SimpleXLinkOptions(simplexLinkModeState: State<SimplexLinkMode>, onSelected: (SimplexLinkMode) -> Unit) {
-  val values = remember {
-    SimplexLinkMode.values().map {
-      when (it) {
-        SimplexLinkMode.DESCRIPTION -> it to generalGetString(R.string.simplex_link_mode_description)
-        SimplexLinkMode.FULL -> it to generalGetString(R.string.simplex_link_mode_full)
-        SimplexLinkMode.BROWSER -> it to generalGetString(R.string.simplex_link_mode_browser)
+      if (chatModel.controller.appPrefs.developerTools.get()) {
+        SettingsPreferenceItem(Icons.Outlined.ImageAspectRatio, stringResource(R.string.transfer_images_faster), chatModel.controller.appPrefs.privacyTransferImagesInline)
+        SectionDivider()
      }
+      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
    }
  }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.simplex_link_mode),
-    values,
-    simplexLinkModeState,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
 }
@@ -198,7 +198,7 @@ private fun howToButton() {
  val uriHandler = LocalUriHandler.current
  Row(
    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/WEBRTC.md#configure-mobile-apps") }
+    modifier = Modifier.clickable { uriHandler.openUri("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/WEBRTC.md#configure-mobile-apps") }
  ) {
    Text(stringResource(R.string.how_to), color = MaterialTheme.colors.primary)
    Icon(
@@ -1,200 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionItemViewSpaceBetween
-import SectionSpacer
-import SectionView
-import android.util.Log
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.*
-import chat.simplex.app.model.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-
-@Composable
-fun SMPServerView(m: ChatModel, server: ServerCfg, onUpdate: (ServerCfg) -> Unit, onDelete: () -> Unit) {
-  var testing by remember { mutableStateOf(false) }
-  val scope = rememberCoroutineScope()
-  SMPServerLayout(
-    testing,
-    server,
-    testServer = {
-      testing = true
-      scope.launch {
-        val res = testServerConnection(server, m)
-        if (isActive) {
-          onUpdate(res.first)
-          testing = false
-        }
-      }
-    },
-    onUpdate,
-    onDelete
-  )
-  if (testing) {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(horizontal = 2.dp)
-          .size(30.dp),
-        color = HighOrLowlight,
-        strokeWidth = 2.5.dp
-      )
-    }
-  }
-}
-
-@Composable
-private fun SMPServerLayout(
-  testing: Boolean,
-  server: ServerCfg,
-  testServer: () -> Unit,
-  onUpdate: (ServerCfg) -> Unit,
-  onDelete: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(if (server.preset) R.string.smp_servers_preset_server else R.string.smp_servers_your_server))
-
-    if (server.preset) {
-      PresetServer(testing, server, testServer, onUpdate, onDelete)
-    } else {
-      CustomServer(testing, server, testServer, onUpdate, onDelete)
-    }
-  }
-}
-
-@Composable
-private fun PresetServer(
-  testing: Boolean,
-  server: ServerCfg,
-  testServer: () -> Unit,
-  onUpdate: (ServerCfg) -> Unit,
-  onDelete: () -> Unit,
-) {
-  SectionView(stringResource(R.string.smp_servers_preset_address).uppercase()) {
-    SelectionContainer {
-      Text(
-        server.server,
-        Modifier.padding(start = DEFAULT_PADDING, top = 5.dp, end = DEFAULT_PADDING, bottom = 10.dp),
-        style = TextStyle(
-          fontFamily = FontFamily.Monospace, fontSize = 16.sp,
-          color = HighOrLowlight
-        )
-      )
-    }
-  }
-  SectionSpacer()
-  UseServerSection(true, testing, server, testServer, onUpdate, onDelete)
-}
-
-@Composable
-private fun CustomServer(
-  testing: Boolean,
-  server: ServerCfg,
-  testServer: () -> Unit,
-  onUpdate: (ServerCfg) -> Unit,
-  onDelete: () -> Unit,
-) {
-  val serverAddress = remember { mutableStateOf(server.server) }
-  val valid = remember { derivedStateOf { parseServerAddress(serverAddress.value)?.valid == true } }
-  SectionView(
-    stringResource(R.string.smp_servers_your_server_address).uppercase(),
-    icon = Icons.Outlined.ErrorOutline,
-    iconTint = if (!valid.value) MaterialTheme.colors.error else Color.Transparent,
-  ) {
-    val testedPreviously = remember { mutableMapOf<String, Boolean?>() }
-    TextEditor(
-      Modifier.height(144.dp),
-      text = serverAddress,
-      border = false,
-      fontSize = 16.sp,
-      background = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background
-    ) {
-      testedPreviously[server.server] = server.tested
-      onUpdate(server.copy(server = it, tested = testedPreviously[serverAddress.value]))
-    }
-  }
-  SectionSpacer()
-  UseServerSection(valid.value, testing, server, testServer, onUpdate, onDelete)
-  SectionSpacer()
-
-  if (valid.value) {
-    SectionView(stringResource(R.string.smp_servers_add_to_another_device).uppercase()) {
-      QRCode(serverAddress.value, Modifier.aspectRatio(1f))
-    }
-  }
-}
-
-@Composable
-private fun UseServerSection(
-  valid: Boolean,
-  testing: Boolean,
-  server: ServerCfg,
-  testServer: () -> Unit,
-  onUpdate: (ServerCfg) -> Unit,
-  onDelete: () -> Unit,
-) {
-  SectionView(stringResource(R.string.smp_servers_use_server).uppercase()) {
-    SectionItemViewSpaceBetween(testServer, disabled = !valid || testing) {
-      Text(stringResource(R.string.smp_servers_test_server), color = if (valid && !testing) MaterialTheme.colors.onBackground else HighOrLowlight)
-      ShowTestStatus(server)
-    }
-    SectionDivider()
-    SectionItemView {
-      val enabled = rememberUpdatedState(server.enabled)
-      PreferenceToggle(stringResource(R.string.smp_servers_use_server_for_new_conn), enabled.value) { onUpdate(server.copy(enabled = it)) }
-    }
-    SectionDivider()
-    SectionItemView(onDelete, disabled = testing) {
-      Text(stringResource(R.string.smp_servers_delete_server), color = if (testing) HighOrLowlight else MaterialTheme.colors.error)
-    }
-  }
-}
-
-@Composable
-fun ShowTestStatus(server: ServerCfg, modifier: Modifier = Modifier) =
-  when (server.tested) {
-    true -> Icon(Icons.Outlined.Check, null, modifier, tint = SimplexGreen)
-    false -> Icon(Icons.Outlined.Clear, null, modifier, tint = MaterialTheme.colors.error)
-    else -> Icon(Icons.Outlined.Check, null, modifier, tint = Color.Transparent)
-  }
-
-suspend fun testServerConnection(server: ServerCfg, m: ChatModel): Pair<ServerCfg, SMPTestFailure?> =
-  try {
-    val r = m.controller.testSMPServer(server.server)
-    server.copy(tested = r == null) to r
-  } catch (e: Exception) {
-    Log.e(TAG, "testServerConnection ${e.stackTraceToString()}")
-    server.copy(tested = false) to null
-  }
-
-fun serverHostname(srv: String): String =
-  parseServerAddress(srv)?.hostnames?.firstOrNull() ?: srv
@@ -0,0 +1,258 @@
+package chat.simplex.app.views.usersettings
+
+import SectionItemViewSpaceBetween
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.OpenInNew
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun SMPServersView(chatModel: ChatModel) {
+  val userSMPServers = chatModel.userSMPServers.value
+  if (userSMPServers != null) {
+    var isUserSMPServers by remember { mutableStateOf(userSMPServers.isNotEmpty()) }
+    var editSMPServers by remember { mutableStateOf(!isUserSMPServers) }
+    val userSMPServersStr = remember { mutableStateOf(if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else "") }
+    fun saveSMPServers(smpServers: List<String>) {
+      withApi {
+        val r = chatModel.controller.setUserSMPServers(smpServers = smpServers)
+        if (r) {
+          chatModel.userSMPServers.value = smpServers
+          if (smpServers.isEmpty()) {
+            isUserSMPServers = false
+            editSMPServers = true
+          } else {
+            editSMPServers = false
+          }
+        }
+      }
+    }
+
+    SMPServersLayout(
+      isUserSMPServers = isUserSMPServers,
+      editSMPServers = editSMPServers,
+      userSMPServersStr = userSMPServersStr,
+      isUserSMPServersOnOff = { switch ->
+        if (switch) {
+          isUserSMPServers = true
+        } else {
+          val userSMPServers = chatModel.userSMPServers.value
+          if (userSMPServers != null) {
+            if (userSMPServers.isNotEmpty()) {
+              AlertManager.shared.showAlertMsg(
+                title = generalGetString(R.string.use_simplex_chat_servers__question),
+                text = generalGetString(R.string.saved_SMP_servers_will_be_removed),
+                confirmText = generalGetString(R.string.confirm_verb),
+                onConfirm = {
+                  saveSMPServers(listOf())
+                  isUserSMPServers = false
+                  userSMPServersStr.value = ""
+                }
+              )
+            } else {
+              isUserSMPServers = false
+              userSMPServersStr.value = ""
+            }
+          }
+        }
+      },
+      cancelEdit = {
+        val userSMPServers = chatModel.userSMPServers.value
+        if (userSMPServers != null) {
+          isUserSMPServers = userSMPServers.isNotEmpty()
+          editSMPServers = !isUserSMPServers
+          userSMPServersStr.value = if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else ""
+        }
+      },
+      saveSMPServers = { saveSMPServers(it) },
+      editOn = { editSMPServers = true },
+    )
+  }
+}
+
+@Composable
+fun SMPServersLayout(
+  isUserSMPServers: Boolean,
+  editSMPServers: Boolean,
+  userSMPServersStr: MutableState<String>,
+  isUserSMPServersOnOff: (Boolean) -> Unit,
+  cancelEdit: () -> Unit,
+  saveSMPServers: (List<String>) -> Unit,
+  editOn: () -> Unit,
+) {
+  Column {
+    AppBarTitle(stringResource(R.string.your_SMP_servers))
+    Column(
+      Modifier
+        .fillMaxWidth()
+        .padding(horizontal = DEFAULT_PADDING),
+      verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+      SectionItemViewSpaceBetween(padding = PaddingValues()) {
+        Text(stringResource(R.string.configure_SMP_servers), Modifier.padding(end = 24.dp))
+        Switch(
+          checked = isUserSMPServers,
+          onCheckedChange = isUserSMPServersOnOff,
+          colors = SwitchDefaults.colors(
+            checkedThumbColor = MaterialTheme.colors.primary,
+            uncheckedThumbColor = HighOrLowlight
+          ),
+        )
+      }
+
+      if (!isUserSMPServers) {
+        Text(stringResource(R.string.using_simplex_chat_servers), lineHeight = 22.sp)
+      } else {
+        Text(stringResource(R.string.enter_one_SMP_server_per_line))
+        if (editSMPServers) {
+          TextEditor(Modifier.height(160.dp), text = userSMPServersStr)
+
+          Row(
+            Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+          ) {
+            Column(horizontalAlignment = Alignment.Start) {
+              Row {
+                Text(
+                  stringResource(R.string.cancel_verb),
+                  color = MaterialTheme.colors.primary,
+                  modifier = Modifier
+                    .clickable(onClick = cancelEdit)
+                )
+                Spacer(Modifier.padding(horizontal = 8.dp))
+                Text(
+                  stringResource(R.string.save_servers_button),
+                  color = MaterialTheme.colors.primary,
+                  modifier = Modifier.clickable(onClick = {
+                    val servers = userSMPServersStr.value.split("\n")
+                    saveSMPServers(servers)
+                  })
+                )
+              }
+            }
+            Column(horizontalAlignment = Alignment.End) {
+              howToButton()
+            }
+          }
+        } else {
+          Surface(
+            modifier = Modifier
+              .height(160.dp)
+              .fillMaxWidth(),
+            shape = RoundedCornerShape(10.dp),
+            border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
+          ) {
+            SelectionContainer(
+              Modifier.verticalScroll(rememberScrollState())
+            ) {
+              Text(
+                userSMPServersStr.value,
+                Modifier
+                  .padding(vertical = 5.dp, horizontal = 7.dp),
+                style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 14.sp),
+              )
+            }
+          }
+          Row(
+            Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+          ) {
+            Column(horizontalAlignment = Alignment.Start) {
+              Text(
+                stringResource(R.string.edit_verb),
+                color = MaterialTheme.colors.primary,
+                modifier = Modifier
+                  .clickable(onClick = editOn)
+              )
+            }
+            Column(horizontalAlignment = Alignment.End) {
+              howToButton()
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun howToButton() {
+  val uriHandler = LocalUriHandler.current
+  Row(
+    verticalAlignment = Alignment.CenterVertically,
+    modifier = Modifier.clickable { uriHandler.openUri("https://github.com/simplex-chat/simplexmq#using-smp-server-and-smp-agent") }
+  ) {
+    Text(stringResource(R.string.how_to), color = MaterialTheme.colors.primary)
+    Icon(
+      Icons.Outlined.OpenInNew, stringResource(R.string.how_to), tint = MaterialTheme.colors.primary,
+      modifier = Modifier.padding(horizontal = 5.dp)
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewSMPServersLayoutDefaultServers() {
+  SimpleXTheme {
+    SMPServersLayout(
+      isUserSMPServers = false,
+      editSMPServers = true,
+      userSMPServersStr = remember { mutableStateOf("") },
+      isUserSMPServersOnOff = {},
+      cancelEdit = {},
+      saveSMPServers = {},
+      editOn = {},
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewSMPServersLayoutUserServersEditOn() {
+  SimpleXTheme {
+    SMPServersLayout(
+      isUserSMPServers = true,
+      editSMPServers = true,
+      userSMPServersStr = remember { mutableStateOf("smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im") },
+      isUserSMPServersOnOff = {},
+      cancelEdit = {},
+      saveSMPServers = {},
+      editOn = {},
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewSMPServersLayoutUserServersEditOff() {
+  SimpleXTheme {
+    SMPServersLayout(
+      isUserSMPServers = true,
+      editSMPServers = false,
+      userSMPServersStr = remember { mutableStateOf("smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im") },
+      isUserSMPServersOnOff = {},
+      cancelEdit = {},
+      saveSMPServers = {},
+      editOn = {},
+    )
+  }
+}
@@ -1,352 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.model.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.launch
-
-@Composable
-fun SMPServersView(m: ChatModel, close: () -> Unit) {
-  var servers by remember {
-    mutableStateOf(m.userSMPServersUnsaved.value ?: m.userSMPServers.value ?: emptyList())
-  }
-  val testing = rememberSaveable { mutableStateOf(false) }
-  val serversUnchanged = remember { derivedStateOf { servers == m.userSMPServers.value || testing.value } }
-  val allServersDisabled = remember { derivedStateOf { servers.all { !it.enabled } } }
-  val saveDisabled = remember {
-    derivedStateOf {
-      servers.isEmpty() ||
-      servers == m.userSMPServers.value ||
-      testing.value ||
-      !servers.all { srv ->
-        val address = parseServerAddress(srv.server)
-        address != null && uniqueAddress(srv, address, servers)
-      } ||
-      allServersDisabled.value
-    }
-  }
-
-  fun showServer(server: ServerCfg) {
-    ModalManager.shared.showModalCloseable(true) { close ->
-      var old by remember { mutableStateOf(server) }
-      val index = servers.indexOf(old)
-      SMPServerView(
-        m,
-        old,
-        onUpdate = { updated ->
-          val newServers = ArrayList(servers)
-          newServers.removeAt(index)
-          newServers.add(index, updated)
-          old = updated
-          servers = newServers
-          m.userSMPServersUnsaved.value = servers
-        },
-        onDelete = {
-          val newServers = ArrayList(servers)
-          newServers.removeAt(index)
-          servers = newServers
-          m.userSMPServersUnsaved.value = servers
-          close()
-        })
-    }
-  }
-  val scope = rememberCoroutineScope()
-  ModalView(
-    close = {
-      if (saveDisabled.value) close()
-      else showUnsavedChangesAlert({ saveSMPServers(servers, m, close) }, close)
-    },
-    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
-  ) {
-    SMPServersLayout(
-      testing = testing.value,
-      servers = servers,
-      serversUnchanged = serversUnchanged.value,
-      saveDisabled = saveDisabled.value,
-      allServersDisabled = allServersDisabled.value,
-      m.currentUser.value,
-      addServer = {
-        AlertManager.shared.showAlertDialogButtonsColumn(
-          title = generalGetString(R.string.smp_servers_add),
-          buttons = {
-            Column {
-              SectionItemView({
-                AlertManager.shared.hideAlert()
-                servers = servers + ServerCfg.empty
-                // No saving until something will be changed on the next screen to prevent blank servers on the list
-                showServer(servers.last())
-              }) {
-                Text(stringResource(R.string.smp_servers_enter_manually))
-              }
-              SectionItemView({
-                AlertManager.shared.hideAlert()
-                ModalManager.shared.showModalCloseable { close ->
-                  ScanSMPServer {
-                    close()
-                    servers = servers + it
-                    m.userSMPServersUnsaved.value = servers
-                  }
-                }
-              }
-              ) {
-                Text(stringResource(R.string.smp_servers_scan_qr))
-              }
-              val hasAllPresets = hasAllPresets(servers, m)
-              if (!hasAllPresets) {
-                SectionItemView({
-                  AlertManager.shared.hideAlert()
-                  servers = (servers + addAllPresets(servers, m)).sortedByDescending { it.preset }
-                }) {
-                  Text(stringResource(R.string.smp_servers_preset_add), color = MaterialTheme.colors.onBackground)
-                }
-              }
-            }
-          }
-        )
-      },
-      testServers = {
-        scope.launch {
-          testServers(testing, servers, m) {
-            servers = it
-            m.userSMPServersUnsaved.value = servers
-          }
-        }
-      },
-      resetServers = {
-        servers = m.userSMPServers.value ?: emptyList()
-        m.userSMPServersUnsaved.value = null
-      },
-      saveSMPServers = {
-        saveSMPServers(servers, m)
-      },
-      showServer = ::showServer,
-    )
-
-    if (testing.value) {
-      Box(
-        Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-      ) {
-        CircularProgressIndicator(
-          Modifier
-            .padding(horizontal = 2.dp)
-            .size(30.dp),
-          color = HighOrLowlight,
-          strokeWidth = 2.5.dp
-        )
-      }
-    }
-  }
-}
-
-@Composable
-private fun SMPServersLayout(
-  testing: Boolean,
-  servers: List<ServerCfg>,
-  serversUnchanged: Boolean,
-  saveDisabled: Boolean,
-  allServersDisabled: Boolean,
-  currentUser: User?,
-  addServer: () -> Unit,
-  testServers: () -> Unit,
-  resetServers: () -> Unit,
-  saveSMPServers: () -> Unit,
-  showServer: (ServerCfg) -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.your_SMP_servers))
-
-    SectionView(stringResource(R.string.smp_servers).uppercase()) {
-      for (srv in servers) {
-        SectionItemView({ showServer(srv) }, disabled = testing) {
-          SmpServerView(srv, servers, testing)
-        }
-        SectionDivider()
-      }
-      SettingsActionItem(
-        Icons.Outlined.Add,
-        stringResource(R.string.smp_servers_add),
-        addServer,
-        disabled = testing,
-        textColor = if (testing) HighOrLowlight else MaterialTheme.colors.primary,
-        iconColor = if (testing) HighOrLowlight else MaterialTheme.colors.primary
-      )
-    }
-    SectionTextFooter(
-      remember(currentUser?.displayName) {
-        buildAnnotatedString {
-          append(generalGetString(R.string.smp_servers_per_user) + " ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append(currentUser?.displayName ?: "")
-          }
-          append(".")
-        }
-      }
-    )
-    SectionSpacer()
-    SectionView {
-      SectionItemView(resetServers, disabled = serversUnchanged) {
-        Text(stringResource(R.string.reset_verb), color = if (!serversUnchanged) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-      SectionDivider()
-      val testServersDisabled = testing || allServersDisabled
-      SectionItemView(testServers, disabled = testServersDisabled) {
-        Text(stringResource(R.string.smp_servers_test_servers), color = if (!testServersDisabled) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-      SectionDivider()
-      SectionItemView(saveSMPServers, disabled = saveDisabled) {
-        Text(stringResource(R.string.smp_servers_save), color = if (!saveDisabled) MaterialTheme.colors.onBackground else HighOrLowlight)
-      }
-    }
-    SectionSpacer()
-    SectionView {
-      HowToButton()
-    }
-  }
-}
-
-@Composable
-private fun SmpServerView(srv: ServerCfg, servers: List<ServerCfg>, disabled: Boolean) {
-  val address = parseServerAddress(srv.server)
-  when {
-    address == null || !address.valid || !uniqueAddress(srv, address, servers) -> InvalidServer()
-    !srv.enabled -> Icon(Icons.Outlined.DoNotDisturb, null, tint = HighOrLowlight)
-    else -> ShowTestStatus(srv)
-  }
-  Spacer(Modifier.padding(horizontal = 4.dp))
-  val text = address?.hostnames?.firstOrNull() ?: srv.server
-  if (srv.enabled) {
-    Text(text, color = if (disabled) HighOrLowlight else MaterialTheme.colors.onBackground, maxLines = 1)
-  } else {
-    Text(text, maxLines = 1, color = HighOrLowlight)
-  }
-}
-
-@Composable
-private fun HowToButton() {
-  val uriHandler = LocalUriHandler.current
-  SettingsActionItem(
-    Icons.Outlined.OpenInNew,
-    stringResource(R.string.how_to_use_your_servers),
-    { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md") },
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary
-  )
-}
-
-@Composable
-fun InvalidServer() {
-  Icon(Icons.Outlined.ErrorOutline, null, tint = MaterialTheme.colors.error)
-}
-
-private fun uniqueAddress(s: ServerCfg, address: ServerAddress, servers: List<ServerCfg>): Boolean = servers.all { srv ->
-  address.hostnames.all { host ->
-    srv.id == s.id || !srv.server.contains(host)
-  }
-}
-
-private fun hasAllPresets(servers: List<ServerCfg>, m: ChatModel): Boolean =
-  m.presetSMPServers.value?.all { hasPreset(it, servers) } ?: true
-
-private fun addAllPresets(servers: List<ServerCfg>, m: ChatModel): List<ServerCfg> {
-  val toAdd = ArrayList<ServerCfg>()
-  for (srv in m.presetSMPServers.value ?: emptyList()) {
-    if (!hasPreset(srv, servers)) {
-      toAdd.add(ServerCfg(srv, preset = true, tested = null, enabled = true))
-    }
-  }
-  return toAdd
-}
-
-private fun hasPreset(srv: String, servers: List<ServerCfg>): Boolean =
-  servers.any { it.server == srv }
-
-private suspend fun testServers(testing: MutableState<Boolean>, servers: List<ServerCfg>, m: ChatModel, onUpdated: (List<ServerCfg>) -> Unit) {
-  val resetStatus = resetTestStatus(servers)
-  onUpdated(resetStatus)
-  testing.value = true
-  val fs = runServersTest(resetStatus, m) { onUpdated(it) }
-  testing.value = false
-  if (fs.isNotEmpty()) {
-    val msg = fs.map { it.key + ": " + it.value.localizedDescription }.joinToString("\n")
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.smp_servers_test_failed),
-      text = generalGetString(R.string.smp_servers_test_some_failed) + "\n" + msg
-    )
-  }
-}
-
-private fun resetTestStatus(servers: List<ServerCfg>): List<ServerCfg> {
-  val copy = ArrayList(servers)
-  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
-      copy.removeAt(index)
-      copy.add(index, server.copy(tested = null))
-    }
-  }
-  return copy
-}
-
-private suspend fun runServersTest(servers: List<ServerCfg>, m: ChatModel, onUpdated: (List<ServerCfg>) -> Unit): Map<String, SMPTestFailure> {
-  val fs: MutableMap<String, SMPTestFailure> = mutableMapOf()
-  val updatedServers = ArrayList<ServerCfg>(servers)
-  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
-      val (updatedServer, f) = testServerConnection(server, m)
-      updatedServers.removeAt(index)
-      updatedServers.add(index, updatedServer)
-      // toList() is important. Otherwise, Compose will not redraw the screen after first update
-      onUpdated(updatedServers.toList())
-      if (f != null) {
-        fs[serverHostname(updatedServer.server)] = f
-      }
-    }
-  }
-  return fs
-}
-
-private fun saveSMPServers(servers: List<ServerCfg>, m: ChatModel, afterSave: () -> Unit = {}) {
-  withApi {
-    if (m.controller.setUserSMPServers(servers)) {
-      m.userSMPServers.value = servers
-      m.userSMPServersUnsaved.value = null
-    }
-    afterSave()
-  }
-}
-
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.smp_save_servers_question),
-    confirmText = generalGetString(R.string.save_verb),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
--- a/Show More
+++ b/Show More