core: api to load all chat items

2024-12-17 17:20:21 +01:00 · 2022-11-20 21:38:42 +00:00
419 changed files with 12561 additions and 104811 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,7 +42,6 @@ stack.yaml.lock

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


@@ -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,5 +1,3 @@
-| Updated 07.02.2023 | Languages: EN, [FR](/docs/lang/fr/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!
@@ -7,8 +5,8 @@
 [![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)
-[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)

 [<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;
@@ -24,7 +22,7 @@
 - 🔐 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.

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

@@ -45,7 +43,6 @@
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Join a user group](#join-a-user-group)
- [Translate the apps](#translate-the-apps)
 - [Contribute](#contribute)
 - [Help us with donations](#help-us-with-donations)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -78,25 +75,25 @@ 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)

@@ -106,7 +103,7 @@ You need to share a link or scan a QR code (in person or during a video call) to

 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">
+<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

@@ -140,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).
@@ -150,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.

@@ -164,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.
@@ -191,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.
@@ -221,46 +209,28 @@ 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 an English-speaking 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)
+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).

-There are also several groups in languages other than English, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users. We do not always answer questions there, so please ask them in one of the English-speaking groups.
-
- [\#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 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!

-## Translate the apps
-
-Thanks to our users and [Weblate](https://hosted.weblate.org/engage/simplex-chat/), SimpleX Chat apps are translated to many other languages. Join our translators to help SimpleX grow faster!
-
-Current interface languages:
-
- English (development language)
- German: [@mlanp](https://github.com/mlanp)
- French: [@ishi_sama](https://github.com/ishi-sama)
- Italian: [@unbranched](https://github.com/unbranched)
- Russian: project team
-
-Languages in progress: Chinese, Hindi, Czech, Japanese, Dutch 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 contribute to SimpleX Chat with:

- translate website homepage - there is a lot of content we would like to share, it would help to bring the new users.
- writing a tutorial or recipes about hosting servers, chat bot automations, etc.
 - 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

@@ -276,11 +246,8 @@ It is possible to donate via:

 - [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
 - [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero 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,
@@ -11,8 +11,8 @@ android {
        applicationId "chat.simplex.app"
        minSdk 29
        targetSdk 32
-        versionCode 101
-        versionName "4.5.3-beta.0"
+        versionCode 69
+        versionName "4.3-beta.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
@@ -76,11 +76,6 @@ android {
        }
        jniLibs.useLegacyPackaging = compression_level != "0"
    }
-    def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-    if (isRelease) {
-        // Comma separated list of languages that will be included in the apk
-        android.defaultConfig.resConfigs("en", "ru", "de", "fr", "it", "nl")
-    }
 }

 dependencies {
@@ -24,8 +24,6 @@
  <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}"
@@ -104,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));
@@ -29,7 +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);

 JNIEXPORT jobjectArray JNICALL
 Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey) {
@@ -77,11 +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;
-}
@@ -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,12 +3,10 @@ package chat.simplex.app
 import android.app.Application
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 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.*
@@ -29,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
@@ -43,6 +40,7 @@ import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.onboarding.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch

 class MainActivity: FragmentActivity() {
@@ -75,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(
@@ -134,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()
@@ -374,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
                    }
                }
              }
@@ -387,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
@@ -398,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)
-          }
-          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)
-        }
-        chatModel.chatId.value = null
-        chatModel.clearOverlays.value = true
-      }
+      chatModel.chatId.value = null
+      chatModel.clearOverlays.value = true
    }
    NtfManager.AcceptCallAction -> {
      val chatId = intent.getStringExtra("chatId")
@@ -483,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,15 +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

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

-  var isAppOnForeground: Boolean = false
-
  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 {
@@ -90,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) {
@@ -98,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()
          }
@@ -127,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 -> {}
      }
    }
  }
@@ -188,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) {
+  fun notifyContactRequestReceived(cInfo: ChatInfo.ContactRequest) {
    notifyMessageReceived(
-      user = user,
      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) {
+  fun notifyContactConnected(contact: Contact) {
    notifyMessageReceived(
-      user = user,
      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

-    notifyMessageReceived(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+    notifyMessageReceived(chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
  }

-  fun notifyMessageReceived(user: User, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
+  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")
@@ -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,21 +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,
-            allowVoiceToContact = {},
-            sendMessage = sendCommand,
-            sendLiveMessage = null,
-            updateLiveMessage = null,
-            onMessageChange = ::onMessageChange,
-            textStyle = textStyle
-          )
+          SendMsgView(composeState, false, sendCommand, ::onMessageChange, { _, _, _ -> }, textStyle)
        }
      },
      modifier = Modifier.navigationBarsWithImePadding()
@@ -114,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(
@@ -126,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
  }
 }

@@ -18,7 +18,7 @@ class CallManager(val chatModel: ChatModel) {
        controller.ntfManager.notifyCallInvitation(invitation)
      } else {
        val contact = invitation.contact
-        controller.ntfManager.notifyMessageReceived(user = invitation.user, chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
+        controller.ntfManager.notifyMessageReceived(chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
      }
    }
  }
@@ -297,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)
  }
 }

@@ -480,10 +480,7 @@ 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))
      ),
      dismiss = {},
      toggleAudio = {},
@@ -504,10 +501,7 @@ 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))
      ),
      dismiss = {},
      toggleAudio = {},
@@ -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,19 +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)
-            var groupLink = chatModel.controller.apiGetGroupLink(chat.chatInfo.groupInfo.groupId)
+          } else if (cInfo is ChatInfo.Group) {
+            setGroupMembers(cInfo.groupInfo, chatModel)
            ModalManager.shared.showModalCloseable(true) { close ->
-              GroupChatInfoView(chatModel, groupLink, { groupLink = it }, close)
+              GroupChatInfoView(chatModel, close)
            }
          }
        }
@@ -163,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)
          }
        }
      },
@@ -193,27 +163,17 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
      deleteMessage = { itemId, mode ->
        withApi {
          val cInfo = chat.chatInfo
-          val r = chatModel.controller.apiDeleteChatItem(
+          val toItem = chatModel.controller.apiDeleteChatItem(
            type = cInfo.chatType,
            id = cInfo.apiId,
            itemId = itemId,
            mode = mode
          )
-          if (r != null) {
-            val toChatItem = r.toChatItem
-            if (toChatItem == null) {
-              chatModel.removeChatItem(cInfo, r.deletedChatItem.chatItem)
-            } else {
-              chatModel.upsertChatItem(cInfo, toChatItem.chatItem)
-            }
-          }
+          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) }
@@ -235,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,
@@ -285,7 +240,6 @@ fun ChatLayout(
  chatItems: List<ChatItem>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
-  linkMode: SimplexLinkMode,
  chatModelIncognito: Boolean,
  back: () -> Unit,
  info: () -> Unit,
@@ -296,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,
@@ -336,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,
            )
          }
        }
@@ -460,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,
@@ -479,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 {
@@ -504,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,
@@ -512,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()) {
@@ -538,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 }
@@ -557,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
@@ -577,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))
              }
            }
@@ -618,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
@@ -633,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)
          }
        }

@@ -652,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
@@ -664,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
@@ -1032,7 +948,6 @@ fun PreviewChatLayout() {
      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1043,7 +958,6 @@ fun PreviewChatLayout() {
      joinGroup = {},
      startCall = {},
      acceptCall = { _ -> },
-      acceptFeature = { _, _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
@@ -1091,7 +1005,6 @@ fun PreviewGroupChatLayout() {
      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
-      linkMode = SimplexLinkMode.DESCRIPTION,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1102,7 +1015,6 @@ fun PreviewGroupChatLayout() {
      joinGroup = {},
      startCall = {},
      acceptCall = { _ -> },
-      acceptFeature = { _, _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
@@ -1,10 +1,8 @@
-@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.Bitmap
@@ -34,25 +32,27 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 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
@@ -62,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
@@ -99,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) {
@@ -121,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) },
@@ -144,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
  }
 }
@@ -182,17 +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 source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
      val bitmap = ImageDecoder.decodeBitmap(source)
      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
+      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()
    }
@@ -234,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? ->
@@ -243,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(
@@ -256,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)
@@ -334,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()
+        }
+      }
    }
  }

@@ -506,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) {
@@ -528,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
@@ -633,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)
@@ -656,95 +538,27 @@ fun ComposeView(
      modifier = Modifier.padding(end = 8.dp),
      verticalAlignment = Alignment.Bottom,
    ) {
-      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled) {
+      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) 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
-        }
-      }
-
-      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,
+        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,15 +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.view.ViewGroup
-import android.view.WindowManager
 import android.view.inputmethod.*
 import android.widget.EditText
-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.*
@@ -25,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
@@ -43,124 +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.io.*

@Composable
 fun SendMsgView(
  composeState: MutableState<ComposeState>,
-  showVoiceRecordIcon: Boolean,
-  recState: MutableState<RecordingState>,
-  isDirectChat: Boolean,
-  liveMessageAlertShown: SharedPreference<Boolean>,
-  needToAllowVoiceToContact: Boolean,
-  allowedVoiceByPrefs: 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, onMessageChange)
-    // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview) {
-      Box(Modifier.matchParentSize().clickable(enabled = false, onClick = { }))
-    }
-    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 -> {
-                DisallowedVoiceButton {
-                  if (needToAllowVoiceToContact) {
-                    showNeedToAllowVoiceAlert(allowVoiceToContact)
-                  } else {
-                    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 {
-                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)
          }
        }
      }
@@ -172,7 +196,6 @@ fun SendMsgView(
 private fun NativeKeyboard(
  composeState: MutableState<ComposeState>,
  textStyle: MutableState<TextStyle>,
-  showDeleteTextButton: MutableState<Boolean>,
  onMessageChange: (String) -> Unit
 ) {
  val cs = composeState.value
@@ -183,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
+      }
    }
  }

@@ -203,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/*"))
@@ -250,7 +276,6 @@ private fun NativeKeyboard(
      imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
      showKeyboard = false
    }
-    showDeleteTextButton.value = it.lineCount >= 4
  }
  if (composeState.value.preview is ComposePreview.VoicePreview) {
    Text(
@@ -262,296 +287,6 @@ private fun NativeKeyboard(
  }
 }

-@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(onClick: () -> Unit) {
-  IconButton(onClick, Modifier.size(36.dp)) {
-    Icon(
-      Icons.Outlined.KeyboardVoice,
-      stringResource(R.string.icon_descr_record_voice_message),
-      tint = HighOrLowlight,
-      modifier = Modifier
-        .size(36.dp)
-        .padding(4.dp)
-    )
-  }
-}
-
-@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(onClick: () -> Unit) {
-  val interactionSource = remember { MutableInteractionSource() }
-  Box(
-    modifier = Modifier.requiredSize(36.dp)
-      .clickable(
-        onClick = onClick,
-        enabled = true,
-        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 = MaterialTheme.colors.primary,
-      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,
@@ -565,15 +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,
-      allowVoiceToContact = {},
+      allowVoiceRecord = false,
      sendMessage = {},
      onMessageChange = { _ -> },
+      onAudioAdded = { _, _, _ -> },
      textStyle = textStyle
    )
  }
@@ -593,15 +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,
-      allowVoiceToContact = {},
+      allowVoiceRecord = false,
      sendMessage = {},
      onMessageChange = { _ -> },
+      onAudioAdded = { _, _, _ -> },
      textStyle = textStyle
    )
  }
@@ -617,19 +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,
-      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?, onGroupLinkUpdated: (String?) -> 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,56 +43,32 @@ fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, onGroupLinkUpdat
        .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) }
      },
-      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 = {
        withApi {
-          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, onGroupLinkUpdated) }
+          val groupLink = chatModel.controller.apiGetGroupLink(groupInfo.groupId)
+          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink) }
        }
      }
    )
@@ -145,11 +117,9 @@ fun GroupChatInfoLayout(
  groupInfo: GroupInfo,
  members: List<GroupMember>,
  developerTools: Boolean,
-  groupLink: String?,
  addMembers: () -> Unit,
  showMemberInfo: (GroupMember) -> Unit,
  editGroupProfile: () -> Unit,
-  openPreferences: () -> Unit,
  deleteGroup: () -> Unit,
  clearChat: () -> Unit,
  leaveGroup: () -> Unit,
@@ -169,25 +139,9 @@ fun GroupChatInfoLayout(
    }
    SectionSpacer()

-    SectionView {
-      if (groupInfo.canEdit) {
-        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
-        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) {
@@ -206,6 +160,10 @@ fun GroupChatInfoLayout(
    }
    SectionSpacer()
    SectionView {
+      if (groupInfo.canEdit) {
+        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
+        SectionDivider()
+      }
      ClearChatButton(clearChat)
      if (groupInfo.canDelete) {
        SectionDivider()
@@ -230,7 +188,7 @@ fun GroupChatInfoLayout(
 }

@Composable
-private fun GroupChatInfoHeader(cInfo: ChatInfo) {
+fun GroupChatInfoHeader(cInfo: ChatInfo) {
  Column(
    Modifier.padding(horizontal = 8.dp),
    horizontalAlignment = Alignment.CenterHorizontally
@@ -254,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
@@ -279,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) {
@@ -293,7 +242,7 @@ 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,
@@ -305,15 +254,10 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
    ) {
      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(
@@ -333,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(),
@@ -347,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)
  }
 }

@@ -381,15 +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 LeaveGroupButton() {
+fun LeaveGroupButton() {
  Row(
    Modifier.fillMaxSize(),
    verticalAlignment = Alignment.CenterVertically
@@ -405,7 +327,7 @@ private fun LeaveGroupButton() {
 }

@Composable
-private fun DeleteGroupButton() {
+fun DeleteGroupButton() {
  Row(
    Modifier.fillMaxSize(),
    verticalAlignment = Alignment.CenterVertically
@@ -427,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 = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
+      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
    )
  }
 }
@@ -1,12 +1,10 @@
 package chat.simplex.app.views.chat.group

 import androidx.compose.foundation.layout.*
-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
@@ -17,32 +15,22 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.GroupInfo
-import chat.simplex.app.ui.theme.*
+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?, onGroupLinkUpdated: (String?) -> Unit) {
-  var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
-  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 {
-      groupLink = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
-      onGroupLinkUpdated(groupLink)
-      creatingLink = false
-    }
-  }
-  LaunchedEffect(Unit) {
-    if (groupLink == null && !creatingLink) {
-      createLink()
-    }
-  }
  GroupLinkLayout(
    groupLink = groupLink,
-    creatingLink,
-    createLink = ::createLink,
+    createLink = {
+      withApi {
+        groupLink = chatModel.controller.apiCreateGroupLink(groupInfo.groupId)
+      }
+    },
    share = { shareText(cxt, groupLink ?: return@GroupLinkLayout) },
    deleteLink = {
      AlertManager.shared.showAlertMsg(
@@ -54,22 +42,17 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
            val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
            if (r) {
              groupLink = null
-              onGroupLinkUpdated(null)
            }
          }
        }
      )
    }
  )
-  if (creatingLink) {
-    ProgressIndicator()
-  }
 }

@Composable
 fun GroupLinkLayout(
  groupLink: String?,
-  creatingLink: Boolean,
  createLink: () -> Unit,
  share: () -> Unit,
  deleteLink: () -> Unit
@@ -91,7 +74,7 @@ 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 {
        QRCode(groupLink, Modifier.weight(1f, fill = false).aspectRatio(1f))
        Row(
@@ -116,18 +99,3 @@ fun GroupLinkLayout(
  }
 }

-@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 {
@@ -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,85 +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.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)
-}
-
-// 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
@@ -90,8 +66,7 @@ fun PreviewCIMetaView() {
  CIMetaView(
    chatItem = ChatItem.getSampleData(
      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-    ),
-    null
+    )
  )
 }

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

@@ -113,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()))
+    )
  )
 }

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

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

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

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

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

@@ -183,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)
+    }
+  }
+}
@@ -20,15 +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 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,
@@ -37,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)
@@ -68,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 -> {}
      }
@@ -78,36 +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)
        }
-      }
-
-      @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,78 +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)
-          }
+          ItemAction(
+            stringResource(R.string.delete_verb),
+            Icons.Outlined.Delete,
+            onClick = {
+              showMenu.value = false
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
+          )
        }
      }

-      @Composable
-      fun MarkedDeletedItemDropdownMenu() {
+      @Composable fun DeletedItem() {
+        DeletedItemView(cItem, showMember = showMember)
        DropdownMenu(
          expanded = showMenu.value,
          onDismissRequest = { showMenu.value = false },
          Modifier.width(220.dp)
        ) {
          ItemAction(
-            stringResource(R.string.reveal_verb),
-            Icons.Outlined.Visibility,
+            stringResource(R.string.delete_verb),
+            Icons.Outlined.Delete,
            onClick = {
-              revealed.value = true
              showMenu.value = false
-            }
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
          )
-          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()
-        }
-      }
-
-      @Composable fun DeletedItem() {
-        DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-        DropdownMenu(
-          expanded = showMenu.value,
-          onDismissRequest = { showMenu.value = false },
-          Modifier.width(220.dp)
-        ) {
-          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
        }
      }

@@ -220,50 +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 -> DeletedItem()
-        is CIContent.RcvModerated -> DeletedItem()
-        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 ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
  DropdownMenuItem(onClick) {
@@ -281,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
@@ -325,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 = { _, _, _ -> }
    )
  }
 }
@@ -345,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,8 +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.filled.InsertDriveFile
+import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -14,21 +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.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)
@@ -42,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
@@ -61,41 +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)
-        .padding(end = 12.dp)
-        .padding(top = 6.dp)
-        .padding(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),
+        text, qi.formattedText, sender = qi.sender(membership()), senderBold = true, maxLines = 3,
+        style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface)
      )
    }
  }
@@ -129,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)
@@ -142,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(
@@ -165,13 +124,8 @@ fun FramedItemView(
    Box(contentAlignment = Alignment.BottomEnd) {
      Column(Modifier.width(IntrinsicSize.Max)) {
        PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
-          if (ci.meta.itemDeleted != null) {
-            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
@@ -187,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)
+        }
      }
    }
  }
@@ -225,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(
@@ -255,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
@@ -277,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)
@@ -305,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 = {}
    )
@@ -322,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 = {}
    )
@@ -343,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 = {}
    )
@@ -365,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 = {}
    )
@@ -387,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 = {}
    )
@@ -416,7 +344,6 @@ fun PreviewQuoteWithTextAndImage(@PreviewParameter(EditedProvider::class) edited
        quotedItem = ciQuote,
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -445,7 +372,6 @@ fun PreviewQuoteWithLongTextAndImage(@PreviewParameter(EditedProvider::class) ed
        quotedItem = ciQuote,
        itemEdited = edited
      ),
-      linkMode = SimplexLinkMode.DESCRIPTION,
      showMenu = showMenu,
      receiveFile = {}
    )
@@ -473,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,59 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-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
-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.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
-    ) {
-      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(generalGetString(R.string.marked_deleted_description)) }
-        },
-        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
-        modifier = Modifier.padding(end = 8.dp)
-      )
-      CIMetaView(ci, timedMessagesTTL)
-    }
-  }
-}
-
-@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,7 +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.usersettings.MarkdownHelpView
 import chat.simplex.app.views.usersettings.simplexTeamUri

 val bold = SpanStyle(fontWeight = FontWeight.Bold)
@@ -77,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
@@ -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 { !it.user.activeUser }
-          .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,198 +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.Done
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.runtime.*
-import androidx.compose.ui.*
-import androidx.compose.ui.draw.shadow
-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.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) {
-              chatModel.chats.clear()
-              scope.launch {
-                val job = launch {
-                  delay(500)
-                  switchingUsers.value = true
-                }
-                chatModel.controller.changeActiveUser(u.user.userId)
-                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
-  ) {
-    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
-      )
-    }
-    if (u.activeUser) {
-      Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-    } else if (unreadCount > 0) {
-      Row {
-        Text(
-          unreadCountStr(unreadCount),
-          color = MaterialTheme.colors.onPrimary,
-          fontSize = 11.sp,
-          modifier = Modifier
-            .background(MaterialTheme.colors.primary, 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 {
-      Box(Modifier.size(20.dp))
-    }
-  }
-}
-
-@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)
-  }
-}
@@ -27,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
@@ -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 = 48.dp),
+    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()
-      SettingsPreferenceItem(Icons.Outlined.Backup, stringResource(R.string.full_backup), privacyFullBackup)
-      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
        )
      }
@@ -708,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()
  }
-}
+}
@@ -11,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()
@@ -20,15 +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(), horizontalArrangement = Arrangement.SpaceBetween) {
-          NavigationButtonBack(close)
-          Row {
-            endButtons()
-          }
-        }
-      }
+      content = { NavigationButtonBack(close) }
    )
  }
 }
@@ -36,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(
@@ -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,10 +3,8 @@ 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.graphics.ImageDecoder.DecodeException
 import android.net.Uri
 import android.provider.MediaStore
 import android.util.Base64
@@ -34,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
@@ -177,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?>,
@@ -206,25 +187,24 @@ fun GetImageBottomSheet(
  val processPickedImage = { uri: Uri? ->
    if (uri != null) {
      val source = ImageDecoder.createSource(context.contentResolver, uri)
-      try {
-        val bitmap = ImageDecoder.decodeBitmap(source)
-        imageBitmap.value = uri
-        onImageChange(bitmap)
-      } catch (e: DecodeException) {
-        Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
+      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()
@@ -248,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()
@@ -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,12 +56,7 @@ fun <T> SectionViewSelectable(
 }

@Composable
-fun SectionItemView(
-  click: (() -> Unit)? = null,
-  minHeight: Dp = 46.dp,
-  disabled: Boolean = false,
-  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)
@@ -101,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,
@@ -111,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
  ) {
@@ -160,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),
@@ -194,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)
  }
 }
@@ -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,6 +1,7 @@
 package chat.simplex.app.views.helpers

-import android.app.Application
+import android.R.attr.factor
+import android.R.color
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.*
@@ -27,13 +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.model.CIFile
-import chat.simplex.app.model.json
 import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
@@ -44,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
 }
@@ -229,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

@@ -245,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)
@@ -337,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)
@@ -360,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 ->
@@ -375,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)
@@ -412,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 {
@@ -495,9 +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) }
-  )
@@ -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
@@ -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))
-}
@@ -25,6 +25,7 @@ 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) {
@@ -104,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,301 +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.openUri(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"
-      )
-    )
-  )
-)
-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) },
@@ -24,6 +24,8 @@ 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
@@ -63,6 +65,11 @@ fun AppearanceView() {
  AppearanceLayout(
    appIcon,
    changeIcon = ::setAppIcon,
+    showThemeSelector = {
+      ModalManager.shared.showModal(true) {
+        ThemeSelectorView()
+      }
+    },
    editPrimaryColor = { primary ->
      ModalManager.shared.showModalCloseable { close ->
        ColorEditor(primary, close)
@@ -74,6 +81,7 @@ fun AppearanceView() {
@Composable fun AppearanceLayout(
  icon: MutableState<AppIcon>,
  changeIcon: (AppIcon) -> Unit,
+  showThemeSelector: () -> Unit,
  editPrimaryColor: (Color) -> Unit,
 ) {
  Column(
@@ -107,12 +115,8 @@ fun AppearanceView() {
    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) }) {
@@ -179,21 +183,6 @@ fun ColorPicker(initialColor: Color, onColorChanged: (Color) -> Unit) {
  )
 }

-@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 findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
  SimplexApp.context.packageManager.getComponentEnabledSetting(
    ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${icon.name.lowercase()}")
@@ -207,6 +196,7 @@ fun PreviewAppearanceSettings() {
    AppearanceLayout(
      icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
      changeIcon = {},
+      showThemeSelector = {},
      editPrimaryColor = {},
    )
  }
@@ -9,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
@@ -31,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(
@@ -80,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))
@@ -93,7 +91,6 @@ fun SharedPreferenceToggle(
      onCheckedChange = {
        preference.set(it)
        prefState.value = it
-        onChange?.invoke(it)
      },
      colors = SwitchDefaults.colors(
        checkedThumbColor = MaterialTheme.colors.primary,
@@ -109,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,
@@ -138,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> {
@@ -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)
@@ -31,17 +31,11 @@ fun NetworkAndServersView(
  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,
    toggleSocksProxy = { enable ->
@@ -84,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)
@@ -102,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
-          }
-        }
-      }
    }
  )
 }
@@ -135,12 +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),
  toggleSocksProxy: (Boolean) -> Unit,
  useOnion: (OnionHosts) -> Unit,
-  updateSessionMode: (TransportSessionMode) -> Unit,
 ) {
  Column(
    Modifier.fillMaxWidth(),
@@ -149,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), showSettingsModal { SMPServersView(it) })
+      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)) {
@@ -220,6 +181,7 @@ private fun UseOnionHosts(
    }
  }
  val onSelected = showModal {
+
    Column(
      Modifier.fillMaxWidth(),
      horizontalAlignment = Alignment.Start,
@@ -239,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,
@@ -299,9 +228,7 @@ fun PreviewNetworkAndServersLayout() {
      showSettingsModal = { {} },
      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,86 +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.platform.LocalView
 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
-  )
 }
@@ -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,335 +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) {
-  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()
-
-  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.openUri("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) {
-  withApi {
-    if (m.controller.setUserSMPServers(servers)) {
-      m.userSMPServers.value = servers
-      m.userSMPServersUnsaved.value = null
-    }
-  }
-}
-
@@ -1,55 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-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.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.model.ServerCfg
-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 ScanSMPServer(onNext: (ServerCfg) -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanSMPServerLayout(onNext)
-}
-
-@Composable
-private fun ScanSMPServerLayout(onNext: (ServerCfg) -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.smp_servers_scan_qr), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = 12.dp)
-    ) {
-      QRCodeScanner { text ->
-        val res = parseServerAddress(text)
-        if (res != null) {
-          onNext(ServerCfg(text, false, null, true))
-        } else {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.smp_servers_invalid_address),
-            text = generalGetString(R.string.smp_servers_check_address)
-          )
-        }
-      }
-    }
-  }
-}
@@ -4,7 +4,6 @@ import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionView
-import android.content.Context
 import android.content.res.Configuration
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -17,14 +16,14 @@ 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.*
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.painterResource
 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.*
-import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
@@ -35,7 +34,6 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.CreateLinkTab
 import chat.simplex.app.views.newchat.CreateLinkView
 import chat.simplex.app.views.onboarding.SimpleXInfo
-import chat.simplex.app.views.onboarding.WhatsNewView

@Composable
 fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
@@ -45,8 +43,6 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
  MaintainIncognitoState(chatModel)

  if (user != null) {
-    val requireAuth = remember { chatModel.controller.appPrefs.performLA.state }
-    val context = LocalContext.current
    SettingsLayout(
      profile = user.profile,
      stopped,
@@ -59,43 +55,8 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
      showSettingsModal = { modalView -> { ModalManager.shared.showModal(true) { modalView(chatModel) } } },
      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showVersion = {
-        withApi {
-          val info = chatModel.controller.apiGetVersion()
-          if (info != null) {
-            ModalManager.shared.showModal { VersionInfoView(info) }
-          }
-        }
-      },
-      withAuth = { block ->
-        if (!requireAuth.value) {
-          block()
-        } else {
-          ModalManager.shared.showModalCloseable { close ->
-            val onFinishAuth = { success: Boolean ->
-              if (success) {
-                close()
-                block()
-              }
-            }
-            LaunchedEffect(Unit) {
-              runAuth(context, onFinishAuth)
-            }
-            Box(
-              Modifier.fillMaxSize(),
-              contentAlignment = Alignment.Center
-            ) {
-              SimpleButton(
-                stringResource(R.string.auth_unlock),
-                icon = Icons.Outlined.Lock,
-                click = {
-                  runAuth(context, onFinishAuth)
-                }
-              )
-            }
-          }
-        }
-      },
+      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } },
+//      showVideoChatPrototype = { ModalManager.shared.showCustomModal { close -> CallViewDebug(close) } },
    )
  }
 }
@@ -103,21 +64,31 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
 val simplexTeamUri =
  "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"

+// TODO pass close
+//fun showSectionedModal(chatModel: ChatModel, modalView: (@Composable (ChatModel) -> Unit)) {
+//  ModalManager.shared.showCustomModal { close ->
+//    ModalView(close = close, modifier = Modifier,
+//      background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight) {
+//      modalView(chatModel)
+//    }
+//  }
+//}
+
@Composable
 fun SettingsLayout(
  profile: LocalProfile,
  stopped: Boolean,
  encrypted: Boolean,
  incognito: MutableState<Boolean>,
-  incognitoPref: SharedPreference<Boolean>,
-  developerTools: SharedPreference<Boolean>,
+  incognitoPref: Preference<Boolean>,
+  developerTools: Preference<Boolean>,
  userDisplayName: String,
  setPerformLA: (Boolean) -> Unit,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  showVersion: () -> Unit,
-  withAuth: (block: () -> Unit) -> Unit
+  showTerminal: () -> Unit,
+//  showVideoChatPrototype: () -> Unit
 ) {
  val uriHandler = LocalUriHandler.current
  Surface(Modifier.fillMaxSize().verticalScroll(rememberScrollState())) {
@@ -141,38 +112,34 @@ fun SettingsLayout(
          ProfilePreview(profile, stopped = stopped)
        }
        SectionDivider()
-        SettingsActionItem(Icons.Outlined.ManageAccounts, stringResource(R.string.your_chat_profiles), { withAuth { showSettingsModal { UserProfilesView(it) }() } }, disabled = stopped)
-        SectionDivider()
        SettingsIncognitoActionItem(incognitoPref, incognito, stopped) { showModal { IncognitoView() }() }
        SectionDivider()
        SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { CreateLinkView(it, CreateLinkTab.LONG_TERM) }, disabled = stopped)
        SectionDivider()
-        ChatPreferencesItem(showCustomModal, stopped = stopped)
+        DatabaseItem(encrypted, showSettingsModal { DatabaseView(it, showSettingsModal) }, stopped)
      }
      SectionSpacer()

      SectionView(stringResource(R.string.settings_section_title_settings)) {
        SettingsActionItem(Icons.Outlined.Bolt, stringResource(R.string.notifications), showSettingsModal { NotificationsSettingsView(it) }, disabled = stopped)
        SectionDivider()
-        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, disabled = stopped)
-        SectionDivider()
        SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it, showModal) }, disabled = stopped)
        SectionDivider()
        SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) }, disabled = stopped)
        SectionDivider()
        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showSettingsModal { AppearanceView() }, disabled = stopped)
        SectionDivider()
-        DatabaseItem(encrypted, showSettingsModal { DatabaseView(it, showSettingsModal) }, stopped)
+        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, disabled = stopped)
      }
      SectionSpacer()

      SectionView(stringResource(R.string.settings_section_title_help)) {
        SettingsActionItem(Icons.Outlined.HelpOutline, stringResource(R.string.how_to_use_simplex_chat), showModal { HelpView(userDisplayName) }, disabled = stopped)
        SectionDivider()
-        SettingsActionItem(Icons.Outlined.Add, stringResource(R.string.whats_new), showCustomModal { _, close -> WhatsNewView(viaSettings = true, close) }, disabled = stopped)
-        SectionDivider()
        SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
        SectionDivider()
+        SettingsActionItem(Icons.Outlined.TextFormat, stringResource(R.string.markdown_in_messages), showModal { MarkdownHelpView() })
+        SectionDivider()
        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
        SectionDivider()
        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUri("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
@@ -193,14 +160,14 @@ fun SettingsLayout(
        SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools, devTools)
        SectionDivider()
        if (devTools.value) {
-          ChatConsoleItem { withAuth(showCustomModal { it, close -> TerminalView(it, close) }) }
+          ChatConsoleItem(showTerminal)
          SectionDivider()
          InstallTerminalAppItem(uriHandler)
          SectionDivider()
        }
 //        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
 //        SectionDivider()
-        AppVersionItem(showVersion)
+        AppVersionItem()
      }
    }
  }
@@ -208,7 +175,7 @@ fun SettingsLayout(

@Composable
 fun SettingsIncognitoActionItem(
-  incognitoPref: SharedPreference<Boolean>,
+  incognitoPref: Preference<Boolean>,
  incognito: MutableState<Boolean>,
  stopped: Boolean,
  onClickInfo: () -> Unit,
@@ -270,21 +237,6 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
  }
 }

-@Composable fun ChatPreferencesItem(showCustomModal: ((@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit)), stopped: Boolean) {
-  SettingsActionItem(
-    Icons.Outlined.ToggleOn,
-    stringResource(R.string.chat_preferences),
-    click = if (stopped) null else ({
-      withApi {
-        showCustomModal { m, close ->
-          PreferencesView(m, m.currentUser.value ?: return@showCustomModal, close)
-        }()
-      }
-    }),
-    disabled = stopped
-  )
-}
-
@Composable fun ChatLockItem(performLA: MutableState<Boolean>, setPerformLA: (Boolean) -> Unit) {
  SectionItemView() {
    Row(verticalAlignment = Alignment.CenterVertically) {
@@ -376,8 +328,8 @@ fun MaintainIncognitoState(chatModel: ChatModel) {
  }
 }

-@Composable private fun AppVersionItem(showVersion: () -> Unit) {
-  SectionItemView(showVersion) {
+@Composable private fun AppVersionItem() {
+  SectionItemView() {
    Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
  }
 }
@@ -413,18 +365,12 @@ fun SettingsActionItem(icon: ImageVector, text: String, click: (() -> Unit)? = n
 }

@Composable
-fun SettingsPreferenceItem(
-  icon: ImageVector,
-  text: String,
-  pref: SharedPreference<Boolean>,
-  prefState: MutableState<Boolean>? = null,
-  onChange: ((Boolean) -> Unit)? = null,
-) {
-  SectionItemView {
+fun SettingsPreferenceItem(icon: ImageVector, text: String, pref: Preference<Boolean>, prefState: MutableState<Boolean>? = null) {
+  SectionItemView() {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(icon, text, tint = HighOrLowlight)
      Spacer(Modifier.padding(horizontal = 4.dp))
-      SharedPreferenceToggle(text, pref, prefState, onChange)
+      SharedPreferenceToggle(text, pref, prefState)
    }
  }
 }
@@ -436,10 +382,10 @@ fun SettingsPreferenceItemWithInfo(
  text: String,
  stopped: Boolean,
  onClickInfo: () -> Unit,
-  pref: SharedPreference<Boolean>,
+  pref: Preference<Boolean>,
  prefState: MutableState<Boolean>? = null
 ) {
-  SectionItemView(if (stopped) null else onClickInfo) {
+  SectionItemView(onClickInfo) {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(icon, text, tint = if (stopped) HighOrLowlight else iconTint)
      Spacer(Modifier.padding(horizontal = 4.dp))
@@ -448,43 +394,21 @@ fun SettingsPreferenceItemWithInfo(
  }
 }

-@Composable
-fun PreferenceToggle(
-  text: String,
-  checked: Boolean,
-  onChange: (Boolean) -> Unit = {},
-) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    Text(text)
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    Switch(
-      checked = checked,
-      onCheckedChange = onChange,
-      colors = SwitchDefaults.colors(
-        checkedThumbColor = MaterialTheme.colors.primary,
-        uncheckedThumbColor = HighOrLowlight
-      )
-    )
-  }
-}
-
@Composable
 fun PreferenceToggleWithIcon(
  text: String,
-  icon: ImageVector? = null,
-  iconColor: Color? = HighOrLowlight,
+  icon: ImageVector,
+  iconColor: Color = HighOrLowlight,
  checked: Boolean,
  onChange: (Boolean) -> Unit = {},
 ) {
  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    if (icon != null) {
-      Icon(
-        icon,
-        null,
-        tint = iconColor ?: HighOrLowlight
-      )
-      Spacer(Modifier.padding(horizontal = 4.dp))
-    }
+    Icon(
+      icon,
+      null,
+      tint = iconColor
+    )
+    Spacer(Modifier.padding(horizontal = 4.dp))
    Text(text)
    Spacer(Modifier.fillMaxWidth().weight(1f))
    Switch(
@@ -500,17 +424,6 @@ fun PreferenceToggleWithIcon(
  }
 }

-private fun runAuth(context: Context, onFinish: (success: Boolean) -> Unit) {
-  authenticate(
-    generalGetString(R.string.auth_open_chat_console),
-    generalGetString(R.string.auth_log_in_using_credential),
-    context as FragmentActivity,
-    completed = { laResult ->
-      onFinish(laResult == LAResult.Success || laResult == LAResult.Unavailable)
-    }
-  )
-}
-
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -525,15 +438,15 @@ fun PreviewSettingsLayout() {
      stopped = false,
      encrypted = false,
      incognito = remember { mutableStateOf(false) },
-      incognitoPref = SharedPreference({ false }, {}),
-      developerTools = SharedPreference({ false }, {}),
+      incognitoPref = Preference({ false }, {}),
+      developerTools = Preference({ false }, {}),
      userDisplayName = "Alice",
      setPerformLA = {},
      showModal = { {} },
      showSettingsModal = { {} },
-      showCustomModal = { {} },
-      showVersion = {},
-      withAuth = {},
+      showCustomModal = { {}},
+      showTerminal = {},
+//      showVideoChatPrototype = {}
    )
  }
 }
@@ -0,0 +1,44 @@
+package chat.simplex.app.views.usersettings
+
+import SectionViewSelectable
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
+import chat.simplex.app.R
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun ThemeSelectorView() {
+  val darkTheme = isSystemInDarkTheme()
+  val allThemes by remember { mutableStateOf(ThemeManager.allThemes(darkTheme).map { ValueTitleDesc(it.second, it.third, "") }) }
+
+  ThemeSelectorLayout(
+    allThemes,
+    onSelectTheme = {
+      ThemeManager.applyTheme(it.name, darkTheme)
+    },
+  )
+}
+
+@Composable
+private fun ThemeSelectorLayout(
+  allThemes: List<ValueTitleDesc<DefaultTheme>>,
+  onSelectTheme: (DefaultTheme) -> Unit,
+) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+  ) {
+    AppBarTitle(stringResource(R.string.settings_section_title_themes).lowercase().capitalize(Locale.current))
+    val currentTheme by CurrentColors.collectAsState()
+    val state = remember { derivedStateOf { currentTheme.second } }
+    SectionViewSelectable(null, state, allThemes, onSelectTheme)
+  }
+}
+
@@ -44,9 +44,12 @@ fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
      close,
      saveProfile = { displayName, fullName, image ->
        withApi {
-          val newProfile = chatModel.controller.apiUpdateProfile(profile.copy(displayName = displayName, fullName = fullName, image = image))
+          val p = Profile(displayName, fullName, image)
+          val newProfile = chatModel.controller.apiUpdateProfile(p)
          if (newProfile != null) {
-            chatModel.updateCurrentUser(newProfile)
+            chatModel.currentUser.value?.profile?.profileId?.let {
+              chatModel.updateUserProfile(newProfile.toLocalProfile(it))
+            }
            profile = newProfile
          }
          editProfile.value = false
@@ -94,7 +97,7 @@ fun UserProfileLayout(
            .padding(horizontal = DEFAULT_PADDING),
          horizontalAlignment = Alignment.Start
        ) {
-          AppBarTitle(stringResource(R.string.your_current_profile), false)
+          AppBarTitle(stringResource(R.string.your_chat_profile), false)
          Text(
            stringResource(R.string.your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it),
            Modifier.padding(bottom = 24.dp),
@@ -1,141 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionDivider
-import SectionItemView
-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.ui.Modifier
-import androidx.compose.ui.graphics.Color
-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.ui.theme.*
-import chat.simplex.app.views.chat.item.ItemAction
-import chat.simplex.app.views.chatlist.UserProfilePickerItem
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.CreateProfile
-
-@Composable
-fun UserProfilesView(m: ChatModel) {
-  val users by remember { derivedStateOf { m.users.map { it.user } } }
-  UserProfilesView(
-    users = users,
-    addUser = {
-      ModalManager.shared.showModalCloseable { close ->
-        CreateProfile(m, close)
-      }
-    },
-    activateUser = { user ->
-      withBGApi {
-        m.controller.changeActiveUser(user.userId)
-      }
-    },
-    removeUser = { user ->
-      val text = buildAnnotatedString {
-        append(generalGetString(R.string.users_delete_all_chats_deleted) + "\n\n" + generalGetString(R.string.users_delete_profile_for) + " ")
-        withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-          append(user.displayName)
-        }
-        append(":")
-      }
-      AlertManager.shared.showAlertDialogButtonsColumn(
-        title = generalGetString(R.string.users_delete_question),
-        text = text,
-        buttons = {
-          Column {
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              removeUser(m, user, users, true)
-            }) {
-              Text(stringResource(R.string.users_delete_with_connections), color = Color.Red)
-            }
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              removeUser(m, user, users, false)
-            }
-            ) {
-              Text(stringResource(R.string.users_delete_data_only), color = Color.Red)
-            }
-          }
-        }
-      )
-    }
-  )
-}
-
-@Composable
-private fun UserProfilesView(
-  users: List<User>,
-  addUser: () -> Unit,
-  activateUser: (User) -> Unit,
-  removeUser: (User) -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-      .padding(bottom = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.your_chat_profiles))
-
-    SectionView {
-      for (user in users) {
-        UserView(user, users, activateUser, removeUser)
-        SectionDivider()
-      }
-      SectionItemView(addUser, minHeight = 68.dp) {
-        Icon(Icons.Outlined.Add, stringResource(R.string.users_add), tint = MaterialTheme.colors.primary)
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.users_add), color = MaterialTheme.colors.primary)
-      }
-    }
-    SectionTextFooter(stringResource(R.string.your_chat_profiles_stored_locally))
-  }
-}
-
-@Composable
-private fun UserView(user: User, users: List<User>, activateUser: (User) -> Unit, removeUser: (User) -> Unit) {
-  var showDropdownMenu by remember { mutableStateOf(false) }
-  UserProfilePickerItem(user, onLongClick = { if (users.size > 1) showDropdownMenu = true }) {
-    activateUser(user)
-  }
-  Box(Modifier.padding(horizontal = 16.dp)) {
-    DropdownMenu(
-      expanded = showDropdownMenu,
-      onDismissRequest = { showDropdownMenu = false },
-      Modifier.width(220.dp)
-    ) {
-      ItemAction(stringResource(R.string.delete_verb), Icons.Outlined.Delete, color = Color.Red, onClick = {
-        removeUser(user)
-        showDropdownMenu = false
-      }
-      )
-    }
-  }
-}
-
-private fun removeUser(m: ChatModel, user: User, users: List<User>, delSMPQueues: Boolean) {
-  if (users.size < 2) return
-
-  withBGApi {
-    try {
-      if (user.activeUser) {
-        val newActive = users.first { !it.activeUser }
-        m.controller.changeActiveUser_(newActive.userId)
-      }
-      m.controller.apiDeleteUser(user.userId, delSMPQueues)
-      m.users.removeAll { it.user.userId == user.userId }
-    } catch (e: Exception) {
-      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_user), e.stackTraceToString())
-    }
-  }
-}
@@ -1,30 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.R
-import chat.simplex.app.model.CoreVersionInfo
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.AppBarTitle
-
-@Composable
-fun VersionInfoView(info: CoreVersionInfo) {
-  Column(
-    Modifier.padding(horizontal = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.Start
-  ) {
-    AppBarTitle(stringResource(R.string.app_version_title), false)
-    Text(String.format(stringResource(R.string.app_version_name), BuildConfig.VERSION_NAME))
-    Text(String.format(stringResource(R.string.app_version_code), BuildConfig.VERSION_CODE))
-    Text(String.format(stringResource(R.string.core_version), info.version))
-    Text(String.format(stringResource(R.string.core_build_timestamp), info.buildTimestamp))
-    val simplexmqCommit = if (info.simplexmqCommit.length >= 7) info.simplexmqCommit.substring(startIndex = 0, endIndex = 7) else info.simplexmqCommit
-    Text(String.format(stringResource(R.string.core_simplexmq_version), info.simplexmqVersion, simplexmqCommit))
-  }
-}
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
@@ -1,961 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="allow_voice_messages_only_if">Povolte hlasové zprávy, pouze pokud je váš kontakt povolí.</string>
-    <string name="allow_to_send_disappearing">Povolit odesílání mizejících zpráv.</string>
-    <string name="allow_to_send_voice">Povolit odesílání hlasových zpráv.</string>
-    <string name="v4_2_group_links_desc">Správci mohou vytvářet odkazy pro připojení ke skupinám.</string>
-    <string name="accept_contact_button">Přijmout</string>
-    <string name="smp_servers_preset_add">Přidejte přednastavené servery</string>
-    <string name="network_settings">Pokročilá nastavení sítě</string>
-    <string name="accept">Přijmout</string>
-    <string name="smp_servers_add">Přidat server…</string>
-    <string name="network_enable_socks_info">Přistupovat k serverům přes SOCKS proxy na portu 9050\? Před povolením této možnosti musí být spuštěna proxy.</string>
-    <string name="accept_feature">Přijmout</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Umožněte svým kontaktům odesílat mizející zprávy.</string>
-    <string name="about_simplex_chat">O <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="smp_servers_add_to_another_device">Přidat do jiného zařízení</string>
-    <string name="accept_requests">Přijímat žádosti</string>
-    <string name="allow_verb">Povolit</string>
-    <string name="allow_voice_messages_question">Povolit hlasové zprávy\?</string>
-    <string name="about_simplex">O SimpleX</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="accept_call_on_lock_screen">Přijmout</string>
-    <string name="chat_item_ttl_day">1 dni</string>
-    <string name="group_member_role_admin">správce</string>
-    <string name="users_add">Přidat profil</string>
-    <string name="users_delete_all_chats_deleted">Všechny chaty a zprávy budou smazány – tuto akci nelze vrátit zpět!</string>
-    <string name="allow_disappearing_messages_only_if">Povolte mizející zprávy, pouze pokud to váš kontakt povolí.</string>
-    <string name="v4_3_improved_server_configuration_desc">Přidejte servery skenováním QR kódů.</string>
-    <string name="chat_item_ttl_month">1 měsíci</string>
-    <string name="chat_item_ttl_week">1 týdnu</string>
-    <string name="callstatus_accepted">přijatý hovor</string>
-    <string name="accept_contact_incognito_button">Přijmout inkognito</string>
-    <string name="accept_connection_request__question">Přijmout žádost o připojení\?</string>
-    <string name="all_group_members_will_remain_connected">Všichni členové skupiny zůstanou připojeni.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí.</string>
-    <string name="allow_direct_messages">Povolit odesílání přímých zpráv členům.</string>
-    <string name="allow_to_delete_messages">Povolit nevratné smazání odeslaných zpráv.</string>
-    <string name="clear_chat_warning">Všechny zprávy budou smazány – tuto akci nelze vrátit zpět! Zprávy budou smazány POUZE pro vás.</string>
-    <string name="allow_your_contacts_irreversibly_delete">Umožněte svým kontaktům nevratně odstranit odeslané zprávy.</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Povolte svým kontaktům odesílání hlasových zpráv.</string>
-    <string name="button_create_group_link">Vytvořit odkaz</string>
-    <string name="delete_link_question">Smazat odkaz\?</string>
-    <string name="button_send_direct_message">Odeslat přímou zprávu</string>
-    <string name="member_info_section_title_member">ČLEN</string>
-    <string name="change_member_role_question">Změnit roli ve skupině\?</string>
-    <string name="info_row_connection">Připojení</string>
-    <string name="conn_level_desc_indirect">nepřímé (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
-    <string name="conn_stats_section_title_servers">SERVERY</string>
-    <string name="receiving_via">Příjímáno přez</string>
-    <string name="create_secret_group_title">Vytvoření tajné skupiny</string>
-    <string name="group_display_name_field">Zobrazení názvu skupiny:</string>
-    <string name="group_full_name_field">Úplný název skupiny:</string>
-    <string name="group_main_profile_sent">Váš profil v chatu bude zaslán členům skupiny</string>
-    <string name="group_profile_is_stored_on_members_devices">Profil skupiny je uložen v zařízeních členů, nikoli na serverech.</string>
-    <string name="network_options_save">Uložit</string>
-    <string name="update_network_settings_question">Aktualizovat nastavení sítě\?</string>
-    <string name="incognito">Inkognito</string>
-    <string name="incognito_random_profile">Váš náhodný profil</string>
-    <string name="incognito_random_profile_description">Vašemu kontaktu bude zaslán náhodný profil</string>
-    <string name="save_color">Uložit barvu</string>
-    <string name="reset_color">Obnovení barev</string>
-    <string name="color_primary">Zbarvení</string>
-    <string name="chat_preferences_you_allow">Povolujete</string>
-    <string name="chat_preferences_default">výchozí (%s)</string>
-    <string name="chat_preferences_yes">ano</string>
-    <string name="chat_preferences_no">ne</string>
-    <string name="chat_preferences_always">vždy</string>
-    <string name="set_group_preferences">Nastavení skupinových předvoleb</string>
-    <string name="your_preferences">Vaše preference</string>
-    <string name="timed_messages">Mizející zprávy</string>
-    <string name="feature_enabled_for_contact">povoleno pro kontakt</string>
-    <string name="feature_received_prohibited">přijaté, zakázané</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Vy i váš kontakt můžete posílat mizející zprávy.</string>
-    <string name="only_your_contact_can_send_disappearing">Zmizelé zprávy může odesílat pouze váš kontakt.</string>
-    <string name="only_you_can_delete_messages">Nevratně mazat zprávy můžete pouze vy (váš kontakt je může označit ke smazání).</string>
-    <string name="message_deletion_prohibited">Nevratné mazání zpráv je v tomto chatu zakázáno.</string>
-    <string name="prohibit_direct_messages">Zakázat odesílání přímých zpráv členům.</string>
-    <string name="ttl_sec">%d sec</string>
-    <string name="ttl_s">%ds</string>
-    <string name="ttl_min">%d min</string>
-    <string name="ttl_hour">\"%d hodina</string>
-    <string name="feature_offered_item_with_param">offered %s: %2s</string>
-    <string name="v4_2_group_links">Odkazy na skupiny</string>
-    <string name="v4_3_voice_messages">Hlasové zprávy</string>
-    <string name="v4_3_irreversible_message_deletion_desc">Vaše kontakty mohou povolit úplné vymazání zpráv.</string>
-    <string name="v4_4_disappearing_messages">Zmizení zpráv</string>
-    <string name="v4_4_verify_connection_security_desc">Porovnejte bezpečnostní kódy se svými kontakty.</string>
-    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="thousand_abbreviation">k</string>
-    <string name="connect_via_contact_link">Připojit se přes kontaktní odkaz\?</string>
-    <string name="connect_via_invitation_link">Připojit se přes pozvánku\?</string>
-    <string name="connect_via_group_link">Připojit se přes odkaz skupiny\?</string>
-    <string name="profile_will_be_sent_to_contact_sending_link">Váš profil bude odeslán kontaktu, od kterého jste obdrželi tento odkaz.</string>
-    <string name="server_connected">připojeno</string>
-    <string name="server_error">chyba</string>
-    <string name="server_connecting">připojení</string>
-    <string name="trying_to_connect_to_server_to_receive_messages">Pokus o připojení k serveru používanému pro příjem zpráv od tohoto kontaktu.</string>
-    <string name="deleted_description">Smazáno</string>
-    <string name="invalid_chat">neplatný chat</string>
-    <string name="invalid_data">neplatné údaje</string>
-    <string name="connection_local_display_name">spojení <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
-    <string name="display_name_connection_established">spojení navázáno</string>
-    <string name="display_name_invited_to_connect">pozvánka k připojení</string>
-    <string name="display_name_connecting">připojení…</string>
-    <string name="description_you_shared_one_time_link">jste sdíleli jednorázové spojení</string>
-    <string name="description_you_shared_one_time_link_incognito">sdíleli jste jednorázový odkaz inkognito</string>
-    <string name="description_via_group_link">prostřednictvím skupinového odkazu</string>
-    <string name="description_via_contact_address_link">prostřednictvím odkazu na kontaktní adresu</string>
-    <string name="description_via_contact_address_link_incognito">inkognito přes odkaz na kontaktní adresu</string>
-    <string name="description_via_one_time_link">prostřednictvím jednorázového odkazu</string>
-    <string name="description_via_one_time_link_incognito">inkognito přes jednorázový odkaz</string>
-    <string name="simplex_link_contact">SimpleX kontaktní adresa</string>
-    <string name="simplex_link_invitation">Jednorázová pozvánka SimpleX</string>
-    <string name="simplex_link_group">Skupinový odkaz SimpleX</string>
-    <string name="simplex_link_connection">prostřednictvím <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
-    <string name="simplex_link_mode">Odkazy na SimpleX</string>
-    <string name="simplex_link_mode_description">Popis</string>
-    <string name="simplex_link_mode_full">Úplný odkaz</string>
-    <string name="simplex_link_mode_browser">Prostřednictvím prohlížeče</string>
-    <string name="simplex_link_mode_browser_warning">Otevření odkazu v prohlížeči může snížit soukromí a bezpečnost připojení. Nedůvěryhodné odkazy SimpleX budou červené.</string>
-    <string name="error_saving_smp_servers">Chyba při ukládání serverů SMP</string>
-    <string name="error_setting_network_config">Chyba při aktualizaci konfigurace sítě</string>
-    <string name="failed_to_parse_chat_title">Nepodařilo se načíst chat</string>
-    <string name="failed_to_parse_chats_title">Nepodařilo se načíst chaty</string>
-    <string name="contact_developers">Aktualizujte aplikaci a kontaktujte vývojáře.</string>
-    <string name="connection_timeout">Časový limit připojení</string>
-    <string name="connection_error">Chyba připojení</string>
-    <string name="network_error_desc">Zkontrolujte prosím své síťové připojení pomocí <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> a zkuste to znovu.</string>
-    <string name="error_sending_message">Chyba při odesílání zprávy</string>
-    <string name="error_adding_members">Chyba při přidávání prutu(ů)</string>
-    <string name="contact_already_exists">Kontakt již existuje</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Jste již připojeni k <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
-    <string name="invalid_connection_link">Neplatný odkaz na spojení</string>
-    <string name="error_accepting_contact_request">Chyba příjmu požadavku od kontaktu</string>
-    <string name="error_changing_address">Chyba změny adresy</string>
-    <string name="settings_notifications_mode_title">Služba oznamování</string>
-    <string name="notifications_mode_service_desc">Služba na pozadí je spuštěna vždy - oznámení se zobrazí, jakmile jsou zprávy k dispozici.</string>
-    <string name="notification_preview_mode_message">Text zprávy</string>
-    <string name="notification_preview_mode_contact">Jméno kontaktu</string>
-    <string name="notification_preview_mode_hidden">Skryté</string>
-    <string name="notification_preview_mode_message_desc">Zobrazit kontakt a zprávu</string>
-    <string name="notification_contact_connected">Připojeno</string>
-    <string name="la_notice_title_simplex_lock">SimpleX Zámek</string>
-    <string name="auth_log_in_using_credential">Přihlaste se pomocí svého pověření</string>
-    <string name="auth_enable_simplex_lock">Zapnutí zámku SimpleX</string>
-    <string name="reply_verb">Odpovězte na</string>
-    <string name="share_verb">Sdílet</string>
-    <string name="copy_verb">Kopírovat</string>
-    <string name="icon_descr_received_msg_status_unread">nepřečteno</string>
-    <string name="personal_welcome">Vítejte <xliff:g>%1$s</xliff:g>!</string>
-    <string name="welcome">Vítejte!</string>
-    <string name="this_text_is_available_in_settings">Tento text je k dispozici v nastavení</string>
-    <string name="icon_descr_sent_msg_status_send_failed">odeslání se nezdařilo</string>
-    <string name="share_file">Sdílet soubor…</string>
-    <string name="attach">Připojit</string>
-    <string name="icon_descr_context">Kontextová ikona</string>
-    <string name="image_decoding_exception_desc">Obrázek nelze dekódovat. Zkuste prosím použít jiný obrázek nebo kontaktujte vývojáře.</string>
-    <string name="image_descr">Obrázek</string>
-    <string name="icon_descr_waiting_for_image">Čekání na obrázek</string>
-    <string name="icon_descr_asked_to_receive">Požádáno o přijetí obrázku</string>
-    <string name="icon_descr_image_snd_complete">Obrázek odeslán</string>
-    <string name="waiting_for_image">Čekáme na obrázek</string>
-    <string name="image_will_be_received_when_contact_is_online">Obrázek bude přijat, až bude váš kontakt online, vyčkejte prosím nebo se podívejte později!</string>
-    <string name="contact_sent_large_file">Váš kontakt odeslal soubor, který je větší než aktuálně podporovaná maximální velikost (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
-    <string name="maximum_supported_file_size">V současné době je maximální podporovaná velikost souboru <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="error_saving_file">Chyba při ukládání souboru</string>
-    <string name="voice_message">Hlasová zpráva</string>
-    <string name="voice_message_send_text">Hlasová zpráva…</string>
-    <string name="icon_descr_server_status_connected">Připojeno</string>
-    <string name="icon_descr_server_status_disconnected">Odpojeno</string>
-    <string name="icon_descr_server_status_error">Chyba</string>
-    <string name="switch_receiving_address_desc">Tato funkce je experimentální! Bude fungovat pouze v případě, že druhý klient má nainstalovanou verzi 4.2. Po dokončení změny adresy by se měla v konverzaci zobrazit zpráva - zkontrolujte, zda můžete od tohoto kontaktu (nebo člena skupiny) stále přijímat zprávy.</string>
-    <string name="switch_receiving_address_question">Přepnout přijímací adresu\?</string>
-    <string name="send_verb">Poslat</string>
-    <string name="you_need_to_allow_to_send_voice">Abyste mohli odesílat hlasové zprávy, musíte svému kontaktu odesílání hlasových zpráv povolit.</string>
-    <string name="icon_descr_cancel_live_message">Zrušit živou zprávu</string>
-    <string name="back">Zpět</string>
-    <string name="cancel_verb">Zrušit</string>
-    <string name="reset_verb">Obnovit</string>
-    <string name="ok">OK</string>
-    <string name="no_details">bez podrobností</string>
-    <string name="add_contact">Jednorázový zvací odkaz</string>
-    <string name="copied">Zkopírováno do schránky</string>
-    <string name="add_contact_or_create_group">Začít novou konverzaci</string>
-    <string name="create_group">Vytvořit tajnou skupinu</string>
-    <string name="to_share_with_your_contact">(sdílet s kontaktem)</string>
-    <string name="only_stored_on_members_devices">(uloženo pouze členy skupiny)</string>
-    <string name="toast_permission_denied">Oprávnění zamítnuto!</string>
-    <string name="use_camera_button">Použít fotoaparát</string>
-    <string name="from_gallery_button">Z Galerie</string>
-    <string name="choose_file">Vybrat soubor</string>
-    <string name="to_start_a_new_chat_help_header">Pro zahájení nové konverzace</string>
-    <string name="chat_help_tap_button">Klepněte na tlačítko</string>
-    <string name="above_then_preposition_continuation">nad, potom:</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Přidat nový kontakt</b>: vytvořit jednorázový kód QR.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Skenovat QR kód</b>: připojení ke kontaktu, který vám ukáže QR kód.</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: scan displayed QR code from the app, via <b>Scan QR code</b>.</string>
-    <string name="clear_chat_question">Vyčistit chat\?</string>
-    <string name="clear_verb">Čistý</string>
-    <string name="mark_read">Označit jako přečteno</string>
-    <string name="mark_unread">Označit jako nepřečteno</string>
-    <string name="mute_chat">Ztlumit</string>
-    <string name="unmute_chat">Zrušit ztlumení</string>
-    <string name="you_invited_your_contact">Pozvali jste svůj kontakt</string>
-    <string name="contact_you_shared_link_with_wont_be_able_to_connect">Kontakt, se kterým jste tento odkaz sdíleli, se NEBUDE moci připojit!</string>
-    <string name="connection_you_accepted_will_be_cancelled">Připojení, které jste přijali, bude zrušeno!</string>
-    <string name="icon_descr_help">help</string>
-    <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> Tým</string>
-    <string name="icon_descr_address"><xliff:g id="appName">SimpleX</xliff:g> Adresa</string>
-    <string name="you_will_be_connected_when_group_host_device_is_online">Ke skupině budete připojeni, až bude zařízení hostitele skupiny online, vyčkejte prosím nebo se podívejte později!</string>
-    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Budete připojeni, jakmile bude vaše žádost o připojení přijata, vyčkejte prosím nebo se podívejte později!</string>
-    <string name="connection_request_sent">Požadavek na připojení byl odeslán!</string>
-    <string name="your_profile_will_be_sent">Váš profil v chatu bude odeslán vašemu kontaktu</string>
-    <string name="create_one_time_link">Vytvořit jednorázovou pozvánku</string>
-    <string name="one_time_link">Vytvořit jednorázový zvací odkaz</string>
-    <string name="security_code">Bezpečnostní kód</string>
-    <string name="is_verified">\"%s je ověřeno</string>
-    <string name="chat_console">Chat konzole</string>
-    <string name="smp_servers">SMP servery</string>
-    <string name="smp_servers_preset_address">Přednastavená adresa serveru</string>
-    <string name="smp_servers_test_failed">Test serveru se nezdařil!</string>
-    <string name="smp_servers_test_some_failed">Některé servery neprošly testem:</string>
-    <string name="smp_servers_scan_qr">Naskenujte QR kód serveru</string>
-    <string name="smp_servers_enter_manually">Zadejte server ručně</string>
-    <string name="smp_servers_invalid_address">Neplatná adresa serveru!</string>
-    <string name="smp_servers_check_address">Zkontrolujte adresu serveru a zkuste to znovu.</string>
-    <string name="smp_servers_delete_server">Smazat server</string>
-    <string name="contribute">Přispějte</string>
-    <string name="how_to">Jak na to</string>
-    <string name="how_to_use_your_servers">Jak používat servery</string>
-    <string name="your_ICE_servers">Vaše servery ICE</string>
-    <string name="configure_ICE_servers">Konfigurace serverů ICE</string>
-    <string name="network_settings_title">Nastavení sítě</string>
-    <string name="network_enable_socks">Použít proxy server SOCKS\?</string>
-    <string name="network_disable_socks">Použít přímé připojení k internetu\?</string>
-    <string name="network_use_onion_hosts_no">Ne</string>
-    <string name="network_use_onion_hosts_no_desc_in_alert">Onion hostitelé nebudou použiti.</string>
-    <string name="network_session_mode_user">Chat profil</string>
-    <string name="network_session_mode_entity">Připojení</string>
-    <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
-    <string name="create_address">Vytvořit adresu</string>
-    <string name="accept_automatically">Automaticky</string>
-    <string name="section_title_welcome_message">UVÍTACÍ ZPRÁVA</string>
-    <string name="save_and_notify_group_members">Uložit a upozornit členy skupiny</string>
-    <string name="exit_without_saving">Ukončit bez uložení</string>
-    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Platforma pro zasílání zpráv a aplikace chránící vaše soukromí a bezpečnost.</string>
-    <string name="create_profile">Vytvořit profil</string>
-    <string name="profile_is_only_shared_with_your_contacts">Profil je sdílen pouze s vašimi kontakty.</string>
-    <string name="display_name_cannot_contain_whitespace">Zobrazované jméno nesmí obsahovat prázdné znaky.</string>
-    <string name="bold">tučně</string>
-    <string name="callstatus_in_progress">probíhající hovor</string>
-    <string name="decentralized">Decentralizovaná</string>
-    <string name="how_it_works">Jak to funguje</string>
-    <string name="how_simplex_works">Jak funguje <xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Pouze klientská zařízení ukládají uživatelské profily, kontakty, skupiny a zprávy odesílané pomocí <b>2 vrstvého end-to-end šifrování</b>.</string>
-    <string name="onboarding_notifications_mode_title">Oznamování</string>
-    <string name="onboarding_notifications_mode_periodic">Pravidelné</string>
-    <string name="ignore">Ignorovat</string>
-    <string name="call_already_ended">Hovor již skončil!</string>
-    <string name="icon_descr_video_call">videohovor</string>
-    <string name="icon_descr_audio_call">audio hovor</string>
-    <string name="settings_audio_video_calls">Audio a video hovory</string>
-    <string name="call_on_lock_screen">Hovory na uzamčené obrazovce:</string>
-    <string name="open_simplex_chat_to_accept_call">Otevřete <xliff:g id="appNameFull">SimpleX Chat</xliff:g> pro přijetí hovoru</string>
-    <string name="allow_accepting_calls_from_lock_screen">Povolte volání ze zamčené obrazovky prostřednictvím Nastavení.</string>
-    <string name="open_verb">Otevřete stránku</string>
-    <string name="icon_descr_audio_on">Zvuk zapnut</string>
-    <string name="icon_descr_speaker_off">Reproduktor vypnut</string>
-    <string name="icon_descr_speaker_on">Reproduktor zapnut</string>
-    <string name="icon_descr_call_progress">Probíhající hovor</string>
-    <string name="auto_accept_images">Automaticky přijímat obrázky</string>
-    <string name="settings_section_title_settings">NASTAVENÍ</string>
-    <string name="settings_section_title_help">NÁPOVĚDA</string>
-    <string name="settings_section_title_device">ZAŘÍZENÍ</string>
-    <string name="settings_section_title_chats">CHAT</string>
-    <string name="settings_experimental_features">Experimentální funkce</string>
-    <string name="settings_section_title_socks">SOCKS PROXY</string>
-    <string name="settings_section_title_icon">IKONA APLIKACE</string>
-    <string name="settings_section_title_themes">TÉMATA</string>
-    <string name="settings_section_title_messages">ZPRÁVY</string>
-    <string name="settings_section_title_calls">VOLÁNÍ</string>
-    <string name="export_database">Export databáze</string>
-    <string name="import_database">Import databáze</string>
-    <string name="delete_database">Smazání databáze</string>
-    <string name="error_exporting_chat_database">Chyba při exportu chat databáze</string>
-    <string name="import_database_confirmation">Import</string>
-    <string name="restart_the_app_to_use_imported_chat_database">Restartujte aplikaci, abyste mohli používat importovanou chat databázi.</string>
-    <string name="delete_chat_profile_question">Smazat profil chatu\?</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Tuto akci nelze vzít zpět! Váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</string>
-    <string name="restart_the_app_to_create_a_new_chat_profile">Restartujte aplikaci a vytvořte nový chat profil.</string>
-    <string name="you_must_use_the_most_recent_version_of_database">Nejnovější verzi chat databáze musíte používat POUZE v jednom zařízení, jinak se může stát, že přestanete přijímat zprávy od některých kontaktů.</string>
-    <string name="stop_chat_to_enable_database_actions">Zastavte chat a povolte akce s databází.</string>
-    <string name="files_and_media_section">Soubory a média</string>
-    <string name="delete_files_and_media_question">Smazat soubory a média\?</string>
-    <string name="delete_messages">Odstranit zprávy</string>
-    <string name="remove_passphrase_from_keychain">Odstranit přístupovou frázi z úložiště klíčů\?</string>
-    <string name="notifications_will_be_hidden">Oznámení budou doručována pouze do doby, než se aplikace zastaví!</string>
-    <string name="remove_passphrase">Odstranit</string>
-    <string name="update_database">Aktualizovat</string>
-    <string name="current_passphrase">Aktuální přístupová fráze…</string>
-    <string name="update_database_passphrase">Aktualizovat přístupovou frázi databáze</string>
-    <string name="enter_correct_current_passphrase">Zadejte prosím správnou aktuální přístupovou frázi.</string>
-    <string name="database_is_not_encrypted">Váš chat databáze není šifrována - nastavte přístupovou frázi pro její ochranu.</string>
-    <string name="keychain_is_storing_securely">K bezpečnému uložení heslové fráze slouží úložiště klíčů Android - umožňuje fungování služby oznámení.</string>
-    <string name="impossible_to_recover_passphrase"><b>Upozornění</b>: pokud přístupovou frázi ztratíte, NEBUDE možné ji obnovit ani změnit.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">Databáze bude šifrována a přístupová fráze bude uložena v úložišti klíčů.</string>
-    <string name="store_passphrase_securely">Heslo uložte bezpečně, v případě jeho ztráty jej NEBUDE možné změnit.</string>
-    <string name="file_with_path">Soubor: %s</string>
-    <string name="database_passphrase_is_required">Pro otevření chatu je vyžadována přístupová fráze databáze.</string>
-    <string name="unknown_error">Neznámá chyba</string>
-    <string name="open_chat">Otevřete chat</string>
-    <string name="restore_database">Obnovte zálohu databáze</string>
-    <string name="restore_database_alert_desc">Po obnovení zálohy databáze zadejte předchozí heslo. Tuto akci nelze vrátit zpět.</string>
-    <string name="chat_is_stopped_indication">Chat je zastaven</string>
-    <string name="chat_archive_header">Chat se archivuje</string>
-    <string name="delete_chat_archive_question">Smazat chat archiv\?</string>
-    <string name="join_group_question">Připojit se ke skupině\?</string>
-    <string name="join_group_button">Připojte se na</string>
-    <string name="leave_group_button">Opustit</string>
-    <string name="icon_descr_add_members">Pozvat členy</string>
-    <string name="alert_title_no_group">Skupina nebyla nalezena!</string>
-    <string name="alert_title_cant_invite_contacts">Nelze pozvat kontakty!</string>
-    <string name="snd_group_event_changed_member_role">změnili jste roli %s na %s</string>
-    <string name="snd_group_event_changed_role_for_yourself">změnili jste svou roli na %s</string>
-    <string name="snd_group_event_member_deleted">odstranili jste <xliff:g id="profil člena" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="snd_group_event_user_left">odešli jste</string>
-    <string name="rcv_conn_event_switch_queue_phase_completed">změnila se vaše adresa</string>
-    <string name="icon_descr_expand_role">Rozšířit výběr rolí</string>
-    <string name="invite_prohibited">Nelze pozvat kontakt!</string>
-    <string name="failed_to_create_user_duplicate_desc">Již máte profil chatu se stejným názvem. Zvolte prosím jiné jméno.</string>
-    <string name="smp_server_test_create_queue">Vytvořit frontu</string>
-    <string name="smp_server_test_secure_queue">Zabezpečit frontu</string>
-    <string name="service_notifications">Okamžitá oznámení!</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>V nastavení ji lze vypnout</b> - oznámení se budou zobrazovat pokud aplikace běží.</string>
-    <string name="turn_off_battery_optimization">Chcete-li ji používat, <b>vypněte optimalizaci baterie</b> pro <xliff:g id="appName">SimpleX</xliff:g> v dalším dialogu. V opačném případě budou oznámení vypnuta.</string>
-    <string name="periodic_notifications_desc">Aplikace pravidelně načítá nové zprávy - denně spotřebuje několik procent baterie. Aplikace nepoužívá push oznámení - data ze zařízení nejsou odesílána na servery.</string>
-    <string name="enter_passphrase_notification_title">Je vyžadována přístupová fráze</string>
-    <string name="enter_passphrase_notification_desc">Chcete-li dostávat oznámení, zadejte přístupovou frázi do databáze.</string>
-    <string name="database_initialization_error_title">Nelze načíst databázi</string>
-    <string name="hide_notification">Skrýt</string>
-    <string name="ntf_channel_calls">Volání SimpleX Chat</string>
-    <string name="notification_preview_new_message">nová zpráva</string>
-    <string name="notification_new_contact_request">Žádost o nový kontakt</string>
-    <string name="delete_message_cannot_be_undone_warning">Zpráva bude smazána - nelze to vzít zpět!</string>
-    <string name="confirm_verb">Potvrdit</string>
-    <string name="send_us_an_email">Pošlete nám e-mail</string>
-    <string name="chat_lock">Zámek SimpleX</string>
-    <string name="install_simplex_chat_for_terminal">Instalovat <xliff:g id="appNameFull">SimpleX Chat</xliff:g> terminál</string>
-    <string name="star_on_github">Hvězdu na GitHubu</string>
-    <string name="rate_the_app">Ohodnoťte aplikaci</string>
-    <string name="your_SMP_servers">Vaše servery SMP</string>
-    <string name="network_disable_socks_info">Pokud potvrdíte, budou servery zasílající zprávy vidět vaši IP adresu a váš poskytovatel - ke kterým serverům se připojujete.</string>
-    <string name="colored">barevné</string>
-    <string name="secret">tajné</string>
-    <string name="callstatus_calling">volání…</string>
-    <string name="callstate_connected">připojen</string>
-    <string name="callstate_ended">ukončen</string>
-    <string name="next_generation_of_private_messaging">Příští generace soukromé komunikace</string>
-    <string name="people_can_connect_only_via_links_you_share">Lidé se s vámi mohou spojit pouze prostřednictvím odkazu, který sdílíte.</string>
-    <string name="integrity_msg_bad_hash">špatný kontrolní součet zprávy</string>
-    <string name="chat_database_imported">Chat databáze importována</string>
-    <string name="new_passphrase">Nová přístupová fráze…</string>
-    <string name="save_passphrase_and_open_chat">Uložte heslo a otevřete chat</string>
-    <string name="chat_archive_section">CHAT ARCHIV</string>
-    <string name="no_contacts_selected">Nebyl vybrán žádný kontakt</string>
-    <string name="invite_prohibited_description">Snažíte se pozvat kontakt se kterým jste sdíleli inkognito profil, do skupiny ve které používáte svůj hlavní profil</string>
-    <string name="info_row_group">Skupina</string>
-    <string name="network_options_revert">Vrátit</string>
-    <string name="updating_settings_will_reconnect_client_to_all_servers">Aktualizací nastavení se klient znovu připojí ke všem serverům.</string>
-    <string name="accept_feature_set_1_day">Nastavit 1 den</string>
-    <string name="connection_error_auth">Chyba spojení (AUTH)</string>
-    <string name="sender_may_have_deleted_the_connection_request">Odesílatel možná smazal požadavek připojení</string>
-    <string name="error_smp_test_server_auth">Server vyžaduje autorizaci pro vytváření front, zkontrolujte heslo</string>
-    <string name="smp_server_test_delete_queue">Odstranit frontu</string>
-    <string name="delete_group_menu_action">Smazat</string>
-    <string name="delete_pending_connection__question">Smazat čekající připojení\?</string>
-    <string name="icon_descr_settings">Nastavení</string>
-    <string name="image_descr_qr_code">QR kód</string>
-    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Váš kontakt může z aplikace naskenovat QR kód.</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Pokud se nemůžete setkat osobně, ukažte ve <b>videohovoru QR kód</b> nebo sdílejte odkaz.</string>
-    <string name="scan_code">Skenovat kód</string>
-    <string name="incorrect_code">Nesprávný bezpečnostní kód!</string>
-    <string name="scan_code_from_contacts_app">Naskenujte bezpečnostní kód z aplikace vašeho kontaktu.</string>
-    <string name="mark_code_verified">Označit jako ověřený</string>
-    <string name="clear_verification">Zrušte ověření</string>
-    <string name="to_verify_compare">Chcete-li ověřit koncové šifrování u svého kontaktu, porovnejte (nebo naskenujte) kód na svých zařízeních.</string>
-    <string name="your_settings">Vaše nastavení</string>
-    <string name="your_simplex_contact_address">Vaše <xliff:g id="appName">SimpleX</xliff:g> adresa</string>
-    <string name="database_passphrase_and_export">Heslo databáze a export</string>
-    <string name="your_chat_profiles">Vaše chat profily</string>
-    <string name="chat_with_the_founder">Zaslat otázky a nápady</string>
-    <string name="smp_servers_test_server">Test serveru</string>
-    <string name="enter_one_ICE_server_per_line">Servery ICE (jeden na řádek)</string>
-    <string name="network_use_onion_hosts_required_desc">Pro připojení budou vyžadováni Onion hostitelé.</string>
-    <string name="update_network_session_mode_question">Aktualizovat režim izolace\?</string>
-    <string name="app_version_code">Sestavení aplikace: %s</string>
-    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Můžete sdílet svou adresu jako odkaz nebo jako QR kód - kdokoli se k vám bude moci připojit. O své kontakty nepřijdete, pokud ji později smažete.</string>
-    <string name="share_link">Sdílet odkaz</string>
-    <string name="delete_address">Smazat adresu</string>
-    <string name="full_name__field">Celé jméno:</string>
-    <string name="your_current_profile">Váš současný profil</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Pro zachování vašeho soukromí používá aplikace místo push oznámení <b><xliff:g id="appName">SimpleX</xliff:g> službu na pozadí</b> - denně využije několik procent baterie.</string>
-    <string name="periodic_notifications">Pravidelná oznámení</string>
-    <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> služba</string>
-    <string name="simplex_service_notification_text">Příjem zpráv…</string>
-    <string name="ntf_channel_messages">Zprávy SimpleX Chat</string>
-    <string name="settings_notification_preview_mode_title">Zobrazení náhledu</string>
-    <string name="settings_notification_preview_title">Náhled oznámení</string>
-    <string name="notifications_mode_off">Spustí se při otevření aplikace</string>
-    <string name="notifications_mode_periodic">Spouští se pravidelně</string>
-    <string name="notifications_mode_service">Vždy zapnuto</string>
-    <string name="notifications_mode_periodic_desc">Každých 10 minut kontroluje nové zprávy, po dobu až 1 minuty</string>
-    <string name="notification_preview_mode_contact_desc">Zobrazit pouze kontakt</string>
-    <string name="notification_preview_somebody">Skrytý kontakt:</string>
-    <string name="la_notice_turn_on">Zapněte funkci</string>
-    <string name="auth_simplex_lock_turned_on">Zapnutý zámek SimpleX Lock</string>
-    <string name="auth_unlock">Odemknutí stránky</string>
-    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Ověřování zařízení není povoleno. Jakmile povolíte ověřování zařízení, můžete zámek SimpleX Lock zapnout prostřednictvím Nastavení.</string>
-    <string name="auth_device_authentication_is_disabled_turning_off">Ověřování zařízení je zakázáno. Zámek SimpleX je vypnut.</string>
-    <string name="edit_verb">Upravit</string>
-    <string name="delete_verb">Smazat</string>
-    <string name="for_everybody">Pro všechny</string>
-    <string name="icon_descr_sent_msg_status_sent">odesláno</string>
-    <string name="contact_connection_pending">připojování…</string>
-    <string name="images_limit_desc">Současně lze odeslat pouze 10 obrázků</string>
-    <string name="image_decoding_exception_title">Chyba dekódování</string>
-    <string name="image_saved">Obrázek uložen do galerie</string>
-    <string name="icon_descr_file">Soubor</string>
-    <string name="large_file">Velký soubor!</string>
-    <string name="file_will_be_received_when_contact_is_online">Soubor bude přijat, až bude váš kontakt online, vyčkejte prosím, nebo se podívejte později!</string>
-    <string name="file_saved">Soubor uložen</string>
-    <string name="file_not_found">Soubor nenalezen</string>
-    <string name="voice_message_with_duration">Hlasová zpráva (<xliff:g id="duration">%1$s</xliff:g>)</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Kontakt a všechny zprávy budou smazány - nelze to vzít zpět!</string>
-    <string name="button_delete_contact">Smazat kontakt</string>
-    <string name="text_field_set_contact_placeholder">Nastavení jména kontaktu…</string>
-    <string name="view_security_code">Zobrazení bezpečnostního kódu</string>
-    <string name="icon_descr_record_voice_message">Nahrát hlasovou zprávu</string>
-    <string name="voice_messages_prohibited">Hlasové zprávy jsou zakázány!</string>
-    <string name="ask_your_contact_to_enable_voice">Prosím, požádejte kontaktní osobu, aby umožnila odesílání hlasových zpráv.</string>
-    <string name="send_live_message_desc">Poslat živou zprávu - zpráva se bude aktualizovat pro příjemce během psaní.</string>
-    <string name="share_one_time_link">Vytvořit jednorázovou pozvánku</string>
-    <string name="scan_QR_code">Skenovat QR kód</string>
-    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">( skenovat nebo vložit ze schránky)</string>
-    <string name="edit_image">Upravit obrázek</string>
-    <string name="delete_image">Smazat obrázek</string>
-    <string name="callstatus_error">chyba volání</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">Protokol a kód s otevřeným zdrojovým kódem - servery může provozovat kdokoli.</string>
-    <string name="create_your_profile">Vytvořte si svůj profil</string>
-    <string name="make_private_connection">Vytvořte si soukromé připojení</string>
-    <string name="encrypted_video_call">Videohovor šifrovaný e2e</string>
-    <string name="encrypted_audio_call">e2e šifrovaný audio hovor</string>
-    <string name="status_contact_has_e2e_encryption">kontakt má šifrování e2e</string>
-    <string name="status_contact_has_no_e2e_encryption">kontakt nemá šifrování e2e</string>
-    <string name="call_connection_peer_to_peer">peer-to-peer</string>
-    <string name="call_connection_via_relay">přes relay</string>
-    <string name="icon_descr_hang_up">Zavěsit</string>
-    <string name="icon_descr_video_off">Video vypnuto</string>
-    <string name="icon_descr_video_on">Video zapnuto</string>
-    <string name="icon_descr_audio_off">Zvuk vypnutý</string>
-    <string name="integrity_msg_bad_id">špatné ID zprávy</string>
-    <string name="integrity_msg_duplicate">duplicitní zpráva</string>
-    <string name="alert_title_skipped_messages">Přeskočené zprávy</string>
-    <string name="privacy_and_security">Ochrana osobních údajů a zabezpečení</string>
-    <string name="your_privacy">Vaše soukromí</string>
-    <string name="protect_app_screen">Ochrana obrazovky aplikace</string>
-    <string name="send_link_previews">Odesílání náhledů odkazů</string>
-    <string name="full_backup">Zálohování dat aplikace</string>
-    <string name="confirm_new_passphrase">Potvrdit novou frázi…</string>
-    <string name="error_with_info">Chyba: %s</string>
-    <string name="leave_group_question">Opustit skupinu\?</string>
-    <string name="icon_descr_group_inactive">Skupina je neaktivní</string>
-    <string name="rcv_group_event_member_left">Opustit</string>
-    <string name="clear_contacts_selection_button">Vymazat</string>
-    <string name="switch_verb">Přepnout</string>
-    <string name="member_role_will_be_changed_with_notification">Role bude změněna na \"%s\". Všichni ve skupině budou informováni.</string>
-    <string name="error_removing_member">Chyba odebírání člena</string>
-    <string name="error_saving_group_profile">Chyba ukládání profilu skupiny</string>
-    <string name="network_option_seconds_label">vteřin</string>
-    <string name="incognito_info_allows">Umožňuje mít v jednom chat profilu mnoho anonymních spojení bez sdílení údajů mezi nimi.</string>
-    <string name="incognito_info_share">Pokud s někým sdílíte inkognito profil, bude použit pro skupiny, do kterých vás pozve.</string>
-    <string name="theme_system">Systém</string>
-    <string name="voice_messages">Hlasové zprávy</string>
-    <string name="both_you_and_your_contacts_can_delete">Vy i váš kontakt můžete nevratně mazat odeslané zprávy.</string>
-    <string name="ttl_m">\"%dm</string>
-    <string name="ttl_mth">\"%dmth</string>
-    <string name="ttl_hours">\"%d hodin</string>
-    <string name="ttl_h">\"%dh</string>
-    <string name="ttl_d">\"%dd</string>
-    <string name="v4_2_security_assessment">Posouzení bezpečnosti</string>
-    <string name="v4_2_security_assessment_desc">Bezpečnost SimpleX Chat byla prověřena společností Trail of Bits.</string>
-    <string name="v4_3_irreversible_message_deletion">Nevratné mazání zpráv</string>
-    <string name="v4_3_improved_server_configuration">Vylepšena konfigurace serveru</string>
-    <string name="v4_3_improved_privacy_and_security">Vylepšena ochrana soukromí a zabezpečení</string>
-    <string name="v4_3_improved_privacy_and_security_desc">Skryta obrazovka aplikace v posledních aplikacích.</string>
-    <string name="v4_4_disappearing_messages_desc">Odeslané zprávy se po uplynutí nastavené doby odstraní.</string>
-    <string name="v4_4_live_messages">Živé zprávy</string>
-    <string name="v4_4_live_messages_desc">Příjemci uvidí aktualizaci během psaní.</string>
-    <string name="v4_4_verify_connection_security">Ověření zabezpečení připojení</string>
-    <string name="v4_4_french_interface">Francouzské rozhraní</string>
-    <string name="v4_4_french_interface_descr">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
-    <string name="v4_5_multiple_chat_profiles">Více chat profilů</string>
-    <string name="v4_5_multiple_chat_profiles_descr">Různá jména, avataři a izolace přenosu.</string>
-    <string name="v4_5_message_draft">Návrh zpráv</string>
-    <string name="v4_5_message_draft_descr">Zachování posledního návrhu zprávy s přílohami.</string>
-    <string name="v4_5_transport_isolation">Izolace přenosu</string>
-    <string name="v4_5_transport_isolation_descr">Podle chat profilu (výchozí) nebo podle připojení (BETA).</string>
-    <string name="you_will_join_group">Připojíte se ke skupině, na kterou odkazuje tento odkaz, a spojíte se s jejími členy.</string>
-    <string name="connect_via_link_verb">Připojení</string>
-    <string name="connected_to_server_to_receive_messages_from_contact">Jste připojeni k serveru, který se používá k přijímání zpráv od tohoto kontaktu.</string>
-    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Pokoušíte se připojit k serveru používaném pro příjem zpráv od tohoto kontaktu (chyba: <xliff:g id="errorMsg">%1$s</xliff:g>).</string>
-    <string name="marked_deleted_description">označit jako smazáno</string>
-    <string name="sending_files_not_yet_supported">Odesílání souborů zatím není podporováno</string>
-    <string name="receiving_files_not_yet_supported">Přijímání souborů zatím není podporováno</string>
-    <string name="sender_you_pronoun">ty</string>
-    <string name="unknown_message_format">neznámý formát zprávy</string>
-    <string name="invalid_message_format">neplatný formát zprávy</string>
-    <string name="live">ŽIVĚ</string>
-    <string name="description_via_group_link_incognito">inkognito přes skupinový odkaz</string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">Ujistěte se, že adresy serverů SMP jsou ve správném formátu, oddělené na řádcích a nejsou duplicitní.</string>
-    <string name="failed_to_create_user_title">Chyba při vytváření profilu!</string>
-    <string name="failed_to_create_user_duplicate_title">Duplicitní zobrazované jméno!</string>
-    <string name="failed_to_active_user_title">Chyba při přepínání profilu!</string>
-    <string name="error_joining_group">Chyba při připojování ke skupině</string>
-    <string name="cannot_receive_file">Nelze přijmout soubor</string>
-    <string name="sender_cancelled_file_transfer">Odesílatel zrušil přenos souboru.</string>
-    <string name="error_receiving_file">Chyba příjmu souboru</string>
-    <string name="error_creating_address">Chyba vytváření adresy</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Zkontrolujte, zda jste použili správný odkaz, nebo požádejte kontakt, aby vám poslal jiný.</string>
-    <string name="connection_error_auth_desc">Pokud váš kontakt spojení nesmazal a tento odkaz ještě nebyl použit, může se jednat o chybu - nahlaste ji prosím. Chcete-li se připojit, požádejte prosím svůj kontakt o vytvoření jiného odkazu pro připojení a zkontrolujte, zda máte stabilní připojení k síti.</string>
-    <string name="error_deleting_contact">Chyba mazání kontaktu</string>
-    <string name="error_deleting_group">Chyba mazání skupiny</string>
-    <string name="error_deleting_contact_request">Chyba mazání žádosti kontaktu</string>
-    <string name="error_deleting_pending_contact_connection">Chyba mazání probíhajícího připojení kontaktu</string>
-    <string name="error_smp_test_failed_at_step">Test selhal v kroku %s.</string>
-    <string name="error_smp_test_certificate">Je možné, že otisk certifikátu v adrese serveru je nesprávný.</string>
-    <string name="smp_server_test_connect">Připojit</string>
-    <string name="smp_server_test_disconnect">Odpojit</string>
-    <string name="error_deleting_user">Chyba mazání uživatelského profilu</string>
-    <string name="icon_descr_instant_notifications">Okamžitá oznámení</string>
-    <string name="service_notifications_disabled">Okamžitá oznámení jsou vypnutá!</string>
-    <string name="turning_off_service_and_periodic">Je aktivní optimalizace baterie, která vypíná službu na pozadí a pravidelné požadavky na nové zprávy. Můžete ji znovu povolit prostřednictvím nastavení.</string>
-    <string name="periodic_notifications_disabled">Pravidelná oznámení jsou vypnuta!</string>
-    <string name="database_initialization_error_desc">Databáze nefunguje správně. Klepnutím se dozvíte více</string>
-    <string name="notifications_mode_off_desc">Aplikace může přijímat oznámení pouze při svém běhu, žádná služba na pozadí nebude spuštěna</string>
-    <string name="notification_display_mode_hidden_desc">Skrýt kontakt a zprávu</string>
-    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Chcete-li chránit své informace, zapněte zámek SimpleX Lock. Před zapnutím této funkce budete vyzváni k dokončení ověření.</string>
-    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Při spuštění nebo obnovení aplikace po 30 sekundách na pozadí budete vyzváni k ověření.</string>
-    <string name="auth_disable_simplex_lock">Vypnout zámek SimpleX</string>
-    <string name="auth_confirm_credential">Potvrďte své pověření</string>
-    <string name="auth_unavailable">Ověřování není k dispozici</string>
-    <string name="auth_stop_chat">Zastavit chat</string>
-    <string name="auth_open_chat_console">Otevřete chat konzoli</string>
-    <string name="message_delivery_error_title">Chyba doručení zprávy</string>
-    <string name="message_delivery_error_desc">Tento kontakt s největší pravděpodobností smazal spojení s vámi.</string>
-    <string name="save_verb">Uložit</string>
-    <string name="reveal_verb">Odhalit</string>
-    <string name="hide_verb">Skrýt</string>
-    <string name="delete_message__question">Smazat zprávu\?</string>
-    <string name="delete_message_mark_deleted_warning">Zpráva bude označena ke smazání. Příjemce (příjemci) bude moci tuto zprávu odhalit.</string>
-    <string name="for_me_only">Smazat pro mě</string>
-    <string name="icon_descr_edited">upraveno</string>
-    <string name="icon_descr_sent_msg_status_unauthorized_send">neautorizované odeslání</string>
-    <string name="group_preview_you_are_invited">jste pozváni do skupiny</string>
-    <string name="group_preview_join_as">připojit jako %s</string>
-    <string name="group_connection_pending">připojuje se…</string>
-    <string name="tap_to_start_new_chat">Začněte nový chat</string>
-    <string name="chat_with_developers">Chat s vývojáři</string>
-    <string name="you_have_no_chats">Nemáte žádné konverzace</string>
-    <string name="icon_descr_cancel_image_preview">Zrušit náhled obrázku</string>
-    <string name="share_message">Sdílet zprávu…</string>
-    <string name="share_image">Sdílet obrázek…</string>
-    <string name="icon_descr_cancel_file_preview">Zrušit náhled souboru</string>
-    <string name="images_limit_title">Příliš mnoho obrázků!</string>
-    <string name="waiting_for_file">Čekání na soubor</string>
-    <string name="notifications">Oznámení</string>
-    <string name="delete_contact_question">Smazat kontakt\?</string>
-    <string name="icon_descr_server_status_pending">Čeká na vyřízení</string>
-    <string name="verify_security_code">Ověřit bezpečnostní kód</string>
-    <string name="icon_descr_send_message">Odeslat zprávu</string>
-    <string name="only_group_owners_can_enable_voice">Pouze majitelé skupin mohou povolit zasílání hlasových zpráv.</string>
-    <string name="send_live_message">Odeslat živou zprávu</string>
-    <string name="live_message">Živé zprávy!</string>
-    <string name="connect_via_link_or_qr">Připojit se prostřednictvím odkazu / QR kódu</string>
-    <string name="thank_you_for_installing_simplex">Děkujeme za instalaci <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
-    <string name="you_can_connect_to_simplex_chat_founder">Můžete se <font color="#0088ff">připojit k <xliff:g id="appNameFull">SimpleX Chat</xliff:g> vývojářům a položit jim případné dotazy a získat aktualizace</font>.</string>
-    <string name="to_connect_via_link_title">Připojení prostřednictvím odkazu</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Pokud jste dostali <xliff:g id="appName">SimpleX Chat</xliff:g> zvací odkaz, Můžete ho otevřít v prohlížeči:</string>
-    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Pokud zvolíte odmítnutí, odesílatel NEBUDE upozorněn.</string>
-    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 mobilní telefon: tap <b>Otevřete v mobilní aplikaci</b>, potom klikněte <b>Připojit</b>.</string>
-    <string name="reject_contact_button">Odmítnout</string>
-    <string name="clear_chat_button">Smazat chat</string>
-    <string name="clear_chat_menu_action">Čistý</string>
-    <string name="delete_contact_menu_action">Smazat</string>
-    <string name="set_contact_name">Nastavit jméno kontaktu</string>
-    <string name="you_accepted_connection">Přijali jste spojení</string>
-    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Aby se připojení dokončilo, musí být váš kontakt online. Toto připojení můžete zrušit a kontakt odebrat (a zkusit to později s novým odkazem).</string>
-    <string name="contact_wants_to_connect_with_you">Chce se s vámi spojit!</string>
-    <string name="icon_descr_profile_image_placeholder">Zástupce profilového obrázku</string>
-    <string name="image_descr_profile_image">profilový obrázek</string>
-    <string name="icon_descr_close_button">Tlačítko Zavřít</string>
-    <string name="alert_title_contact_connection_pending">Kontakt ještě není připojen!</string>
-    <string name="image_descr_link_preview">náhledový obrázek odkazu</string>
-    <string name="icon_descr_cancel_link_preview">Zrušit náhled odkazu</string>
-    <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> Logo</string>
-    <string name="icon_descr_email">E-mail</string>
-    <string name="icon_descr_more_button">Více na</string>
-    <string name="show_QR_code">Zobrazit QR kód</string>
-    <string name="invalid_QR_code">Neplatný QR kód</string>
-    <string name="this_QR_code_is_not_a_link">Tento QR kód není odkaz!</string>
-    <string name="invalid_contact_link">Neplatný odkaz!</string>
-    <string name="this_link_is_not_a_valid_connection_link">Tento odkaz není platným odkazem pro připojení!</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Pokud se nemůžete setkat osobně, můžete <b>skenovat QR kód ve videohovoru</b> nebo může váš kontakt sdílet pozvánku.</string>
-    <string name="connect_via_link">Připojte se prostřednictvím odkazu</string>
-    <string name="connect_button">Připojit</string>
-    <string name="paste_button">Vložit</string>
-    <string name="this_string_is_not_a_connection_link">Tento řetězec není odkazem na připojení!</string>
-    <string name="you_can_also_connect_by_clicking_the_link">Můžete se také připojit kliknutím na odkaz. Pokud se otevře v prohlížeči, klikněte na tlačítko <b>Otevřít v mobilní aplikaci</b>.</string>
-    <string name="is_not_verified">\"%s není ověřeno</string>
-    <string name="how_to_use_simplex_chat">Návod k použití</string>
-    <string name="markdown_help">Nápověda k markdown</string>
-    <string name="smp_servers_save">Uložit servery</string>
-    <string name="markdown_in_messages">Markdown ve zprávách</string>
-    <string name="smp_servers_test_servers">Testovat servery</string>
-    <string name="smp_servers_preset_server">Přednastavený server</string>
-    <string name="smp_servers_your_server">Váš server</string>
-    <string name="smp_servers_your_server_address">Adresa vašeho serveru</string>
-    <string name="smp_servers_use_server">Použít server</string>
-    <string name="smp_servers_use_server_for_new_conn">Použít pro nová připojení</string>
-    <string name="smp_servers_per_user">Servery pro nová připojení vašeho aktuálního chat profilu.</string>
-    <string name="use_simplex_chat_servers__question">Použít <xliff:g id="appNameFull">SimpleX Chat</xliff:g> servery\?</string>
-    <string name="using_simplex_chat_servers">Použití <xliff:g id="appNameFull">SimpleX Chat</xliff:g> serverů.</string>
-    <string name="saved_ICE_servers_will_be_removed">Uložené servery WebRTC ICE budou odstraněny.</string>
-    <string name="error_saving_ICE_servers">Chyba při ukládání serverů ICE</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Ujistěte se, že adresy serverů WebRTC ICE jsou ve správném formátu, oddělené na řádcích a nejsou duplicitní.</string>
-    <string name="save_servers_button">Uložit</string>
-    <string name="network_and_servers">Síť a servery</string>
-    <string name="network_socks_toggle">Použít proxy server SOCKS (port 9050)</string>
-    <string name="update_onion_hosts_settings_question">Aktualizovat nastavení hostitelů .onion\?</string>
-    <string name="network_use_onion_hosts">Použít hostitele .onion</string>
-    <string name="network_use_onion_hosts_prefer">Pokud je k dispozici</string>
-    <string name="network_use_onion_hosts_required">Povinné</string>
-    <string name="network_use_onion_hosts_prefer_desc">Onion hostitelé budou použiti, pokud jsou k dispozici.</string>
-    <string name="network_use_onion_hosts_no_desc">Onion hostitelé nebudou použiti.</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">Onion hostitelé budou použiti, pokud jsou k dispozici.</string>
-    <string name="network_use_onion_hosts_required_desc_in_alert">Pro připojení budou vyžadováni Onion hostitelé.</string>
-    <string name="network_session_mode_transport_isolation">Izolace přenosu</string>
-    <string name="network_session_mode_user_description">A separate TCP connection (and SOCKS credential) will be used <b>for each chat profile you have in the app</b>.</string>
-    <string name="network_session_mode_entity_description">Oddělit TCP připojení (a SOCKS pověření) bude použito <b>pro všechny kontakty a členy skupin</b>. <b>Upozornění</b>: Pokud máte mnoho připojení, může být spotřeba baterie a provoz podstatně vyšší a některá připojení mohou selhat.</string>
-    <string name="appearance_settings">Vzhled</string>
-    <string name="app_version_title">Verze aplikace</string>
-    <string name="app_version_name">Verze aplikace: v%s</string>
-    <string name="core_version">Verze jádra: v%s</string>
-    <string name="core_build_timestamp">Jádro sestaveno na: %s</string>
-    <string name="delete_address__question">Smazat adresu\?</string>
-    <string name="all_your_contacts_will_remain_connected">Všechny vaše kontakty zůstanou připojeny.</string>
-    <string name="contact_requests">Žádosti o kontakt</string>
-    <string name="display_name__field">Zobrazované jméno:</string>
-    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Váš profil je uložen v zařízení a je sdílen pouze s vašimi kontakty.
-\n
-\n<xliff:g id="appName">SimpleX</xliff:g> servery váš profil vidět nemohou.</string>
-    <string name="save_preferences_question">Uložit předvolby\?</string>
-    <string name="save_and_notify_contact">Uložit a upozornit kontakt</string>
-    <string name="save_and_notify_contacts">Uložit a upozornit kontakty</string>
-    <string name="you_control_your_chat">Kontrolujete chat!</string>
-    <string name="we_do_not_store_contacts_or_messages_on_servers">Na serverech neukládáme žádné vaše kontakty ani zprávy (po doručení).</string>
-    <string name="your_profile_is_stored_on_your_device">Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.</string>
-    <string name="display_name">Zobrazované jméno</string>
-    <string name="full_name_optional__prompt">Celé jméno (volitelné)</string>
-    <string name="create_profile_button">Vytvořit</string>
-    <string name="how_to_use_markdown">Jak používat markdown</string>
-    <string name="you_can_use_markdown_to_format_messages__prompt">K formátování zpráv můžete použít markdown:</string>
-    <string name="italic">kurzíva</string>
-    <string name="strikethrough">přeškrtnout</string>
-    <string name="callstatus_missed">zmeškané volání</string>
-    <string name="callstatus_rejected">odmítnutý hovor</string>
-    <string name="callstatus_connecting">spojovací hovor…</string>
-    <string name="callstatus_ended">hovor ukončen <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-    <string name="callstate_starting">začíná…</string>
-    <string name="callstate_waiting_for_answer">čeká na odpověď…</string>
-    <string name="callstate_waiting_for_confirmation">čekání na potvrzení…</string>
-    <string name="callstate_received_answer">obdržel odpověď…</string>
-    <string name="callstate_received_confirmation">obdržel potvrzení…</string>
-    <string name="callstate_connecting">připojení…</string>
-    <string name="privacy_redefined">Nové vymezení soukromí</string>
-    <string name="first_platform_without_user_ids">1. Platforma bez identifikátoru uživatelů - soukromá od základu.</string>
-    <string name="immune_to_spam_and_abuse">Odolná vůči spamu a zneužití</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">K ochraně soukromí, místo uživatelských ID užívaných všemi ostatními platformami, <xliff:g id="appName">SimpleX</xliff:g> používá identifikátory pro fronty zpráv, zvlášť pro každý z vašich kontaktů.</string>
-    <string name="many_people_asked_how_can_it_deliver">Mnoho lidí se ptá: <i>když <xliff:g id="appName">SimpleX</xliff:g> nemá žádný identifikátor uživatelů, jak může doručovat zprávy\?</i></string>
-    <string name="you_control_servers_to_receive_your_contacts_to_send">Vy kontrolujete přez který server <b>přijímáte</b> zprávy a kontakty i server které používáte pro odchozí komunikaci.</string>
-    <string name="read_more_in_github">Další informace najdete v našem repozitáři na GitHubu.</string>
-    <string name="read_more_in_github_with_link">Další informace najdete v našem <font color="#0088ff">úložišti GitHub</font>.</string>
-    <string name="use_chat">Konverzovat</string>
-    <string name="onboarding_notifications_mode_subtitle">Lze změnit později v nastavení.</string>
-    <string name="onboarding_notifications_mode_off">Když aplikace běží</string>
-    <string name="onboarding_notifications_mode_service">Okamžité</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Nejlepší pro baterii</b>. Budete přijímat oznámení pouze když aplikace běží, služba na pozadí NEBUDE použita.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Dobré pro baterii</b>. Služba na pozadí bude kontrolovat nové zprávy každých 10 minut. Můžete zmeškat hovory a naléhavé zprávy.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Využívá více baterie</b>! Služba na pozadí je vždy spuštěna - oznámení se zobrazí, jakmile jsou zprávy k dispozici.</string>
-    <string name="paste_the_link_you_received">Vložení přijatého odkazu</string>
-    <string name="incoming_video_call">Příchozí videohovor</string>
-    <string name="incoming_audio_call">Příchozí zvukový hovor</string>
-    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> se s vámi chce spojit prostřednictvím</string>
-    <string name="video_call_no_encryption">videohovoru (nešifrovaného e2e).</string>
-    <string name="audio_call_no_encryption">hovoru (nešifrovaného e2e)</string>
-    <string name="reject">Odmítnout</string>
-    <string name="your_calls">Vaše hovory</string>
-    <string name="connect_calls_via_relay">Spojení přes relay</string>
-    <string name="show_call_on_lock_screen">Zobrazit</string>
-    <string name="no_call_on_lock_screen">Zakázat</string>
-    <string name="your_ice_servers">Vaše servery ICE</string>
-    <string name="webrtc_ice_servers">WebRTC servery ICE</string>
-    <string name="status_no_e2e_encryption">bez šifrování e2e</string>
-    <string name="icon_descr_flip_camera">Otočit foťák</string>
-    <string name="icon_descr_call_pending_sent">Probíhající hovor</string>
-    <string name="icon_descr_call_missed">Zmeškaný hovor</string>
-    <string name="icon_descr_call_rejected">Odmítnutý hovor</string>
-    <string name="icon_descr_call_connecting">Spojování hovoru</string>
-    <string name="icon_descr_call_ended">Ukončený hovor</string>
-    <string name="answer_call">Přijmout hovor</string>
-    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> přeskočená zpráva (zprávy)</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">Může se to stát, když: 1. Zprávy na serveru vyprší, pokud nebyly přijaty po dobu 30 dnů, 2. Server, který používáte pro příjem zpráv od tohoto kontaktu, byl aktualizován a restartován. 3. Spojení je narušeno. Připojte se k vývojářům prostřednictvím Nastavení, abyste mohli dostávat aktualizace o serverech. Budeme přidávat redundantní servery, abychom zabránili ztrátě zpráv.</string>
-    <string name="settings_section_title_you">VY</string>
-    <string name="settings_section_title_support">PODPOŘIT SIMPLEX CHAT</string>
-    <string name="settings_section_title_develop">VÝVOJ</string>
-    <string name="settings_developer_tools">Nástroje pro vývojáře</string>
-    <string name="settings_section_title_incognito">Inkognito mód</string>
-    <string name="your_chat_database">Vaše chat databáze</string>
-    <string name="run_chat_section">SPUSTIT CHAT</string>
-    <string name="chat_is_running">Chat je spuštěn</string>
-    <string name="chat_is_stopped">Chat je zastaven</string>
-    <string name="chat_database_section">CHAT DATABÁZE</string>
-    <string name="database_passphrase">Heslo databáze</string>
-    <string name="new_database_archive">Archiv nové databáze</string>
-    <string name="old_database_archive">Archiv staré databáze</string>
-    <string name="error_starting_chat">Chyba při spuštění chatu</string>
-    <string name="stop_chat_question">Zastavit chat\?</string>
-    <string name="stop_chat_to_export_import_or_delete_chat_database">Zastavte chat pro export, import nebo smazání chat databáze. Během zastavení, nebudete moci přijímat ani odesílat zprávy.</string>
-    <string name="stop_chat_confirmation">Zastavit</string>
-    <string name="set_password_to_export">Nastavení přístupové fráze pro export</string>
-    <string name="set_password_to_export_desc">Databáze je šifrována pomocí náhodné přístupové fráze. Před exportem ji změňte.</string>
-    <string name="error_stopping_chat">Chyba při zastavení chatu</string>
-    <string name="import_database_question">Importovat chat databázi\?</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Vaše aktuální chat databáze bude SMAZÁNA a NAHRAZENA importovanou databází.
-\nTuto akci nelze vzít zpět - váš profily, kontakty, zprávy a soubory budou nenávratně ztraceny.</string>
-    <string name="error_deleting_database">Chyba mazání chat databáze</string>
-    <string name="error_importing_database">Chyba importu chat databáze</string>
-    <string name="chat_database_deleted">Chat databáze odstraněna</string>
-    <string name="delete_files_and_media_for_all_users">Odstranění souborů pro všechny chat profily</string>
-    <string name="delete_files_and_media_all">Odstranit všechny soubory</string>
-    <string name="delete_files_and_media_desc">Tuto akci nelze vrátit zpět - všechny přijaté a odeslané soubory a média budou smazány. Obrázky s nízkým rozlišením zůstanou zachovány.</string>
-    <string name="no_received_app_files">Žádné přijaté ani odeslané soubory</string>
-    <string name="total_files_count_and_size">%d soubor(ů) s celkovou velikostí %s</string>
-    <string name="chat_item_ttl_none">nikdy</string>
-    <string name="chat_item_ttl_seconds">\"%s vteřin(y)</string>
-    <string name="messages_section_title">Zprávy</string>
-    <string name="messages_section_description">Toto nastavení se vztahuje na zprávy ve vašem aktuálním chat profilu.</string>
-    <string name="delete_messages_after">Smazat zprávy po</string>
-    <string name="enable_automatic_deletion_question">Povolit automatické mazání zpráv\?</string>
-    <string name="enable_automatic_deletion_message">Tuto akci nelze vzít zpět - zprávy odeslané a přijaté dříve, než bylo zvoleno, budou smazány. Může to trvat několik minut.</string>
-    <string name="error_changing_message_deletion">Chyba změny nastavení</string>
-    <string name="save_passphrase_in_keychain">Uložit přístupovou frázi do úložiště klíčů</string>
-    <string name="database_encrypted">Databáze šifrována!</string>
-    <string name="error_encrypting_database">Chyba šifrování databáze</string>
-    <string name="encrypt_database">Šifrovat</string>
-    <string name="encrypted_with_random_passphrase">Databáze je šifrována pomocí náhodné přístupové fráze, můžete ji změnit.</string>
-    <string name="keychain_allows_to_receive_ntfs">K bezpečnému uložení přístupové fráze se použije úložiště klíčů Android, po restartování aplikace nebo změně přístupové fráze - umožní přijímání oznámení.</string>
-    <string name="you_have_to_enter_passphrase_every_time">Musíte zadat přístupovou frázi při každém spuštění aplikace - není uložena v zařízení.</string>
-    <string name="encrypt_database_question">Šifrovat databázi\?</string>
-    <string name="change_database_passphrase_question">Změnit přístupovou frázi databáze\?</string>
-    <string name="database_will_be_encrypted">Databáze bude šifrována.</string>
-    <string name="database_encryption_will_be_updated">Přístupová fráze databáze bude aktualizována a uložena do úložiště klíčů.</string>
-    <string name="database_passphrase_will_be_updated">Přístupová fráze databáze bude aktualizována.</string>
-    <string name="store_passphrase_securely_without_recover">Uložte prosím bezpečně přístupovou frázi, pokud ji ztratíte, NEBUDE možné přistupovat k chatu.</string>
-    <string name="wrong_passphrase">Špatná přístupová fráze k databázi</string>
-    <string name="encrypted_database">Šifrovaná databáze</string>
-    <string name="database_error">Chyba databáze</string>
-    <string name="keychain_error">Chyba klíčenky</string>
-    <string name="passphrase_is_different">Přístupová fráze databáze se liší od té uložené v klíčence.</string>
-    <string name="cannot_access_keychain">Nelze získat přístup k úložišti klíčů pro uložení přístupová fráze k databázi.</string>
-    <string name="unknown_database_error_with_info">Neznámá chyba databáze: %s</string>
-    <string name="wrong_passphrase_title">Špatná přístupová fráze!</string>
-    <string name="enter_correct_passphrase">Zadejte správnou přístupovou frázi.</string>
-    <string name="enter_passphrase">Zadejte přístupovou frázi…</string>
-    <string name="database_backup_can_be_restored">Pokus o změnu přístupové fráze databáze nebyl dokončen.</string>
-    <string name="restore_database_alert_title">Obnovit zálohu databáze\?</string>
-    <string name="restore_database_alert_confirm">Obnovit</string>
-    <string name="database_restore_error">Chyba obnovení databáze</string>
-    <string name="restore_passphrase_not_found_desc">Heslo nebylo nalezeno v úložišti klíčů, zadejte jej prosím ručně. K této situaci mohlo dojít, pokud jste obnovili data aplikace pomocí zálohovacího nástroje. Pokud tomu tak není, obraťte se na vývojáře.</string>
-    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Chat můžete spustit přes Nastavení aplikace / Databáze nebo restartováním aplikace.</string>
-    <string name="save_archive">Uložit archiv</string>
-    <string name="delete_archive">Smazat archiv</string>
-    <string name="group_invitation_item_description">pozvánka do skupiny <xliff:g id="group_name">%1$s</xliff:g></string>
-    <string name="archive_created_on_ts">Vytvořeno dne <xliff:g id="archive_ts">%1$s</xliff:g></string>
-    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Jste zváni do skupiny. Připojte se a spojte se s členy skupiny.</string>
-    <string name="join_group_incognito_button">Připojit se inkognito</string>
-    <string name="joining_group">Připojit ke skupině</string>
-    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Připojili jste se k této skupině. Připojení k pozvání člena skupiny.</string>
-    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Přestanete dostávat zprávy z této skupiny. Chat historie bude zachována.</string>
-    <string name="alert_title_group_invitation_expired">Platnost pozvánky vypršela!</string>
-    <string name="alert_message_group_invitation_expired">Pozvánka do skupiny již není platná, byla odstraněna odesílatelem.</string>
-    <string name="alert_message_no_group">Tato skupina již neexistuje.</string>
-    <string name="alert_title_cant_invite_contacts_descr">Pro tuto skupinu používáte anonymní profil - abyste zabránili sdílení svého hlavního profilu, není pozvání kontaktů povoleno.</string>
-    <string name="you_sent_group_invitation">Odeslali jste pozvánku do skupiny</string>
-    <string name="you_are_invited_to_group">Jste pozváni do skupiny</string>
-    <string name="group_invitation_tap_to_join">Klepnutím se připojíte</string>
-    <string name="group_invitation_tap_to_join_incognito">Klepnutím se připojíte inkognito</string>
-    <string name="you_joined_this_group">Připojili jste se k této skupině</string>
-    <string name="you_rejected_group_invitation">Odmítli jste pozvánku do skupiny</string>
-    <string name="group_invitation_expired">Platnost pozvánky do skupiny vypršela</string>
-    <string name="rcv_group_event_member_added">pozvánka <xliff:g id="profil člena" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_member_connected">připojen</string>
-    <string name="rcv_group_event_changed_member_role">změnil roli %s na %s</string>
-    <string name="rcv_group_event_changed_your_role">změnil svou roli na %s</string>
-    <string name="rcv_group_event_member_deleted">odstraněn <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_user_deleted">odstranil vás</string>
-    <string name="rcv_group_event_group_deleted">skupina odstraněna</string>
-    <string name="rcv_group_event_updated_group_profile">aktualizoval profil skupiny</string>
-    <string name="rcv_group_event_invited_via_your_group_link">pozváni prostřednictvím odkazu na vaši skupinu</string>
-    <string name="snd_group_event_group_profile_updated">profil skupiny aktualizován</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">změna adresy…</string>
-    <string name="snd_conn_event_switch_queue_phase_completed_for_member">změnili jste adresu pro %s</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">změna adresy pro %s…</string>
-    <string name="snd_conn_event_switch_queue_phase_completed">změnili jste adresu</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">změna adresy…</string>
-    <string name="group_member_role_member">člen</string>
-    <string name="group_member_role_owner">vlastník</string>
-    <string name="group_member_status_removed">odstraněn</string>
-    <string name="group_member_status_left">opustil</string>
-    <string name="group_member_status_group_deleted">skupina smazána</string>
-    <string name="group_member_status_invited">pozvánka</string>
-    <string name="group_member_status_introduced">připojující (zavedený)</string>
-    <string name="group_member_status_intro_invitation">připojení (pozvánka na představení)</string>
-    <string name="group_member_status_accepted">přijat</string>
-    <string name="group_member_status_announced">oznámen</string>
-    <string name="group_member_status_connected">připojen</string>
-    <string name="group_member_status_complete">kompletní</string>
-    <string name="group_member_status_creator">tvůrce</string>
-    <string name="group_member_status_connecting">připojování</string>
-    <string name="no_contacts_to_add">Žádné kontakty k přidání</string>
-    <string name="new_member_role">Nová role člena</string>
-    <string name="invite_to_group_button">Pozvat do skupiny</string>
-    <string name="skip_inviting_button">Přeskočit pozvání členů</string>
-    <string name="select_contacts">Vybrat kontakty</string>
-    <string name="icon_descr_contact_checked">Zkontrolované kontakty</string>
-    <string name="num_contacts_selected"><xliff:g id="num_contacts">%1$s</xliff:g> kontakt(y) vybrán(y)</string>
-    <string name="button_add_members">Pozvat členy</string>
-    <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> MEMBERS</string>
-    <string name="group_info_member_you">vy: <xliff:g id="group_info_you">%1$s</xliff:g></string>
-    <string name="button_delete_group">Smazat skupinu</string>
-    <string name="delete_group_question">Smazat skupinu\?</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">Skupina bude smazána pro všechny členy - nelze to vzít zpět!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">Skupina bude smazána pro vás - toto nelze vzít zpět!</string>
-    <string name="button_leave_group">Opustit skupinu</string>
-    <string name="button_edit_group_profile">Upravit profil skupiny</string>
-    <string name="group_link">Odkaz na skupinu</string>
-    <string name="create_group_link">Vytvořit odkaz na skupinu</string>
-    <string name="delete_link">Smazat odkaz</string>
-    <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Můžete sdílet odkaz nebo QR kód - ke skupině se bude moci připojit kdokoli. O členy skupiny nepřijdete, pokud ji později odstraníte.</string>
-    <string name="error_creating_link_for_group">Chyba vytváření odkazu skupiny</string>
-    <string name="error_deleting_link_for_group">Chyba odstraňování odkazu skupiny</string>
-    <string name="only_group_owners_can_change_prefs">Předvolby skupiny mohou měnit pouze vlastníci skupiny.</string>
-    <string name="section_title_for_console">PRO KONSOLE</string>
-    <string name="info_row_local_name">Místní název</string>
-    <string name="info_row_database_id">ID databáze</string>
-    <string name="button_remove_member">Odstranit člena</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">Člen bude odstraněn ze skupiny - toto nelze vzít zpět!</string>
-    <string name="remove_member_confirmation">Odstranit</string>
-    <string name="role_in_group">Role</string>
-    <string name="change_role">Změnit roli</string>
-    <string name="change_verb">Změnit</string>
-    <string name="member_role_will_be_changed_with_invitation">Role bude změněna na \"%s\". Člen obdrží novou pozvánku.</string>
-    <string name="error_changing_role">Chyba změny role</string>
-    <string name="conn_level_desc_direct">přímo</string>
-    <string name="sending_via">Odesíláno přez</string>
-    <string name="network_status">Stav sítě</string>
-    <string name="switch_receiving_address">Přepínač přijímací adresy</string>
-    <string name="group_is_decentralized">Skupina je plně decentralizovaná - viditelná pouze pro členy.</string>
-    <string name="group_unsupported_incognito_main_profile_sent">Zde není podporován režim inkognito - členům skupiny bude zaslán váš hlavní profil.</string>
-    <string name="save_group_profile">Uložení profilu skupiny</string>
-    <string name="network_options_reset_to_defaults">Obnovit výchozí nastavení</string>
-    <string name="network_option_tcp_connection_timeout">Časový limit připojení TCP</string>
-    <string name="network_option_protocol_timeout">Časový limit protokolu</string>
-    <string name="network_option_ping_interval">Interval PING</string>
-    <string name="network_option_ping_count">Počet PING</string>
-    <string name="network_option_enable_tcp_keep_alive">Povolit TCP keep-alive</string>
-    <string name="update_network_settings_confirmation">Aktualizovat</string>
-    <string name="users_delete_question">Smazat chat profil\?</string>
-    <string name="users_delete_profile_for">Smazat chat profil pro</string>
-    <string name="users_delete_with_connections">Profil a připojení k serveru</string>
-    <string name="users_delete_data_only">Pouze místní data profilu</string>
-    <string name="incognito_random_profile_from_contact_description">Náhodný profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz.</string>
-    <string name="incognito_info_protects">Režim inkognito chrání soukromí vašeho hlavního profilového jména a obrázku - pro každý nový kontakt je vytvořen nový náhodný profil.</string>
-    <string name="incognito_info_find">Chcete-li najít profil použitý pro inkognito připojení, klepněte na název kontaktu nebo skupiny v horní části chatu.</string>
-    <string name="theme_light">Světlý</string>
-    <string name="theme_dark">Tmavý</string>
-    <string name="theme">Téma</string>
-    <string name="chat_preferences_contact_allows">Kontakt povolil</string>
-    <string name="chat_preferences_on">zapnuto</string>
-    <string name="chat_preferences_off">vypnuto</string>
-    <string name="chat_preferences">Chat předvolby</string>
-    <string name="contact_preferences">Předvolby kontaktu</string>
-    <string name="group_preferences">Předvolby skupiny</string>
-    <string name="direct_messages">Přímé zprávy</string>
-    <string name="full_deletion">Smazat pro všechny</string>
-    <string name="feature_enabled">povoleno</string>
-    <string name="feature_enabled_for_you">povoleno pro vás</string>
-    <string name="feature_off">vypnuto</string>
-    <string name="prohibit_sending_disappearing_messages">Zakázat zasílání mizejících zpráv.</string>
-    <string name="contacts_can_mark_messages_for_deletion">Kontakty mohou označit zprávy ke smazání; vy je budete moci zobrazit.</string>
-    <string name="prohibit_sending_voice_messages">Zakázat odesílání hlasových zpráv.</string>
-    <string name="only_you_can_send_disappearing">Mizející zprávy můžete odesílat pouze vy.</string>
-    <string name="disappearing_prohibited_in_this_chat">Mizející zprávy jsou v tomto chatu zakázány.</string>
-    <string name="only_your_contact_can_delete">Nevratně mazat zprávy může pouze váš kontakt (vy je můžete označit ke smazání).</string>
-    <string name="both_you_and_your_contact_can_send_voice">Hlasové zprávy můžete posílat vy i váš kontakt.</string>
-    <string name="only_you_can_send_voice">Hlasové zprávy můžete posílat pouze vy.</string>
-    <string name="only_your_contact_can_send_voice">Hlasové zprávy může odesílat pouze váš kontakt.</string>
-    <string name="voice_prohibited_in_this_chat">Hlasové zprávy jsou v tomto chatu zakázány.</string>
-    <string name="prohibit_sending_disappearing">Zakázat posílání mizejících zpráv.</string>
-    <string name="prohibit_message_deletion">Zakázat nevratné mazání zpráv.</string>
-    <string name="prohibit_sending_voice">Zakázat odesílání hlasových zpráv.</string>
-    <string name="group_members_can_send_disappearing">Členové skupiny mohou posílat mizející zprávy.</string>
-    <string name="disappearing_messages_are_prohibited">Mizející zprávy jsou v této skupině zakázány.</string>
-    <string name="group_members_can_send_dms">Členové skupiny mohou posílat přímé zprávy.</string>
-    <string name="direct_messages_are_prohibited_in_chat">Přímé zprávy mezi členy jsou v této skupině zakázány.</string>
-    <string name="group_members_can_delete">Členové skupiny mohou nevratně mazat odeslané zprávy.</string>
-    <string name="message_deletion_prohibited_in_chat">Nevratné mazání zpráv je v této skupině zakázáno.</string>
-    <string name="group_members_can_send_voice">Členové skupiny mohou posílat hlasové zprávy.</string>
-    <string name="voice_messages_are_prohibited">Hlasové zprávy jsou v této skupině zakázány.</string>
-    <string name="delete_after">Smazat po</string>
-    <string name="ttl_month">\"%d měsíc</string>
-    <string name="ttl_months">\"%d měsíců</string>
-    <string name="ttl_day">\"%d den</string>
-    <string name="ttl_days">\"%d dnů</string>
-    <string name="ttl_week">\"%d týden</string>
-    <string name="ttl_weeks">\"%d týdnů</string>
-    <string name="ttl_w">\"%dw</string>
-    <string name="feature_offered_item">nabízeno %s</string>
-    <string name="feature_cancelled_item">zrušeno %s</string>
-    <string name="whats_new">Co je nového</string>
-    <string name="new_in_version">Novinky v %s</string>
-    <string name="v4_2_auto_accept_contact_requests">Automatické přijímání žádostí o kontakt</string>
-    <string name="v4_2_auto_accept_contact_requests_desc">S volitelnou uvítací zprávou.</string>
-    <string name="v4_3_voice_messages_desc">Max. 40 sekund, přijímá se okamžitě.</string>
-    <string name="v4_5_private_filenames">Soukromé názvy souborů</string>
-    <string name="v4_5_private_filenames_descr">Pro ochranu časového pásma, obrazové/hlasové soubory používají UTC.</string>
-    <string name="v4_5_reduced_battery_usage">Snížení spotřeby baterie</string>
-    <string name="v4_5_reduced_battery_usage_descr">Další vylepšení se chystají již brzy!</string>
-    <string name="v4_5_italian_interface">Italské rozhraní</string>
-    <string name="v4_5_italian_interface_descr">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
-    <string name="you_will_be_connected_when_your_contacts_device_is_online">Budete připojeni, až bude zařízení vašeho kontaktu online, vyčkejte prosím nebo se podívejte později!</string>
-    <string name="your_contact_address">Vaše kontaktní adresa</string>
-    <string name="your_chat_profile_will_be_sent_to_your_contact">Váš chat profil bude odeslán
-\nvašemu kontaktu</string>
-    <string name="your_chat_profiles_stored_locally">Vaše chat profily jsou uloženy lokálně, pouze ve vašem zařízení.</string>
-    <string name="your_chats">Vaše konverzace</string>
-    <string name="paste_connection_link_below_to_connect">Do níže uvedeného pole vložte odkaz, který jste obdrželi pro spojení s kontaktem.</string>
-    <string name="share_invitation_link">Sdílet zvací odkaz</string>
-    <string name="status_e2e_encrypted">end-to-end šifrované</string>
-    <string name="moderated_description">moderované</string>
-</resources>
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="auth_unavailable">Autenticación no disponible</string>
-    <string name="accept_contact_button">Aceptar</string>
-    <string name="network_settings">Configuración de red avanzada</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Mejor para la batería</b>. Recibirás notificaciones sólo cuando la aplicación se esté ejecutando, NO se utilizará el servicio en segundo plano.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Bueno para la batería</b>. El servicio en segundo plano comprueba si hay mensajes nuevos cada 10 minutos. Puedes perderte llamadas y mensajes urgentes.</string>
-    <string name="accept_call_on_lock_screen">Aceptar</string>
-    <string name="full_backup">Copia de seguridad de los datos de la aplicación</string>
-    <string name="chat_item_ttl_day">un dia</string>
-    <string name="chat_item_ttl_month">un mes</string>
-    <string name="chat_item_ttl_week">una semana</string>
-    <string name="allow_disappearing_messages_only_if">Permitir que desaparezcan los mensajes sólo si su contacto lo permite.</string>
-    <string name="v4_3_improved_server_configuration_desc">Añadir servidores escaneando códigos QR.</string>
-    <string name="smp_servers_preset_add">Añadir servidores predefinidos</string>
-    <string name="all_group_members_will_remain_connected">Todos los miembros del grupo permanecerán conectados.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Permitir el borrado irreversible de mensajes sólo si su contacto se lo permite.</string>
-    <string name="keychain_allows_to_receive_ntfs">Android Keystore se utilizará para almacenar de forma segura la frase de contraseña después de reiniciar la aplicación o cambiar la frase de contraseña - permitirá recibir notificaciones.</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Permitir a tus contactos enviar mensajes que desaparecen.</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Permitir a tus contactos enviar mensajes de voz.</string>
-    <string name="chat_preferences_always">siempre</string>
-    <string name="notifications_mode_off_desc">La aplicación sólo puede recibir notificaciones cuando se está ejecutando, no se iniciará ningún servicio en segundo plano.</string>
-    <string name="settings_section_title_icon">ICONO DE LA APLICACIÓN</string>
-    <string name="incognito_random_profile_from_contact_description">Se enviará un perfil aleatorio al contacto del que recibió este enlace</string>
-    <string name="turning_off_service_and_periodic">La optimización de la batería está activa, desactivando el servicio en segundo plano y las solicitudes periódicas de nuevos mensajes. Puedes volver a activarlos a través de los ajustes.</string>
-    <string name="notifications_mode_service_desc">El servicio en segundo plano está siempre en funcionamiento – las notificaciones se mostrarán en cuanto los mensajes estén disponibles.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Se puede desactivar a través de los ajustes</b> – las notificaciones se seguirán mostrando mientras la app esté en funcionamiento.</string>
-    <string name="notifications_mode_service">Siempre activo</string>
-    <string name="allow_verb">Permitir</string>
-    <string name="above_then_preposition_continuation">arriba, entonces:</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Añadir nuevo contacto</b>: para crear tu código QR de un solo uso para tu contacto.</string>
-    <string name="accept_connection_request__question">¿Conectar mediante enlace de contacto\?</string>
-    <string name="accept_contact_incognito_button">Aceptar incógnito</string>
-    <string name="clear_chat_warning">Se borrarán todos los mensajes - ¡esto no se puede deshacer! Los mensajes se borrarán SOLO para ti.</string>
-    <string name="smp_servers_add">Añadir servidor…</string>
-    <string name="network_enable_socks_info">¿Acceder a los servidores a través del proxy SOCKS en el puerto 9050\? El proxy debe iniciarse antes de activar esta opción.</string>
-    <string name="all_your_contacts_will_remain_connected">Todos tus contactos permanecerán conectados.</string>
-    <string name="appearance_settings">Apariencia</string>
-    <string name="app_version_title">Versión de la aplicación</string>
-    <string name="network_session_mode_user_description">Se utilizará una conexión TCP independiente (y una credencial SOCKS) <b>para cada perfil de chat que tengas en la aplicación</b>.</string>
-    <string name="network_session_mode_entity_description">Se utilizará una conexión TCP independiente (y una credencial SOCKS) <b>para cada contacto y miembro del grupo</b>.
-\n<b>Ten en cuenta</b>: si tienes muchas conexiones, tu consumo de batería y tráfico puede ser sustancialmente mayor y algunas conexiones pueden fallar.</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="about_simplex">Sobre SimpleX</string>
-    <string name="bold">negrita</string>
-    <string name="callstatus_accepted">llamada aceptada</string>
-    <string name="accept">Aceptar</string>
-    <string name="audio_call_no_encryption">llamada de audio (sin cifrado e2e)</string>
-    <string name="icon_descr_audio_call">llamada de audio</string>
-    <string name="settings_audio_video_calls">Llamadas de audio y vídeo</string>
-    <string name="icon_descr_audio_off">Audio desactivado</string>
-    <string name="icon_descr_audio_on">Audio activado</string>
-    <string name="integrity_msg_bad_id">ID de mensaje erróneo</string>
-    <string name="auto_accept_images">Aceptar automáticamente imágenes</string>
-    <string name="users_delete_all_chats_deleted">Se borrarán todos los chats y mensajes - ¡esto no se puede deshacer!</string>
-    <string name="accept_feature">Aceptar</string>
-    <string name="allow_to_send_disappearing">Permitir enviar mensajes que desaparecen.</string>
-    <string name="keychain_is_storing_securely">Android Keystore se utiliza para almacenar de forma segura la frase de contraseña - permite que el servicio de notificación funcione.</string>
-    <string name="users_add">Añadir perfil</string>
-    <string name="incognito_random_profile_description">Se enviará un perfil aleatorio a tu contacto</string>
-    <string name="color_primary">Acento</string>
-    <string name="allow_your_contacts_irreversibly_delete">Permitir a tus contactos borrar irreversiblemente los mensajes enviados.</string>
-    <string name="allow_voice_messages_only_if">Permitir mensajes de voz sólo si tu contacto lo permite.</string>
-    <string name="allow_direct_messages">Permitir el envío de mensajes directos a los miembros.</string>
-    <string name="allow_to_delete_messages">Permitir borrar irreversiblemente los mensajes enviados.</string>
-    <string name="allow_to_send_voice">Permitir enviar mensajes de voz.</string>
-    <string name="v4_2_group_links_desc">Los administradores pueden crear los enlaces para unirse a los grupos.</string>
-    <string name="v4_2_auto_accept_contact_requests">Aceptar automáticamente solicitudes de contacto</string>
-    <string name="attach">Adjuntar</string>
-    <string name="integrity_msg_bad_hash">hash de mensaje erróneo</string>
-    <string name="answer_call">Responder llamada</string>
-    <string name="group_member_role_admin">admin</string>
-    <string name="allow_voice_messages_question">¿Permitir mensajes de voz\?</string>
-    <string name="back">Atrás</string>
-    <string name="about_simplex_chat">Sobre <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="smp_servers_add_to_another_device">Añadir a otro dispositivo</string>
-    <string name="app_version_name">Versión de la aplicación: v%s</string>
-    <string name="accept_requests">Aceptar solicitudes</string>
-    <string name="accept_automatically">Automáticamente</string>
-    <string name="icon_descr_asked_to_receive">Solicita recibir la imagen</string>
-    <string name="impossible_to_recover_passphrase"><b>Ten en cuenta</b>: NO podrás recuperar o cambiar la contraseña si la pierdes.</string>
-    <string name="both_you_and_your_contact_can_send_voice">Tanto tú como tu contacto podéis enviar mensajes de voz.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>¡Usa más batería!</b> El servicio en segundo plano está siempre en funcionamiento - las notificaciones se mostrarán tan pronto como los mensajes estén disponibles.</string>
-    <string name="both_you_and_your_contacts_can_delete">Tanto tú como tu contacto podéis borrar de forma irreversible los mensajes enviados.</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Tanto tú como tu contacto podéis enviar mensajes de desaparición.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Escanear código QR</b>: para conectar con tu contacto que te muestre código QR.</string>
-</resources>
--- a/Show More
+++ b/Show More