Merge branch 'master' into master-ghc8107

2024-12-17 17:20:21 +01:00 · 2024-01-22 18:44:13 +04:00 · 2024-01-20 21:36:23 +00:00 · 2024-01-20 15:07:20 +00:00 · 2024-01-17 19:29:49 +00:00 · 2024-01-10 12:06:48 +00:00
606 changed files with 9863 additions and 59494 deletions
@@ -65,11 +65,6 @@ jobs:
            asset_name: simplex-chat-ubuntu-22_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-macos-aarch64
-            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
-          - os: macos-13
            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
@@ -112,36 +107,18 @@ jobs:
        if: matrix.os == 'macos-latest'
        shell: bash
        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-13'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
+          echo "ignore-project: False"                                      >> cabal.project.local
+          echo "package direct-sqlcipher"                                   >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                        >> cabal.project.local

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

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

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

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

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

      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -293,7 +270,7 @@ jobs:

      - name: Unix test
        if: matrix.os != 'windows-latest'
-        timeout-minutes: 40
+        timeout-minutes: 30
        shell: bash
        run: cabal test --test-show-details=direct

@@ -5,20 +5,14 @@ on:
  pull_request_target:
    types: [opened, closed, synchronize]

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

@@ -1,41 +1,32 @@
-ARG TAG=22.04
+FROM ubuntu:focal AS build

-FROM ubuntu:${TAG} AS build
-
-### Build stage
-
-# Install curl and git and simplex-chat dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev libssl-dev
-
-# Specify bootstrap Haskell versions
-ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.6.3
-ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0
+# 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

 # Install ghcup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
-
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup

+# Install ghc
+RUN ghcup install ghc 9.6.3
+# Install cabal
+RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
-    ghcup set cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+RUN ghcup set ghc 9.6.3 && \
+    ghcup set cabal 3.10.1.0

 COPY . /project
 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 build exe:simplex-chat
+RUN cabal install

-# Strip the binary from debug symbols to reduce size
-RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
-    mv "$bin" ./ && \
-    strip ./simplex-chat
-
-# Copy compiled app from build stage
 FROM scratch AS export-stage
-COPY --from=build /project/simplex-chat /
+COPY --from=build /root/.cabal/bin/simplex-chat /
@@ -1,175 +1,134 @@
---
-layout: layouts/privacy.html
-permalink: /privacy/index.html
---
+# SimpleX Chat Terms & Privacy Policy

-# SimpleX Chat Privacy Policy and Conditions of Use
+SimpleX Chat is the first communication platform that has no user profile IDs of any kind, not even random numbers. Not only it has no access to your messages (thanks to open-source double-ratchet end-to-end encryption protocol and additional encryption layers), it also has no access to your profile and contacts - we cannot observe your connections graph.

-SimpleX Chat is the first communication network based on a new protocol stack that builds on the same ideas of complete openness and decentralization as email and web, with the focus on providing security and privacy of communications, and without compromising on usability.
-
-SimpleX Chat communication protocol is the first protocol that has no user profile IDs of any kind, not even random numbers, cryptographic keys or hashes that identify the users. SimpleX Chat apps allow their users to send messages and files via relay server infrastructure. Relay server owners and providers do not have any access to your messages, thanks to double-ratchet end-to-end encryption algorithm (also known as Signal algorithm - do not confuse with Signal protocols or platform) and additional encryption layers, and they also have no access to your profile and contacts - as they do not provide any user accounts.
-
-Double ratchet algorithm has such important properties as [forward secrecy](/docs/GLOSSARY.md#forward-secrecy), sender [repudiation](/docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](/docs/GLOSSARY.md#post-compromise-security)).
-
-If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you believe that some of the clauses in this document are not aligned with our mission or principles, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).

 ## Privacy Policy

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

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

-SimpleX Chat software is similar in its design approach to email clients and browsers - it allows you to have full control of your data and freely choose the relay server providers, in the same way you choose which website or email provider to use, or use your own relay servers, simply by changing the configuration of the client software. The only current restriction to that is Apple push notifications - at the moment they can only be delivered via the preset servers that we operate, as explained below. We are exploring the solutions to deliver push notifications to iOS devices via other providers or users' own servers.
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

-While SimpleX Chat Ltd is not a communication service provider, and provide public preset relays "as is", as experimental, without any guarantees of availability or data retention, we are committed to maintain a high level of availability, reliability and security of these preset relays. We will be adding alternative preset infrastructure providers to the software in the future, and you will continue to be able to use any other providers or your own servers.
-
-We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.
-
-SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-### Your information
+### Information you provide

 #### User profiles

-Servers used by SimpleX Chat apps do not create, store or identify user profiles. The profiles you can create in the app are local to your device, and can be removed at any time via the app.
+We do not store user profiles. The profile you create in the app is local to your device.

-When you create the local profile, no records are created on any of the relay servers, and infrastructure providers, whether SimpleX Chat Ltd or any other, have no access to any part of your information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all your data and the private connections you created with other software users.
-
-You can transfer the profile to another device by creating a backup of the app data and restoring it on the new device, but you cannot use more than one device with the copy of the same profile at the same time - it will disrupt any active conversations on either or both devices, as a security property of end-to-end encryption.
+When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.

 #### Messages and Files

-SimpleX relay servers cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](/docs/GLOSSARY.md#key-exchange) happens out-of-band.
+SimpleX Chat cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 256kb, 1mb or 8mb via all or some of the configured file servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.

-Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline, messaging relay servers temporarily store end-to-end encrypted messages – you can configure which relay servers are used to receive the messages from the new contacts, and you can manually change them for the existing contacts too.
+Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.

-You do not have control over which servers are used to send messages to your contacts - they are chosen by them. To send messages your client needs to connect to these servers, therefore the servers chosen by your contacts can observe your IP address. You can use VPN or some overlay network (e.g., Tor) to hide your IP address from the servers chosen by your contacts. In the near future we will add the layer in the messaging protocol that will route sent message via the relays chosen by you as well.
+The messages are permanently removed from the preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).

-The messages are permanently removed from the used relay servers as soon as they are delivered, as long as these servers used unmodified published code. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
+The files are stored on file (XFTP) servers for the time configured in the file servers you use (48 hours for preset file servers).

-The files are stored on file relay servers for the time configured in the relay servers you use (48 hours for preset file servers).
-
-If a messaging servers are restarted, the encrypted message can be stored in a backup file until it is overwritten by the next restart (usually within 1 week for preset relay servers).
-
-As this software is fully open-source and provided under AGPLv3 license, all infrastructure providers and owners, and the developers of the client and server applications who use the SimpleX Chat source code, are required to publish any changes to this software under the same AGPLv3 license - including any modifications to the provided servers.
-
-In addition to the AGPLv3 license terms, SimpleX Chat Ltd is committed to the software users that the preset relays that we provide via the apps will always be compiled from the [published open-source code](https://github.com/simplex-chat/simplexmq), without any modifications.
+If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).

 #### Connections with other users

-When you create a connection with another user, two messaging queues (you can think about them as mailboxes) are created on messaging relay servers (chosen by you and your contact each), that can be the preset servers or the servers that you and your contact configured in the app. SimpleX messaging protocol uses separate queues for direct and response messages, and the apps prefer to create these queues on two different relay servers for increased privacy, in case you have more than one relay server configured in the app, which is the default.
+When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or the servers that you configured in the app, in case it allows such configuration. SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default.

-SimpleX relay servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow infrastructure owners and providers to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
-
-#### Connection links privacy
-
-When you create a connection with another user, the app generates a link/QR code that can be shared with the user to establish the connection via any channel (email, any other messenger, or a video call). This link is safe to share via insecure channels, as long as you can identify the recipient and also trust that this channel did not replace this link (to mitigate the latter risk you can validate the security code via the app).
-
-While the connection "links" contain SimpleX Chat Ltd domain name `simplex.chat`, this site is never accessed by the app, and is only used for these purposes:
- to direct the new users to the app download instructions,
- to show connection QR code that can be scanned via the app,
- to "namespace" these links,
- to open links directly in the installed app when it is clicked outside of the app.
-
-You can always safely replace the initial part of the link `https://simplex.chat/` either with `simplex:/` (which is a URI scheme provisionally registered with IANA) or with any other domain name where you can self-host the app download instructions and show the connection QR code (but in case it is your domain, it will not open in the app). Also, while the page renders QR code, all the information needed to render it is only available to the browser, as the part of the "link" after `#` symbol is not sent to the website server.
+At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.

 #### iOS Push Notifications

 When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.

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

-You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).
+It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot observe it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).

 #### Another information stored on the servers

-Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat design limits this additional technical information to the minimum required to operate the software and servers. To prevent server overloading or attacks, the servers can temporarily store data that can link to particular users or devices, including IP addresses, geographic location, or information related to the transport sessions. This information is not stored for the absolute majority of the app users, even for those who use the servers very actively.
+Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.

-#### SimpleX Directory
+#### SimpleX Directory Service

-[SimpleX Directory](/docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the registered groups. You can connect to SimpleX Directory via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
+[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).

-#### User Support
+#### User Support.

-If you contact SimpleX Chat Ltd, any personal data you share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion) when it is possible, and avoid sharing any personal information.
+If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.

 ### Information we may share

-SimpleX Chat Ltd operates preset relay servers using third parties. While we do not have access and cannot share any user data, these third parties may access the encrypted user messages (but NOT the actual unencrypted message content or size) as it is stored or transmitted via our servers. Hosting providers can also store IP addresses and other transport information as part of their logs.
+We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.

-We use a third party for email services - if you ask for support via email, your and SimpleX Chat Ltd email providers may access these emails according to their privacy policies and terms. When the request is sensitive, we recommend contacting us via SimpleX Chat or using encrypted email using PGP key published at [openpgp.org](https://keys.openpgp.org/search?q=chat%40simplex.chat).
+We use a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to their privacy policies and terms of service.

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

- To meet any applicable law, or enforceable governmental request or court order.
- To enforce applicable terms, including investigation of potential violations.
+- To meet any applicable law, regulation, legal process or enforceable governmental request.
+- To enforce applicable Terms, including investigation of potential violations.
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
- To protect against harm to the rights, property, or safety of software users, SimpleX Chat Ltd, or the public as required or permitted by law.
+- To protect against harm to the rights, property, or safety of SimpleX Chat, our users, or the public as required or permitted by law.

-At the time of updating this document, we have never provided or have been requested the access to the preset relay servers or any information from the servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
-
-We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
+At the time of updating this document, we have never provided or have been requested the access to our servers or any information from our servers by any third parties. If we are ever requested to provide such access or information, we will follow the due legal process.

 ### Updates

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

-Please also read our Conditions of Use of Software and Infrastructure below.
+Please also read our Terms of Service below.

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

-## Conditions of Use of Software and Infrastructure
+## Terms of Service

-You accept the Conditions of Use of Software and Infrastructure ("Conditions") by installing or using any of our software or using any of our server infrastructure (collectively referred to as "Applications"), whether preset in the software or not.
+You accept our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").

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

-**Infrastructure**. Our Infrastructure includes preset messaging and file relay servers, and iOS push notification servers provided by SimpleX Chat Ltd for public use. Our infrastructure does not have any modifications from the [published open-source code](https://github.com/simplex-chat/simplexmq) available under AGPLv3 license. Any infrastructure provider, whether commercial or not, is required by the Affero clause (named after Affero Inc. company that pioneered the community-based Q&A sites in early 2000s) to publish any modifications under the same license. The statements in relation to Infrastructure and relay servers anywhere in this document assume no modifications to the published code, even in the cases when it is not explicitly stated.
+**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.

-**Client applications**. Our client application Software (referred to as "app" or "apps") also has no modifications compared with published open-source code, and any developers of the alternative client apps based on our code are required to publish any modifications under the same AGPLv3 license. Client applications should not include any tracking or analytics code, and do not share any information with SimpleX Chat Ltd or any other third parties. If you ever discover any tracking or analytics code, please report it to us, so we can remove it.
+**Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.

-**Accessing the infrastructure**. For the efficiency of the network access, the client Software by default accesses all queues your app creates on any relay server within one user profile via the same network (TCP/IP) connection. At the cost of additional traffic this configuration can be changed to use different transport session for each connection. Relay servers do not collect information about which queues were created or accessed via the same connection, so the relay servers cannot establish which queues belong to the same user profile. Whoever might observe your network traffic would know which relay servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common, even inside TLS encryption layer. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
+**Operating our services**. For the purpose of operating our Services, you agree that your end-to-end encrypted messages are transferred via our servers in the United Kingdom, the United States and other countries where we have or use facilities and service providers or partners.

-**Privacy of user data**. Servers do not retain any data we transmit for any longer than necessary to deliver the messages between apps. SimpleX Chat Ltd collects aggregate statistics across all its servers, as supported by published code and can be enabled by any infrastructure provider, but not any statistics per-user, or per geographic location, or per IP address, or per transport session. We do not have information about how many people use SimpleX Chat applications, we only know an approximate number of app installations and the aggregate traffic through the preset servers. In any case, we do not and will not sell or in any way monetize user data. Our future business model assumes charging for some optional Software features instead, in a transparent and fair way.
+**Software**. You agree to downloading and installing updates to our Services when they are available; they would only be automatic if you configure your devices in this way.

-**Operating our Infrastructure**. For the purpose of using our Software, if you continue using preset servers, you agree that your end-to-end encrypted messages are transferred via the preset servers in any countries where we have or use facilities and service providers or partners. The information about geographic location of the servers will be made available in the apps in the near future.
+**Traffic and device costs**. You are solely responsible for the traffic and device costs on which you use our Services, and any associated taxes.

-**Software**. You agree to downloading and installing updates to our Applications when they are available; they would only be automatic if you configure your devices in this way.
+**Legal and acceptable usage**. You agree to use our Services only for legal and acceptable purposes. You will not use (or assist others in using) our Services in ways that: 1) violate or infringe the rights of SimpleX Chat, our users, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal or impermissible communications, e.g. spam.

-**Traffic and device costs**. You are solely responsible for the traffic and device costs that you incur while using our Applications, and any associated taxes.
+**Damage to SimpleX Chat**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Services in unauthorized manners, or in ways that harm SimpleX Chat, our Services, or systems. For example, you must not 1) access our Services or systems without authorization, other than by using the apps; 2) disrupt the integrity or performance of our Services; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Services.

-**Legal usage**. You agree to use our Applications only for legal purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.
+**Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.

-**Damage to SimpleX Chat Ltd**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, our Infrastructure, or any other systems. For example, you must not 1) access our Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of our Infrastructure; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.
+**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.

-**Keeping your data secure**. SimpleX Chat is the first communication software that aims to be 100% private by design - server software neither has the ability to access your messages, nor it has information about who you communicate with. That means that you are solely responsible for keeping your device, your user profile and any data safe and secure. If you lose your phone or remove the Software from the device, you will not be able to recover the lost data, unless you made a back up. To protect the data you need to make regular backups, as using old backups may disrupt your communication with some of the contacts.
+**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.

-**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the Software you use. The databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app interface. In this case, if you make a backup of the data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the desktop apps can be configured to store the database passphrase in the configuration file in plaintext, and unless you set the passphrase when first running the app, a random passphrase will be used and stored on the device. You can remove it from the device via the app settings.
+**No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.

-**Storing the files on the device**. The files currently sent and received in the apps by default (except CLI app) are stored on your device encrypted using unique keys, different for each file, that are stored in the database. Once the message that the file was attached to is removed, even if the copy of the encrypted file is retained, it should be impossible to recover the key allowing to decrypt the file. This local file encryption may affect app performance, and it can be disabled via the app settings. This change will only affect the new files. If you later re-enable the encryption, it will also affect only the new files. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access any unencrypted files. In any case, irrespective of the storage setting, the files are always sent by all apps end-to-end encrypted.
+**Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.

-**No Access to Emergency Services**. Our Applications do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
+**Your Rights**. You own the messages and the information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the app.

-**Third-party services**. Our Applications may allow you to access, use, or interact with our or third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
+**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)

-**Your Rights**. You own the messages and the information you transmit through our Applications. Your recipients are able to retain the messages they receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the Software. At the same time, repudiation property of the end-to-end encryption algorithm allows you to plausibly deny having sent the message, like you can deny what you said in a private face-to-face conversation, as the recipient cannot provide any proof to the third parties, by design.
+**SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.

-**License**. SimpleX Chat Ltd grants you a limited, revocable, non-exclusive, and non-transferable license to use our Applications in accordance with these Conditions. The source-code of Applications is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE).
+**Disclaimers**. YOU USE OUR SERVICES AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR SERVICES ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR SERVICES WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR SERVICES WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR SERVICES. WE ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF OUR USERS OR OTHER THIRD PARTIES. YOU RELEASE US, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.

-**SimpleX Chat Ltd Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Applications. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
+**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR AGGREGATE LIABILITY RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN OUR TERMS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.

-**Disclaimers**. YOU USE OUR APPLICATIONS AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR APPLICATIONS ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX CHAT LTD DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR APPLICATIONS WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR APPLICATIONS WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR APPLICATIONS. WE ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF OUR USERS OR OTHER THIRD PARTIES. YOU RELEASE US, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.
+**Availability**. Our Services may be interrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Services, including certain features and the support for certain devices and platforms, at any time.

-**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR CONDITIONS, US, OR OUR APPLICATIONS, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR AGGREGATE LIABILITY RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR CONDITIONS, US, OR OUR APPLICATIONS WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN OUR CONDITIONS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Terms, us, or our Services in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern our Terms, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat and you, without regard to conflict of law provisions.

-**Availability**. Our Applications may be disrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Applications, including certain features and the support for certain devices and platforms, at any time.
+**Changes to the terms**. SimpleX Chat may update the Terms from time to time. Your continued use of our Services confirms your acceptance of our updated Terms and supersedes any prior Terms. You will comply with all applicable export control and trade sanctions laws. Our Terms cover the entire agreement between you and SimpleX Chat regarding our Services. If you do not agree with our Terms, you should stop using our Services.

-**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Conditions, us, or our Applications in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern our Conditions, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat Ltd and you, without regard to conflict of law provisions.
+**Enforcing the terms**. If we fail to enforce any of our Terms, that does not mean we waive the right to enforce them. If any provision of the Terms is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Terms and shall not affect the enforceability of the remaining provisions. Our Services are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject us to any regulations in another country. We reserve the right to limit our Services in any country. If you have specific questions about these Terms, please contact us at chat@simplex.chat.

-**Changes to the conditions**. SimpleX Chat Ltd may update the Conditions from time to time. Your continued use of our Applications confirms your acceptance of our updated Conditions and supersedes any prior Conditions. You will comply with all applicable export control and trade sanctions laws. Our Conditions cover the entire agreement between you and SimpleX Chat Ltd regarding our Applications. If you do not agree with our Conditions, you should stop using our Applications.
+**Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.

-**Enforcing the conditions**. If we fail to enforce any of our Conditions, that does not mean we waive the right to enforce them. If any provision of the Conditions is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Conditions and shall not affect the enforceability of the remaining provisions. Our Applications are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject us to any regulations in another country. We reserve the right to limit our Applications in any country. If you have specific questions about these Conditions, please contact us at chat@simplex.chat.
-
-**Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd at any time by deleting our Applications from your devices and discontinuing use of our Infrastructure. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd.
-
-Updated April 24, 2024
+Updated August 17, 2023
@@ -4,7 +4,7 @@
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 <a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>

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

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

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

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

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

 - chat bots and automations
 - integrations with other apps
@@ -234,14 +234,6 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

-[Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
-
-[Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
-
-[Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
-
-[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
-
 [Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).

 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
@@ -307,7 +299,7 @@ What is already implemented:
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
 12. Manual messaging queue rotations to move conversation to another SMP relay.
 13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
-14. Local files encryption.
+14. Local files encryption, except videos (to be added later).

 We plan to add:

@@ -379,14 +371,12 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Desktop client.
 - ✅ Encryption of local files stored in the app.
 - ✅ Using mobile profiles from the desktop app.
- ✅ Private notes.
- ✅ Improve sending videos (including encryption of locally stored videos).
- ✅ Post-quantum resistant key exchange in double ratchet protocol.
- 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
+- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
 - 🏗 Large groups, communities and public channels.
- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
@@ -414,13 +404,13 @@ We have never provided or have been requested access to our servers or any infor

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

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

 ## Security contact

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

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

 ## License

@@ -16,7 +16,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        application.registerForRemoteNotifications()
        if #available(iOS 17.0, *) { trackKeyboard() }
        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
-        removePasscodesIfReinstalled()
        return true
    }

@@ -128,19 +127,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        BGManager.shared.receiveMessages(complete)
    }

-    private func removePasscodesIfReinstalled() {
-        // Check for the database existence, because app and self destruct passcodes
-        // will be saved and restored by iOS when a user deletes and re-installs the app.
-        // In this case the database and settings will be deleted, but the passcodes won't be.
-        // Deleting passcodes ensures that the user will not get stuck on "Opening app..." screen.
-        if (kcAppPassword.get() != nil || kcSelfDestructPassword.get() != nil) &&
-           !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA) && !hasDatabase() {
-            _ = kcAppPassword.remove()
-            _ = kcSelfDestructPassword.remove()
-            _ = kcDatabasePassword.remove()
-        }
-    }
-
    static func keepScreenOn(_ on: Bool) {
        UIApplication.shared.isIdleTimerDisabled = on
    }
@@ -34,8 +34,6 @@ struct ContentView: View {
    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil

-    private let callTopPadding: CGFloat = 50
-
    private enum ChatListActionSheet: Identifiable {
        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)

@@ -52,28 +50,16 @@ struct ContentView: View {

    var body: some View {
        ZStack {
-            let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
            if !prefPerformLA || accessAuthenticated {
                contentView()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
            } else {
                lockButton()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
            }
-
-            if showCallArea, let call = chatModel.activeCall {
-                VStack {
-                    activeCallInteractiveArea(call)
-                    Spacer()
-                }
-            }
-
            if chatModel.showCallView, let call = chatModel.activeCall {
                callView(call)
            }
-
            if !showSettings, let la = chatModel.laRequest {
                LocalAuthView(authRequest: la)
                    .onDisappear {
@@ -149,11 +135,11 @@ struct ContentView: View {
            if case .onboardingComplete = step,
               chatModel.currentUser != nil {
                mainView()
-                    .actionSheet(item: $chatListActionSheet) { sheet in
-                        switch sheet {
-                        case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
-                        }
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
                    }
+                }
            } else {
                OnboardingView(onboarding: step)
            }
@@ -177,40 +163,6 @@ struct ContentView: View {
        }
    }

-    @ViewBuilder private func activeCallInteractiveArea(_ call: Call) -> some View {
-        HStack {
-            Text(call.contact.displayName).font(.body).foregroundColor(.white)
-            Spacer()
-            CallDuration(call: call)
-        }
-        .padding(.horizontal)
-        .frame(height: callTopPadding - 10)
-        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
-        .onTapGesture {
-            chatModel.activeCallViewIsCollapsed = false
-        }
-    }
-
-    struct CallDuration: View {
-        let call: Call
-        @State var text: String = ""
-        @State var timer: Timer? = nil
-
-        var body: some View {
-            Text(text).frame(minWidth: text.count <= 5 ? 52 : 77, alignment: .leading).offset(x: 4).font(.body).foregroundColor(.white)
-            .onAppear {
-                timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { timer in
-                    if let connectedAt = call.connectedAt {
-                        text = durationText(Int(Date.now.timeIntervalSince1970 - connectedAt.timeIntervalSince1970))
-                    }
-                }
-            }
-            .onDisappear {
-                _ = timer?.invalidate()
-            }
-        }
-    }
-
    private func lockButton() -> some View {
        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
    }
@@ -179,7 +179,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        if playback {
            if AVAudioSession.sharedInstance().category != .playback {
                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: [.duckOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
            }
        } else {
            if AVAudioSession.sharedInstance().category != .soloAmbient {
@@ -80,7 +80,6 @@ final class ChatModel: ObservableObject {
    @Published var tokenRegistered = false
    @Published var tokenStatus: NtfTknStatus?
    @Published var notificationMode = NotificationsMode.off
-    @Published var notificationServer: String?
    @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
    // pending notification actions
    @Published var ntfContactRequest: NTFContactRequest?
@@ -90,12 +89,10 @@ final class ChatModel: ObservableObject {
    @Published var activeCall: Call?
    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
    @Published var showCallView = false
-    @Published var activeCallViewIsCollapsed = false
    // remote desktop
    @Published var remoteCtrlSession: RemoteCtrlSession?
    // currently showing invitation
    @Published var showingInvitation: ShowingInvitation?
-    @Published var migrationState: MigrationToState? = MigrationToDeviceState.makeMigrationState()
    // audio recording and playback
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
@@ -103,7 +100,6 @@ final class ChatModel: ObservableObject {
    // tracks keyboard height via subscription in AppDelegate
    @Published var keyboardHeight: CGFloat = 0
    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
-    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)

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

@@ -779,24 +775,6 @@ final class Chat: ObservableObject, Identifiable {

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

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

@@ -1,73 +0,0 @@
-//
-//  NetworkObserver.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 05.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import Network
-import SimpleXChat
-
-class NetworkObserver {
-    static let shared = NetworkObserver()
-    private let queue: DispatchQueue = DispatchQueue(label: "chat.simplex.app.NetworkObserver")
-    private var prevInfo: UserNetworkInfo? = nil
-    private var monitor: NWPathMonitor?
-    private let monitorLock: DispatchQueue = DispatchQueue(label: "chat.simplex.app.monitorLock")
-
-    func restartMonitor() {
-        monitorLock.sync {
-            monitor?.cancel()
-            let mon = NWPathMonitor()
-            mon.pathUpdateHandler = { [weak self] path in
-                self?.networkPathChanged(path: path)
-            }
-            mon.start(queue: queue)
-            monitor = mon
-        }
-    }
-
-    private func networkPathChanged(path: NWPath) {
-        let info = UserNetworkInfo(
-            networkType: networkTypeFromPath(path),
-            online: path.status == .satisfied
-        )
-        if (prevInfo != info) {
-            prevInfo = info
-            setNetworkInfo(info)
-        }
-    }
-
-    private func networkTypeFromPath(_ path: NWPath) -> UserNetworkType {
-        if path.usesInterfaceType(.wiredEthernet) {
-            .ethernet
-        } else if path.usesInterfaceType(.wifi) {
-            .wifi
-        } else if path.usesInterfaceType(.cellular) {
-            .cellular
-        } else if path.usesInterfaceType(.other) {
-            .other
-        } else {
-            .none
-        }
-    }
-
-    private static var networkObserver: NetworkObserver? = nil
-
-    private func setNetworkInfo(_ info: UserNetworkInfo) {
-        logger.debug("setNetworkInfo Network changed: \(String(describing: info))")
-        DispatchQueue.main.sync {
-            ChatModel.shared.networkInfo = info
-        }
-        if !hasChatCtrl() { return }
-        self.monitorLock.sync {
-            do {
-                try apiSetNetworkInfo(info)
-            } catch let err {
-                logger.error("setNetworkInfo error: \(responseError(err))")
-            }
-        }
-    }
-}
@@ -21,8 +21,6 @@ public let CURRENT_CHAT_VERSION: Int = 2
 // version range that supports establishing direct connection with a group member (xGrpDirectInvVRange in core)
 public let CREATE_MEMBER_CONTACT_VRANGE = VersionRange(minVersion: 2, maxVersion: CURRENT_CHAT_VERSION)

-private let networkStatusesLock = DispatchQueue(label: "chat.simplex.app.network-statuses.lock")
-
 enum TerminalItem: Identifiable {
    case cmd(Date, ChatCommand)
    case resp(Date, ChatResponse)
@@ -92,12 +90,12 @@ private func withBGTask<T>(bgDelay: Double? = nil, f: @escaping () -> T) -> T {
    return r
 }

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

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

-func chatRecvMsg(_ ctrl: chat_ctrl? = nil) async -> ChatResponse? {
+func chatRecvMsg() async -> ChatResponse? {
    await withCheckedContinuation { cont in
        _  = withBGTask(bgDelay: msgDelay) { () -> ChatResponse? in
-            let resp = recvSimpleXMsg(ctrl)
+            let resp = recvSimpleXMsg()
            cont.resume(returning: resp)
            return resp
        }
    }
 }

-func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
-    let r = chatSendCmdSync(.showActiveUser, ctrl)
+func apiGetActiveUser() throws -> User? {
+    let r = chatSendCmdSync(.showActiveUser)
    switch r {
    case let .activeUser(user): return user
    case .chatCmdError(_, .error(.noActiveUser)): return nil
@@ -133,8 +131,8 @@ func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
    }
 }

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

-func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true), ctrl)
+func apiStartChat() throws -> Bool {
+    let r = chatSendCmdSync(.startChat(mainApp: true))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -242,14 +240,20 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
    logger.error("apiSuspendChat error: \(String(describing: r))")
 }

-func apiSetTempFolder(tempFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder), ctrl)
+func apiSetTempFolder(tempFolder: String) throws {
+    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder))
    if case .cmdOk = r { return }
    throw r
 }

-func apiSetFilesFolder(filesFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder), ctrl)
+func apiSetFilesFolder(filesFolder: String) throws {
+    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
+    let r = chatSendCmdSync(.apiSetXFTPConfig(config: cfg))
    if case .cmdOk = r { return }
    throw r
 }
@@ -260,18 +264,6 @@ func apiSetEncryptLocalFiles(_ enable: Bool) throws {
    throw r
 }

-func apiSaveAppSettings(settings: AppSettings) throws {
-    let r = chatSendCmdSync(.apiSaveSettings(settings: settings))
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
-    let r = chatSendCmdSync(.apiGetSettings(settings: settings))
-    if case let .appSettings(settings) = r { return settings }
-    throw r
-}
-
 func apiExportArchive(config: ArchiveConfig) async throws {
    try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -290,10 +282,6 @@ func apiStorageEncryption(currentKey: String = "", newKey: String = "") async th
    try await sendCommandOkResp(.apiStorageEncryption(config: DBEncryptionConfig(currentKey: currentKey, newKey: newKey)))
 }

-func testStorageEncryption(key: String, _ ctrl: chat_ctrl? = nil) async throws {
-    try await sendCommandOkResp(.testStorageEncryption(key: key), ctrl)
-}
-
 func apiGetChats() throws -> [ChatData] {
    let userId = try currentUserId("apiGetChats")
    return try apiChatsResponse(chatSendCmdSync(.apiGetChats(userId: userId)))
@@ -341,20 +329,11 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
-    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
-    return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
-}
-
 func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
-    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
-    return await processSendMessageCmd(toChatType: type, cmd: cmd)
-}
-
-private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> ChatItem? {
    let chatModel = ChatModel.shared
+    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
    let r: ChatResponse
-    if toChatType == .direct {
+    if type == .direct {
        var cItem: ChatItem? = nil
        let endTask = beginBGTask({
            if let cItem = cItem {
@@ -394,7 +373,7 @@ func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent)
 }

 private func sendMessageErrorAlert(_ r: ChatResponse) {
-    logger.error("send message error: \(String(describing: r))")
+    logger.error("apiSendMessage error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
        title: "Error sending message",
        message: "Error: \(String(describing: r))"
@@ -433,14 +412,14 @@ func apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64
    throw r
 }

-func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String?) {
+func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
    let r = chatSendCmdSync(.apiGetNtfToken)
    switch r {
-    case let .ntfToken(token, status, ntfMode, ntfServer): return (token, status, ntfMode, ntfServer)
-    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off, nil)
+    case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
+    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
    default:
        logger.debug("apiGetNtfToken response: \(String(describing: r))")
-        return (nil, nil, .off, nil)
+        return (nil, nil, .off)
    }
 }

@@ -525,14 +504,8 @@ func getNetworkConfig() async throws -> NetCfg? {
    throw r
 }

-func setNetworkConfig(_ cfg: NetCfg, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg), ctrl)
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiSetNetworkInfo(_ networkInfo: UserNetworkInfo) throws {
-    let r = chatSendCmdSync(.apiSetNetworkInfo(networkInfo: networkInfo))
+func setNetworkConfig(_ cfg: NetCfg) throws {
+    let r = chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg))
    if case .cmdOk = r { return }
    throw r
 }
@@ -897,49 +870,14 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
    try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }

-func uploadStandaloneFile(user: any UserLike, file: CryptoFile, ctrl: chat_ctrl? = nil) async -> (FileTransferMeta?, String?) {
-    let r = await chatSendCmd(.apiUploadStandaloneFile(userId: user.userId, file: file), ctrl)
-    if case let .sndStandaloneFileCreated(_, fileTransferMeta) = r {
-        return (fileTransferMeta, nil)
-    } else {
-        logger.error("uploadStandaloneFile error: \(String(describing: r))")
-        return (nil, String(describing: r))
-    }
-}
-
-func downloadStandaloneFile(user: any UserLike, url: String, file: CryptoFile, ctrl: chat_ctrl? = nil) async -> (RcvFileTransfer?, String?) {
-    let r = await chatSendCmd(.apiDownloadStandaloneFile(userId: user.userId, url: url, file: file), ctrl)
-    if case let .rcvStandaloneFileCreated(_, rcvFileTransfer) = r {
-        return (rcvFileTransfer, nil)
-    } else {
-        logger.error("downloadStandaloneFile error: \(String(describing: r))")
-        return (nil, String(describing: r))
-    }
-}
-
-func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationFileLinkData? {
-    let r = await chatSendCmd(.apiStandaloneFileInfo(url: url), ctrl)
-    if case let .standaloneFileInfo(fileMeta) = r {
-        return fileMeta
-    } else {
-        logger.error("standaloneFileInfo error: \(String(describing: r))")
-        return nil
-    }
-}
-
-func receiveFile(user: any UserLike, fileId: Int64, userApprovedRelays: Bool = false, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(
-        fileId: fileId,
-        userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
-        encrypted: privacyEncryptLocalFilesGroupDefault.get(),
-        auto: auto
-    ) {
+func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get(), auto: auto) {
        await chatItemSimpleUpdate(user, chatItem)
    }
 }

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

-func apiCancelFile(fileId: Int64, ctrl: chat_ctrl? = nil) async -> AChatItem? {
-    let r = await chatSendCmd(.cancelFile(fileId: fileId), ctrl)
+func apiCancelFile(fileId: Int64) async -> AChatItem? {
+    let r = await chatSendCmd(.cancelFile(fileId: fileId))
    switch r {
    case let .sndFileCancelled(_, chatItem, _, _) : return chatItem
    case let .rcvFileCancelled(_, chatItem, _) : return chatItem
@@ -1181,8 +1088,8 @@ func apiMarkChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
    }
 }

-private func sendCommandOkResp(_ cmd: ChatCommand, _ ctrl: chat_ctrl? = nil) async throws {
-    let r = await chatSendCmd(cmd, ctrl)
+private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
+    let r = await chatSendCmd(cmd)
    if case .cmdOk = r { return }
    throw r
 }
@@ -1265,7 +1172,7 @@ func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
    return ChatModel.shared.chats
        .compactMap{ $0.chatInfo.contact }
-        .filter{ c in c.ready && c.active && !memberContactIds.contains(c.apiId) }
+        .filter{ !memberContactIds.contains($0.apiId) }
        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }

@@ -1336,13 +1243,13 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
    defer { m.ctrlInitInProgress = false }
    (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey, confirmMigrations: confirmMigrations)
    if  m.chatDbStatus != .ok { return }
-    NetworkObserver.shared.restartMonitor()
    // If we migrated successfully means previous re-encryption process on database level finished successfully too
    if encryptionStartedDefault.get() {
        encryptionStartedDefault.set(false)
    }
    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try setXFTPConfig(getXFTPCfg())
    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
@@ -1402,7 +1309,7 @@ func startChat(refreshInvitations: Bool = true) throws {
        if (refreshInvitations) {
            try refreshCallInvitations()
        }
-        (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
+        (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
        // when it is called before startChat
        if let token = m.deviceToken {
@@ -1423,16 +1330,6 @@ func startChat(refreshInvitations: Bool = true) throws {
    chatLastStartGroupDefault.set(Date.now)
 }

-func startChatWithTemporaryDatabase(ctrl: chat_ctrl) throws -> User? {
-    logger.debug("startChatWithTemporaryDatabase")
-    let migrationActiveUser = try? apiGetActiveUser(ctrl: ctrl) ?? apiCreateActiveUser(Profile(displayName: "Temp", fullName: ""), ctrl: ctrl)
-    try setNetworkConfig(getNetCfg(), ctrl: ctrl)
-    try apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    _ = try apiStartChat(ctrl: ctrl)
-    return migrationActiveUser
-}
-
 func changeActiveUser(_ userId: Int64, viewPwd: String?) {
    do {
        try changeActiveUser_(userId, viewPwd: viewPwd)
@@ -1501,8 +1398,6 @@ class ChatReceiver {
    private var receiveMessages = true
    private var _lastMsgTime = Date.now

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

    var lastMsgTime: Date { get { _lastMsgTime } }
@@ -1516,15 +1411,14 @@ class ChatReceiver {
    }

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

@@ -1612,30 +1506,34 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.removeChat(mergedContact.id)
            }
        }
-    case let .networkStatus(status, connections):
-        // dispatch queue to synchronize access
-        networkStatusesLock.sync {
-            var ns = m.networkStatuses
-            // slow loop is on the background thread
-            for cId in connections {
-                ns[cId] = status
+    case let .contactsSubscribed(_, contactRefs):
+        await updateContactsStatus(contactRefs, status: .connected)
+    case let .contactsDisconnected(_, contactRefs):
+        await updateContactsStatus(contactRefs, status: .disconnected)
+    case let .contactSubSummary(_, contactSubscriptions):
+        await MainActor.run {
+            for sub in contactSubscriptions {
+// no need to update contact here, and it is slow
+//                if active(user) {
+//                    m.updateContact(sub.contact)
+//                }
+                if let err = sub.contactError {
+                    processContactSubError(sub.contact, err)
+                } else {
+                    m.setContactNetworkStatus(sub.contact, .connected)
+                }
            }
-            // fast model update is on the main thread
-            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+        }
+    case let .networkStatus(status, connections):
+        await MainActor.run {
+            for cId in connections {
+                m.networkStatuses[cId] = status
            }
        }
    case let .networkStatuses(_, statuses): ()
-        // dispatch queue to synchronize access
-        networkStatusesLock.sync {
-            var ns = m.networkStatuses
-            // slow loop is on the background thread
+        await MainActor.run {
            for s in statuses {
-                ns[s.agentConnId] = s.networkStatus
-            }
-            // fast model update is on the main thread
-            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+                m.networkStatuses[s.agentConnId] = s.networkStatus
            }
        }
    case let .newChatItem(user, aChatItem):
@@ -1810,36 +1708,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
    case let .rcvFileSndCancelled(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
        Task { cleanupFile(aChatItem) }
-    case let .rcvFileProgressXFTP(user, aChatItem, _, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
-    case let .rcvFileError(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupFile(aChatItem) }
-        }
+    case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
    case let .sndFileStart(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
    case let .sndFileComplete(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
        Task { cleanupDirectFile(aChatItem) }
    case let .sndFileRcvCancelled(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupDirectFile(aChatItem) }
-        }
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
    case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
+        await chatItemSimpleUpdate(user, aChatItem)
    case let .sndFileCompleteXFTP(user, aChatItem, _):
        await chatItemSimpleUpdate(user, aChatItem)
-    case let .sndFileError(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupFile(aChatItem) }
-        }
+        Task { cleanupFile(aChatItem) }
+    case let .sndFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
    case let .callInvitation(invitation):
        await MainActor.run {
            m.callInvitations[invitation.contact.id] = invitation
@@ -1885,35 +1774,21 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
    case .chatSuspended:
        chatSuspended()
-    case let .contactSwitch(user, contact, switchProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnectionStats(contact, switchProgress.connectionStats)
-            }
+    case let .contactSwitch(_, contact, switchProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
        }
-    case let .groupMemberSwitch(user, groupInfo, member, switchProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
-            }
+    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
        }
-    case let .contactRatchetSync(user, contact, ratchetSyncProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
-            }
+    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
        }
-    case let .groupMemberRatchetSync(user, groupInfo, member, ratchetSyncProgress):
-        if active(user) {
-            await MainActor.run {
-                m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
-            }
-        }
-    case let .contactDisabled(user, contact):
-        if active(user) {
-            await MainActor.run {
-                m.updateContact(contact)
-            }
+    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+        await MainActor.run {
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
        }
    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
        await MainActor.run {
@@ -1950,12 +1825,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                }
            }
        }
-    case let .contactPQEnabled(user, contact, _):
-        if active(user) {
-            await MainActor.run {
-                m.updateContact(contact)
-            }
-        }
    default:
        logger.debug("unsupported event: \(res.responseType)")
    }
@@ -1992,13 +1861,31 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    let cItem = aChatItem.chatItem
    if active(user) {
        if await MainActor.run(body: { m.upsertChatItem(cInfo, cItem) }) {
-            if cItem.showNotification {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-            }
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
        }
    }
 }

+func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
+    let m = ChatModel.shared
+    await MainActor.run {
+        for c in contactRefs {
+            m.networkStatuses[c.agentConnId] = status
+        }
+    }
+}
+
+func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
+    let m = ChatModel.shared
+    var err: String
+    switch chatError {
+    case .errorAgent(agentError: .BROKER(_, .NETWORK)): err = "network"
+    case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
+    default: err = String(describing: chatError)
+    }
+    m.setContactNetworkStatus(contact, .error(connectionError: err))
+}
+
 func refreshCallInvitations() throws {
    let m = ChatModel.shared
    let callInvitations = try justRefreshCallInvitations()
@@ -44,12 +44,7 @@ struct SimpleXApp: App {
                    chatModel.appOpenUrl = url
                }
                .onAppear() {
-                    // Present screen for continue migration if it wasn't finished yet
-                    if chatModel.migrationState != nil {
-                        // It's important, otherwise, user may be locked in undefined state
-                        onboardingStageDefault.set(.step1_SimpleXInfo)
-                        chatModel.onboardingStage = onboardingStageDefault.get()
-                    } else if kcAppPassword.get() == nil || kcSelfDestructPassword.get() == nil {
+                    if kcAppPassword.get() == nil || kcSelfDestructPassword.get() == nil {
                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
                            initChatAndMigrate()
                        }
@@ -9,77 +9,52 @@
 import SwiftUI
 import WebKit
 import SimpleXChat
-import AVFoundation

 struct ActiveCallView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
    @ObservedObject var call: Call
    @Environment(\.scenePhase) var scenePhase
    @State private var client: WebRTCClient? = nil
    @State private var activeCall: WebRTCClient.Call? = nil
    @State private var localRendererAspectRatio: CGFloat? = nil
    @Binding var canConnectCall: Bool
-    @State var prevColorScheme: ColorScheme = .dark
-    @State var pipShown = false
-    @State var wasConnected = false

    var body: some View {
-        ZStack(alignment: .topLeading) {
-            ZStack(alignment: .bottom) {
-                if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
-                    GeometryReader { g in
-                        let width = g.size.width * 0.3
-                        ZStack(alignment: .topTrailing) {
-                            CallViewRemote(client: client, activeCall: $activeCall, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, pipShown: $pipShown)
-                            CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
-                                .cornerRadius(10)
-                                .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
-                                .padding([.top, .trailing], 17)
-                            ZStack(alignment: .center) {
-                                // For some reason, when the view in GeometryReader and ZStack is visible, it steals clicks on a back button, so showing something on top like this with background color helps (.clear color doesn't work)
-                            }
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                            .background(Color.primary.opacity(0.000001))
-                        }
+        ZStack(alignment: .bottom) {
+            if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
+                GeometryReader { g in
+                    let width = g.size.width * 0.3
+                    ZStack(alignment: .topTrailing) {
+                        CallViewRemote(client: client, activeCall: $activeCall)
+                        CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio)
+                            .cornerRadius(10)
+                            .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
+                            .padding([.top, .trailing], 17)
                    }
                }
-                if let call = m.activeCall, let client = client, (!pipShown || !call.supportsVideo) {
-                    ActiveCallOverlay(call: call, client: client)
-                }
+            }
+            if let call = m.activeCall, let client = client {
+                ActiveCallOverlay(call: call, client: client)
            }
        }
-        .allowsHitTesting(!m.activeCallViewIsCollapsed)
-        .opacity(m.activeCallViewIsCollapsed ? 0 : 1)
        .onAppear {
            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
            AppDelegate.keepScreenOn(true)
            createWebRTCClient()
            dismissAllSheets()
-            hideKeyboard()
-            prevColorScheme = colorScheme
        }
        .onChange(of: canConnectCall) { _ in
            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
            createWebRTCClient()
        }
-        .onChange(of: m.activeCallViewIsCollapsed) { _ in
-            hideKeyboard()
-        }
        .onDisappear {
            logger.debug("ActiveCallView: disappear")
            Task { await m.callCommand.setClient(nil) }
            AppDelegate.keepScreenOn(false)
            client?.endCall()
-            CallSoundsPlayer.shared.stop()
-            try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)
-            if (wasConnected) {
-                CallSoundsPlayer.shared.vibrate(long: true)
-            }
        }
-        .background(m.activeCallViewIsCollapsed ? .clear : .black)
-        // Quite a big delay when opening/closing the view when a scheme changes (globally) this way. It's not needed when CallKit is used since status bar is green with white text on it
-        .preferredColorScheme(m.activeCallViewIsCollapsed || CallController.useCallKit() ? prevColorScheme : .dark)
+        .background(.black)
+        .preferredColorScheme(.dark)
    }

    private func createWebRTCClient() {
@@ -94,8 +69,8 @@ struct ActiveCallView: View {
    @MainActor
    private func processRtcMessage(msg: WVAPIMessage) {
        if call == m.activeCall,
-           let call = m.activeCall,
-           let client = client {
+            let call = m.activeCall,
+            let client = client {
            logger.debug("ActiveCallView: response \(msg.resp.respType)")
            switch msg.resp {
            case let .capabilities(capabilities):
@@ -110,17 +85,12 @@ struct ActiveCallView: View {
                        call.callState = .invitationSent
                        call.localCapabilities = capabilities
                    }
-                    if call.supportsVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
-                        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    }
-                    CallSoundsPlayer.shared.startConnectingCallSound()
-                    activeCallWaitDeliveryReceipt()
                }
            case let .offer(offer, iceCandidates, capabilities):
                Task {
                    do {
                        try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                                   media: call.localMedia, capabilities: capabilities)
+                                               media: call.localMedia, capabilities: capabilities)
                    } catch {
                        logger.error("apiSendCallOffer \(responseError(error))")
                    }
@@ -138,7 +108,6 @@ struct ActiveCallView: View {
                    }
                    await MainActor.run {
                        call.callState = .negotiated
-                        CallSoundsPlayer.shared.stop()
                    }
                }
            case let .ice(iceCandidates):
@@ -153,19 +122,13 @@ struct ActiveCallView: View {
                if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
                   case .connected = callStatus {
                    call.direction == .outgoing
-                    ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
-                    : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
+                        ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
+                        : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                    call.callState = .connected
-                    call.connectedAt = .now
-                    if !wasConnected {
-                        CallSoundsPlayer.shared.vibrate(long: false)
-                        wasConnected = true
-                    }
                }
                if state.connectionState == "closed" {
                    closeCallView(client)
                    m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                }
                Task {
                    do {
@@ -177,11 +140,6 @@ struct ActiveCallView: View {
            case let .connected(connectionInfo):
                call.callState = .connected
                call.connectionInfo = connectionInfo
-                call.connectedAt = .now
-                if !wasConnected {
-                    CallSoundsPlayer.shared.vibrate(long: false)
-                    wasConnected = true
-                }
            case .ended:
                closeCallView(client)
                call.callState = .ended
@@ -195,7 +153,6 @@ struct ActiveCallView: View {
                case .end:
                    closeCallView(client)
                    m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                default: ()
                }
            case let .error(message):
@@ -208,22 +165,6 @@ struct ActiveCallView: View {
        }
    }

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

    var body: some View {
        VStack {
            switch call.localMedia {
            case .video:
-                videoCallInfoView(call)
+                callInfoView(call, .leading)
                .foregroundColor(.white)
                .opacity(0.8)
                .padding()
@@ -251,16 +191,7 @@ struct ActiveCallOverlay: View {
                HStack {
                    toggleAudioButton()
                    Spacer()
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(width: 40, height: 40)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 40, maxHeight: 40)
-                    } else {
-                        Color.clear.frame(width: 40, height: 40)
-                    }
+                    Color.clear.frame(width: 40, height: 40)
                    Spacer()
                    endCallButton()
                    Spacer()
@@ -277,23 +208,16 @@ struct ActiveCallOverlay: View {
                .frame(maxWidth: .infinity, alignment: .center)

            case .audio:
-                ZStack(alignment: .topLeading) {
-                    Button {
-                        chatModel.activeCallViewIsCollapsed = true
-                    } label: {
-                        Label("Back", systemImage: "chevron.left")
-                            .padding()
-                            .foregroundColor(.white.opacity(0.8))
-                    }
-                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image, size: 192)
-                        audioCallInfoView(call)
-                    }
-                    .foregroundColor(.white)
-                    .opacity(0.8)
-                    .padding()
-                    .frame(maxHeight: .infinity)
+                VStack {
+                    ProfileImage(imageStr: call.contact.profile.image)
+                        .scaledToFit()
+                        .frame(width: 192, height: 192)
+                    callInfoView(call, .center)
                }
+                .foregroundColor(.white)
+                .opacity(0.8)
+                .padding()
+                .frame(maxHeight: .infinity)

                Spacer()

@@ -301,41 +225,22 @@ struct ActiveCallOverlay: View {
                    toggleAudioButton()
                        .frame(maxWidth: .infinity, alignment: .leading)
                    endCallButton()
-                    // Check if the only input is microphone. And in this case show toggle button, 
-                    // If there are more inputs, it probably means something like bluetooth headphones are available
-                    // and in this case show iOS button for choosing different output.
-                    // There is no way to get available outputs, only inputs
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 50, maxHeight: 40)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else {
-                        Color.clear.frame(width: 50, height: 40)
-                    }
+                    toggleSpeakerButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                }
                .padding(.bottom, 60)
                .padding(.horizontal, 48)
            }
        }
        .frame(maxWidth: .infinity)
-        .onAppear {
-            deviceManager.start()
-        }
-        .onDisappear {
-            deviceManager.stop()
-        }
    }

-    private func audioCallInfoView(_ call: Call) -> some View {
+    private func callInfoView(_ call: Call, _ alignment: Alignment) -> some View {
        VStack {
            Text(call.contact.chatViewName)
                .lineLimit(1)
                .font(.title)
-                .frame(maxWidth: .infinity, alignment: .center)
+                .frame(maxWidth: .infinity, alignment: alignment)
            Group {
                Text(call.callState.text)
                HStack {
@@ -346,36 +251,7 @@ struct ActiveCallOverlay: View {
                }
            }
            .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func videoCallInfoView(_ call: Call) -> some View {
-        VStack {
-            Button {
-                chatModel.activeCallViewIsCollapsed = true
-            } label: {
-                HStack(alignment: .center, spacing: 16) {
-                    Image(systemName: "chevron.left")
-                        .resizable()
-                        .frame(width: 10, height: 18)
-                    Text(call.contact.chatViewName)
-                        .lineLimit(1)
-                        .font(.title)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                }
-            }
-            Group {
-                Text(call.callState.text)
-                HStack {
-                    Text(call.encryptionStatus)
-                    if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
-                    }
-                }
-            }
-            .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: alignment)
        }
    }

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

    private func toggleVideoButton() -> some View {
@@ -1,25 +0,0 @@
-//
-//  MPVolumeView.swift
-//  SimpleX (iOS)
-//
-//  Created by Stanislav on 24.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import UIKit
-import AVKit
-
-struct AudioDevicePicker: UIViewRepresentable {
-    func makeUIView(context: Context) -> some UIView {
-        let v = AVRoutePickerView(frame: .zero)
-        v.activeTintColor = .white
-        v.tintColor = .white
-        return v
-    }
-
-    func updateUIView(_ uiView: UIViewType, context: Context) {
-
-    }
-}
@@ -1,67 +0,0 @@
-//
-//  CallAudioDeviceManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-import AVKit
-import WebRTC
-
-class CallAudioDeviceManager: ObservableObject {
-    static let shared = CallAudioDeviceManager()
-    let audioSession: AVAudioSession
-    let nc = NotificationCenter.default
-
-    var call: Call?
-    var timer: Timer? = nil
-
-    // Actually, only one output
-    @Published var outputs: [AVAudioSessionPortDescription]
-    @Published var currentDevice: AVAudioSessionPortDescription? = nil
-    // All devices that can record audio (the ones that can play audio are not included)
-    @Published var availableInputs: [AVAudioSessionPortDescription] = []
-
-
-    init(_ audioSession: AVAudioSession? = nil) {
-        self.audioSession = audioSession ?? RTCAudioSession.sharedInstance().session
-        self.outputs = self.audioSession.currentRoute.outputs
-        self.availableInputs = self.audioSession.availableInputs ?? []
-    }
-
-    func reloadDevices() {
-        outputs = audioSession.currentRoute.outputs
-        currentDevice = audioSession.currentRoute.outputs.first
-        availableInputs = audioSession.availableInputs ?? []
-        call?.speakerEnabled = currentDevice?.portType == .builtInSpeaker
-
-
-        // Workaround situation:
-        // have bluetooth device connected, choosing speaker, disconnecting bluetooth device. In this case iOS will not post notification, so do it manually
-        timer?.invalidate()
-        if availableInputs.contains(where: { $0.portType != .builtInReceiver && $0.portType != .builtInSpeaker }) {
-            timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { t in
-                self.reloadDevices()
-            }
-        }
-    }
-
-    @objc func audioCallback(notification: Notification) {
-        reloadDevices()
-
-        logger.debug("Changes in devices, current audio devices: \(String(describing: self.availableInputs.map({ $0.portType.rawValue }))), output: \(String(describing: self.currentDevice?.portType.rawValue))")
-    }
-
-    func start() {
-        nc.addObserver(self, selector: #selector(audioCallback), name: AVAudioSession.routeChangeNotification, object: nil)
-    }
-
-    func stop() {
-        nc.removeObserver(self, name: AVAudioSession.routeChangeNotification, object: nil)
-        timer?.invalidate()
-    }
-}
@@ -103,23 +103,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
        RTCAudioSession.sharedInstance().isAudioEnabled = true
        do {
-            let supportsVideo = ChatModel.shared.activeCall?.supportsVideo == true
-            if supportsVideo {
-                try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            } else {
-                try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            }
-            // Without any delay sound is not playing from speaker or external device in incoming call
-            Task {
-                for i in 0 ... 3 {
-                    try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
-                    if let preferred = audioSession.preferredInputDevice() {
-                        await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if supportsVideo {
-                        await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
-                    }
-                }
-            }
+            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
            logger.debug("audioSession category set")
            try audioSession.setActive(true)
            logger.debug("audioSession activated")
@@ -92,7 +92,6 @@ class CallManager {
        if case .ended = call.callState {
            logger.debug("CallManager.endCall: call ended")
            m.activeCall = nil
-            m.activeCallViewIsCollapsed = false
            m.showCallView = false
            completed()
        } else {
@@ -101,7 +100,6 @@ class CallManager {
                await m.callCommand.processCommand(.end)
                await MainActor.run {
                    m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                    m.showCallView = false
                    completed()
                }
@@ -6,20 +6,14 @@
 import SwiftUI
 import WebRTC
 import SimpleXChat
-import AVKit

 struct CallViewRemote: UIViewRepresentable {
    var client: WebRTCClient
    var activeCall: Binding<WebRTCClient.Call?>
-    @State var enablePip: (Bool) -> Void = {_ in }
-    @Binding var activeCallViewIsCollapsed: Bool
-    @Binding var pipShown: Bool

-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, activeCallViewIsCollapsed: Binding<Bool>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>) {
        self.client = client
        self.activeCall = activeCall
-        self._activeCallViewIsCollapsed = activeCallViewIsCollapsed
-        self._pipShown = pipShown
    }

    func makeUIView(context: Context) -> UIView {
@@ -29,120 +23,12 @@ struct CallViewRemote: UIViewRepresentable {
            remoteRenderer.videoContentMode = .scaleAspectFill
            client.addRemoteRenderer(call, remoteRenderer)
            addSubviewAndResize(remoteRenderer, into: view)
-
-            if AVPictureInPictureController.isPictureInPictureSupported() {
-                makeViewWithRTCRenderer(call, remoteRenderer, view, context)
-            }
        }
        return view
    }
-    
-    func makeViewWithRTCRenderer(_ call: WebRTCClient.Call, _ remoteRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
-        let pipRemoteRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteRenderer.videoContentMode = .scaleAspectFill
-        
-        let pipVideoCallViewController = AVPictureInPictureVideoCallViewController()
-        pipVideoCallViewController.preferredContentSize = CGSize(width: 1080, height: 1920)
-        addSubviewAndResize(pipRemoteRenderer, into: pipVideoCallViewController.view)
-        let pipContentSource = AVPictureInPictureController.ContentSource(
-            activeVideoCallSourceView: view,
-            contentViewController: pipVideoCallViewController
-        )
-        
-        let pipController = AVPictureInPictureController(contentSource: pipContentSource)
-        pipController.canStartPictureInPictureAutomaticallyFromInline = true
-        pipController.delegate = context.coordinator
-        context.coordinator.pipController = pipController
-        context.coordinator.willShowHide = { show in
-            if show {
-                client.addRemoteRenderer(call, pipRemoteRenderer)
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    activeCallViewIsCollapsed = true
-                }
-            } else {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                    activeCallViewIsCollapsed = false
-                }
-            }
-        }
-        context.coordinator.didShowHide = { show in
-            if show {
-                remoteRenderer.isHidden = true
-            } else {
-                client.removeRemoteRenderer(call, pipRemoteRenderer)
-                remoteRenderer.isHidden = false
-            }
-            pipShown = show
-        }
-        DispatchQueue.main.async {
-            enablePip = { enable in
-                if enable != pipShown /* pipController.isPictureInPictureActive */ {
-                    if enable {
-                        pipController.startPictureInPicture()
-                    } else {
-                        pipController.stopPictureInPicture()
-                    }
-                }
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        Coordinator()
-    }

    func updateUIView(_ view: UIView, context: Context) {
        logger.debug("CallView.updateUIView remote")
-        DispatchQueue.main.async {
-            if activeCallViewIsCollapsed != pipShown {
-                enablePip(activeCallViewIsCollapsed)
-            }
-        }
-    }
-    
-    // MARK: - Coordinator
-    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
-        var pipController: AVPictureInPictureController? = nil
-        var willShowHide: (Bool) -> Void = { _ in }
-        var didShowHide: (Bool) -> Void = { _ in }
-        
-        func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(true)
-        }
-
-        func pictureInPictureControllerDidStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(true)
-        }
-
-        func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, failedToStartPictureInPictureWithError error: Error) {
-            logger.error("PiP failed to start: \(error.localizedDescription)")
-        }
-        
-        func pictureInPictureControllerWillStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(false)
-        }
-        
-        func pictureInPictureControllerDidStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(false)
-        }
-
-        deinit {
-            pipController?.stopPictureInPicture()
-            pipController?.canStartPictureInPictureAutomaticallyFromInline = false
-            pipController?.contentSource = nil
-            pipController?.delegate = nil
-            pipController = nil
-        }
-    }
-    
-    class SampleBufferVideoCallView: UIView {
-        override class var layerClass: AnyClass {
-            get { return AVSampleBufferDisplayLayer.self }
-        }
-        
-        var sampleBufferDisplayLayer: AVSampleBufferDisplayLayer {
-            return layer as! AVSampleBufferDisplayLayer
-        }
    }
 }

@@ -150,14 +36,11 @@ struct CallViewLocal: UIViewRepresentable {
    var client: WebRTCClient
    var activeCall: Binding<WebRTCClient.Call?>
    var localRendererAspectRatio: Binding<CGFloat?>
-    @State var pipStateChanged: (Bool) -> Void = {_ in }
-    @Binding var pipShown: Bool

-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>) {
        self.client = client
        self.activeCall = activeCall
        self.localRendererAspectRatio = localRendererAspectRatio
-        self._pipShown = pipShown
    }

    func makeUIView(context: Context) -> UIView {
@@ -167,18 +50,12 @@ struct CallViewLocal: UIViewRepresentable {
            client.addLocalRenderer(call, localRenderer)
            client.startCaptureLocalVideo(call)
            addSubviewAndResize(localRenderer, into: view)
-            DispatchQueue.main.async {
-                pipStateChanged = { shown in
-                    localRenderer.isHidden = shown
-                }
-            }
        }
        return view
    }

    func updateUIView(_ view: UIView, context: Context) {
        logger.debug("CallView.updateUIView local")
-        pipStateChanged(pipShown)
    }
 }

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

 import Foundation
 import AVFoundation
-import UIKit

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

    init(
        direction: CallDirection,
@@ -60,7 +59,6 @@ class Call: ObservableObject, Equatable {
        }
    }
    var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
-    var supportsVideo: Bool { get { peerMedia == .video || localMedia == .video } }
 }

 enum CallDirection {
@@ -431,18 +429,17 @@ struct RTCIceServer: Codable, Equatable {
 }

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

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

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

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

-    func removeRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
-        activeCall.remoteStream?.remove(renderer)
-    }
-
    func startCaptureLocalVideo(_ activeCall: Call) {
 #if targetEnvironment(simulator)
        guard
@@ -414,7 +410,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        guard let call = activeCall.wrappedValue else { return }
        logger.debug("WebRTCClient: ending the call")
        activeCall.wrappedValue = nil
-        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
        call.connection.close()
        call.connection.delegate = nil
        call.frameEncryptor?.delegate = nil
@@ -605,23 +600,9 @@ extension WebRTCClient {
                self.rtcAudioSession.unlockForConfiguration()
            }
            do {
-                let hasExternalAudioDevice = self.rtcAudioSession.session.hasExternalAudioDevice()
-                if enabled {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.defaultToSpeaker, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.videoChat.rawValue)
-                    if hasExternalAudioDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
-                        try self.rtcAudioSession.setPreferredInput(preferred)
-                    } else {
-                        try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
-                    }
-                } else {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
-                    try self.rtcAudioSession.overrideOutputAudioPort(.none)
-                }
-                if hasExternalAudioDevice {
-                    logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
-                }
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
                try self.rtcAudioSession.setActive(true)
                logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
            } catch let error {
@@ -672,17 +653,6 @@ extension WebRTCClient {
    }
 }

-extension AVAudioSession {
-    func hasExternalAudioDevice() -> Bool {
-        availableInputs?.allSatisfy({ $0.portType == .builtInMic }) != true
-    }
-
-    func preferredInputDevice() -> AVAudioSessionPortDescription? {
-//        logger.debug("Preferred input device: \(String(describing: self.availableInputs?.filter({ $0.portType != .builtInMic })))")
-        return availableInputs?.filter({ $0.portType != .builtInMic }).last
-    }
-}
-
 struct CustomRTCSessionDescription: Codable {
    public var type: RTCSdpType?
    public var sdp: String?
@@ -25,11 +25,11 @@ struct ChatInfoToolbar: View {
            }
            ChatInfoImage(
                chat: chat,
-                size: imageSize,
                color: colorScheme == .dark
                        ? chatImageColorDark
                        : chatImageColorLight
            )
+            .frame(width: imageSize, height: imageSize)
            .padding(.trailing, 4)
            VStack {
                let t = Text(cInfo.displayName).font(.headline)
@@ -49,7 +49,7 @@ func localizedInfoRow(_ title: LocalizedStringKey, _ value: LocalizedStringKey)
    }
 }

-func serverHost(_ s: String) -> String {
+private func serverHost(_ s: String) -> String {
    if let i = s.range(of: "@")?.lowerBound {
        return String(s[i...].dropFirst())
    } else {
@@ -165,12 +165,6 @@ struct ChatInfoView: View {
                }
                .disabled(!contact.ready || !contact.active)

-                if let conn = contact.activeConn {
-                    Section {
-                        infoRow(Text(String("E2E encryption")), conn.connPQEnabled ? "Quantum resistant" : "Standard")
-                    }
-                }
-
                if let contactLink = contact.contactLink {
                    Section {
                        SimpleXLinkQRCode(uri: contactLink)
@@ -271,7 +265,8 @@ struct ChatInfoView: View {
    private func contactInfoHeader() -> some View {
        VStack {
            let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
            if contact.verified {
@@ -35,7 +35,9 @@ struct CICallItemView: View {
            case .error: missedCallIcon(sent).foregroundColor(.orange)
            }

-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
                .padding(.bottom, 8)
                .padding(.horizontal, 12)
        }
@@ -11,7 +11,6 @@ import SimpleXChat

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

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

-    private func mergedFeatures() -> [FeatureInfo]? {
+    private func mergedFeautures() -> [FeatureInfo]? {
        var fs: [FeatureInfo] = []
        var icons: Set<String> = []
        if var i = m.getChatItemIndex(chatItem) {
@@ -68,8 +67,8 @@ struct CIChatFeatureView: View {
        switch ci.content {
        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
-        case let .rcvGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor, param)
-        case let .sndGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor, param)
+        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
        default: nil
        }
    }
@@ -104,6 +103,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
    static var previews: some View {
        let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chat: Chat.sampleData, chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
    }
 }
@@ -17,7 +17,6 @@ struct CIEventView: View {
        .padding(.horizontal, 6)
        .padding(.vertical, 4)
        .textSelection(.disabled)
-        .lineLimit(4)
    }
 }

@@ -60,7 +60,6 @@ struct CIFileView: View {
            case .rcvInvitation: return true
            case .rcvAccepted: return true
            case .rcvTransfer: return false
-            case .rcvAborted: return true
            case .rcvComplete: return true
            case .rcvCancelled: return false
            case .rcvError: return false
@@ -70,14 +69,21 @@ struct CIFileView: View {
        return false
    }

+    private func fileSizeValid() -> Bool {
+        if let file = file {
+            return file.fileSize <= getMaxFileSize(file.fileProtocol)
+        }
+        return false
+    }
+
    private func fileAction() {
        logger.debug("CIFileView fileAction")
        if let file = file {
            switch (file.fileStatus) {
-            case .rcvInvitation, .rcvAborted:
-                if fileSizeValid(file) {
+            case .rcvInvitation:
+                if fileSizeValid() {
                    Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                        if let user = m.currentUser {
                            await receiveFile(user: user, fileId: file.fileId)
                        }
@@ -137,7 +143,7 @@ struct CIFileView: View {
            case .sndCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .sndError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvInvitation:
-                if fileSizeValid(file) {
+                if fileSizeValid() {
                    fileIcon("arrow.down.doc.fill", color: .accentColor)
                } else {
                    fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
@@ -149,8 +155,6 @@ struct CIFileView: View {
                } else {
                    progressView()
                }
-            case .rcvAborted:
-                fileIcon("doc.fill", color: .accentColor, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
            case .rcvComplete: fileIcon("doc.fill")
            case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
            case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
@@ -197,13 +201,6 @@ struct CIFileView: View {
    }
 }

-func fileSizeValid(_ file: CIFile?) -> Bool {
-    if let file = file {
-        return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-}
-
 func saveCryptoFile(_ fileSource: CryptoFile) {
    if let cfArgs = fileSource.cryptoArgs {
        let url = getAppFilePath(fileSource.filePath)
@@ -12,7 +12,6 @@ import SimpleXChat
 struct CIGroupInvitationView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.colorScheme) var colorScheme
-    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var groupInvitation: CIGroupInvitation
    var memberRole: GroupMemberRole
@@ -21,8 +20,6 @@ struct CIGroupInvitationView: View {
    @State private var inProgress = false
    @State private var progressByTimeout = false

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

-            CIMetaView(chat: chat, chatItem: chatItem, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
        }
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
@@ -107,9 +100,9 @@ struct CIGroupInvitationView: View {
            ProfileImage(
                imageStr: groupInvitation.groupProfile.image,
                iconName: "person.2.circle.fill",
-                size: 44,
                color: color
            )
+            .frame(width: 44, height: 44)
            .padding(.trailing, 4)
            VStack(alignment: .leading) {
                let p = groupInvitation.groupProfile
@@ -122,7 +115,7 @@ struct CIGroupInvitationView: View {
        }
    }

-    private func groupInvitationText() -> Text {
+    private func groupInvitationText() -> some View {
        Text(groupInvitationStr())
            .font(.callout)
    }
@@ -144,8 +137,8 @@ struct CIGroupInvitationView: View {
 struct CIGroupInvitationView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
        }
    }
 }
@@ -17,6 +17,7 @@ struct CIImageView: View {
    let maxWidth: CGFloat
    @Binding var imgWidth: CGFloat?
    @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
    @State private var showFullScreenImage = false

    var body: some View {
@@ -28,16 +29,13 @@ struct CIImageView: View {
                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
                }
                .onTapGesture { showFullScreenImage = true }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenImage = false
-                }
            } else if let data = Data(base64Encoded: dropImagePrefix(image)),
                      let uiImage = UIImage(data: data) {
                imageView(uiImage)
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                Task {
                                    if let user = m.currentUser {
                                        await receiveFile(user: user, fileId: file.fileId)
@@ -69,14 +67,14 @@ struct CIImageView: View {
    }

    private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : img.imageData == nil ? .infinity : maxWidth
        DispatchQueue.main.async { imgWidth = w }
        return ZStack(alignment: .topTrailing) {
            if img.imageData == nil {
                Image(uiImage: img)
                        .resizable()
                        .scaledToFit()
-                        .frame(width: w)
+                        .frame(maxWidth: w)
            } else {
                SwiftyGif(image: img)
                        .frame(width: w, height: w * img.size.height / img.size.width)
@@ -102,7 +100,6 @@ struct CIImageView: View {
            case .rcvInvitation: fileIcon("arrow.down", 10, 13)
            case .rcvAccepted: fileIcon("ellipsis", 14, 11)
            case .rcvTransfer: progressView()
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
@@ -116,7 +113,7 @@ struct CIImageView: View {
            .resizable()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
            .padding(padding)
    }

@@ -14,10 +14,6 @@ struct CIMetaView: View {
    var chatItem: ChatItem
    var metaColor = Color.secondary
    var paleMetaColor = Color(UIColor.tertiaryLabel)
-    var showStatus = true
-    var showEdited = true
-
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false

    var body: some View {
        if chatItem.isDeletedContent {
@@ -29,24 +25,24 @@ struct CIMetaView: View {
            switch meta.itemStatus {
            case let .sndSent(sndProgress):
                switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
                }
            case let .sndRcvd(_, sndProgress):
                switch sndProgress {
                case .complete:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
                    }
                case .partial:
                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
                    }
                }
            default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
            }
        }
    }
@@ -58,19 +54,9 @@ enum SentCheckmark {
    case rcvd2
 }

-func ciMetaText(
-    _ meta: CIMeta,
-    chatTTL: Int?,
-    encrypted: Bool?,
-    color: Color = .clear,
-    transparent: Bool = false,
-    sent: SentCheckmark? = nil,
-    showStatus: Bool = true,
-    showEdited: Bool = true,
-    showViaProxy: Bool
-) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
    var r = Text("")
-    if showEdited, meta.itemEdited {
+    if meta.itemEdited {
        r = r + statusIconText("pencil", color)
    }
    if meta.disappearing {
@@ -81,24 +67,19 @@ func ciMetaText(
        }
        r = r + Text(" ")
    }
-    if showViaProxy, meta.sentViaProxy == true {
-        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
-    }
-    if showStatus {
-        if let (icon, statusColor) = meta.statusIcon(color) {
-            let t = Text(Image(systemName: icon)).font(.caption2)
-            let gap = Text("  ").kerning(-1.25)
-            let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
-            switch sent {
-            case nil: r = r + t1
-            case .sent: r = r + t1 + gap
-            case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
-            case .rcvd2: r = r + gap + t1
-            }
-            r = r + Text(" ")
-        } else if !meta.disappearing {
-            r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
+    if let (icon, statusColor) = meta.statusIcon(color) {
+        let t = Text(Image(systemName: icon)).font(.caption2)
+        let gap = Text("  ").kerning(-1.25)
+        let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
+        switch sent {
+        case nil: r = r + t1
+        case .sent: r = r + t1 + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd2: r = r + gap + t1
        }
+        r = r + Text(" ")
+    } else if !meta.disappearing {
+        r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
    }
    if let enc = encrypted {
        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
@@ -19,8 +19,6 @@ struct CIRcvDecryptionError: View {
    var chatItem: ChatItem
    @State private var alert: CIRcvDecryptionErrorAlert?

-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
    enum CIRcvDecryptionErrorAlert: Identifiable {
        case syncAllowedAlert(_ syncConnection: () -> Void)
        case syncNotSupportedContactAlert
@@ -121,7 +119,7 @@ struct CIRcvDecryptionError: View {
                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                )
            }
            .padding(.horizontal, 12)
@@ -142,7 +140,7 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
            }
            .padding(.horizontal, 12)
            CIMetaView(chat: chat, chatItem: chatItem)
@@ -69,7 +69,7 @@ struct CIVideoView: View {
                    .onTapGesture {
                        if let file = file {
                            switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                            case .rcvAccepted:
                                switch file.fileProtocol {
@@ -95,7 +95,7 @@ struct CIVideoView: View {
                }
                durationProgress()
            }
-            if let file = file, showDownloadButton(file.fileStatus) {
+            if let file = file, case .rcvInvitation = file.fileStatus {
                Button {
                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                } label: {
@@ -105,14 +105,6 @@ struct CIVideoView: View {
        }
    }

-    private func showDownloadButton(_ fileStatus: CIFileStatus) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
-    }
-
    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
        return ZStack(alignment: .topTrailing) {
            ZStack(alignment: .center) {
@@ -128,13 +120,10 @@ struct CIVideoView: View {
                        showFullScreenPlayer = urlDecrypted != nil
                    }
                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
                if !decryptionInProgress {
                    Button {
                        decrypt(file: file) {
-                            if urlDecrypted != nil {
+                            if let decrypted = urlDecrypted {
                                videoPlaying = true
                                player?.play()
                            }
@@ -179,9 +168,6 @@ struct CIVideoView: View {
                    default: ()
                    }
                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
                if !videoPlaying {
                    Button {
                        m.stopPreviousRecPlay = url
@@ -251,13 +237,13 @@ struct CIVideoView: View {
    }

    private func imageView(_ img: UIImage) -> some View {
-        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : .infinity
        DispatchQueue.main.async { videoWidth = w }
        return ZStack(alignment: .topTrailing) {
            Image(uiImage: img)
            .resizable()
            .scaledToFit()
-            .frame(width: w)
+            .frame(maxWidth: w)
            loadingIndicator()
        }
    }
@@ -288,7 +274,6 @@ struct CIVideoView: View {
                } else {
                    progressView()
                }
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
            case .rcvCancelled: fileIcon("xmark", 10, 13)
            case .rcvError: fileIcon("xmark", 10, 13)
            case .invalid: fileIcon("questionmark", 10, 13)
@@ -327,10 +312,10 @@ struct CIVideoView: View {
    }

    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
        Task {
            if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false, false)
+                await receiveFile(user, file.fileId, false)
            }
        }
    }
@@ -139,10 +139,9 @@ struct VoiceMessagePlayer: View {
                case .sndComplete: playbackButton()
                case .sndCancelled: playbackButton()
                case .sndError: playbackButton()
-                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
+                case .rcvInvitation: downloadButton(recordingFile)
                case .rcvAccepted: loadingIcon()
                case .rcvTransfer: loadingIcon()
-                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                case .rcvComplete: playbackButton()
                case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -218,7 +217,7 @@ struct VoiceMessagePlayer: View {
        }
    }

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

@@ -65,8 +65,6 @@ struct FramedItemView: View {
                                }
                            }
                        }
-                } else if let itemForwarded = chatItem.meta.itemForwarded {
-                    framedItemHeader(icon: "arrowshape.turn.up.forward", caption: Text(itemForwarded.text(chat.chatInfo.chatType)).italic(), pad: true)
                }

                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: framedMsgContentView)
@@ -87,17 +85,12 @@ struct FramedItemView: View {
            .cornerRadius(18)
            .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }

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

@@ -115,7 +108,7 @@ struct FramedItemView: View {
        } else {
            switch (chatItem.content.msgContent) {
            case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
                    .overlay(DetermineWidth())
                if text == "" && !chatItem.meta.isLive {
                    Color.clear
@@ -162,8 +155,15 @@ struct FramedItemView: View {
            }
        }
    }
+    
+    private func msgDeliveryError(_ err: LocalizedStringKey) {
+        AlertManager.shared.showAlertMsg(
+            title: "Message delivery error",
+            message: err
+        )
+    }

-    @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text, pad: Bool = false) -> some View {
+    @ViewBuilder func framedItemHeader(icon: String? = nil, caption: Text) -> some View {
        let v = HStack(spacing: 6) {
            if let icon = icon {
                Image(systemName: icon)
@@ -178,7 +178,7 @@ struct FramedItemView: View {
        .foregroundColor(.secondary)
        .padding(.horizontal, 12)
        .padding(.top, 6)
-        .padding(.bottom, pad || (chatItem.quotedItem == nil && chatItem.meta.itemForwarded == nil) ? 6 : 0)
+        .padding(.bottom, chatItem.quotedItem == nil ? 6 : 0) // TODO think how to regroup
        .overlay(DetermineWidth())
        .frame(minWidth: msgWidth, alignment: .leading)
        .background(chatItemFrameContextColor(chatItem, colorScheme))
@@ -246,17 +246,13 @@ struct FramedItemView: View {
        Group {
            if let sender = qi.getSender(membership()) {
                VStack(alignment: .leading, spacing: 2) {
-                    Text(sender)
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
+                    Text(sender).font(.caption).foregroundColor(.secondary)
                    ciQuotedMsgTextView(qi, lines: 2)
                }
            } else {
                ciQuotedMsgTextView(qi, lines: 3)
            }
        }
-        .fixedSize(horizontal: false, vertical: true)
        .padding(.top, 6)
        .padding(.horizontal, 12)
    }
@@ -356,9 +352,9 @@ private struct MetaColorPreferenceKey: PreferenceKey {

 func onlyImageOrVideo(_ ci: ChatItem) -> Bool {
    if case let .image(text, _) = ci.content.msgContent {
-        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && ci.meta.itemForwarded == nil && text == ""
+        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && text == ""
    } else if case let .video(text, _, _) = ci.content.msgContent {
-        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && ci.meta.itemForwarded == nil && text == ""
+        return ci.meta.itemDeleted == nil && !ci.meta.isLive && ci.quotedItem == nil && text == ""
    }
    return false
 }
@@ -65,8 +65,6 @@ struct MarkedDeletedItemView: View {
        }
    }

-    // same texts are in markedDeletedText in ChatPreviewView, but it returns String;
-    // can be refactored into a single function if functions calling these are changed to return same type
    var markedDeletedText: LocalizedStringKey {
        switch chatItem.meta.itemDeleted {
        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
@@ -35,8 +35,6 @@ struct MsgContentView: View {
    @State private var typingIdx = 0
    @State private var timer: Timer?

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

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

@@ -1,151 +0,0 @@
-//
-//  ChatItemForwardingView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 12.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ChatItemForwardingView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
-
-    var ci: ChatItem
-    var fromChatInfo: ChatInfo
-    @Binding var composeState: ComposeState
-
-    @State private var searchText: String = ""
-    @FocusState private var searchFocused
-
-    var body: some View {
-        NavigationView {
-            forwardListView()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarLeading) {
-                        Button("Cancel") {
-                            dismiss()
-                        }
-                    }
-                    ToolbarItem(placement: .principal) {
-                        Text("Forward")
-                            .bold()
-                    }
-                }
-        }
-    }
-
-    @ViewBuilder private func forwardListView() -> some View {
-        VStack(alignment: .leading) {
-            let chatsToForwardTo = filterChatsToForwardTo()
-            if !chatsToForwardTo.isEmpty {
-                ScrollView {
-                    LazyVStack(alignment: .leading, spacing: 8) {
-                        searchFieldView(text: $searchText, focussed: $searchFocused)
-                            .padding(.leading, 2)
-                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                        let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { filterChatSearched($0, s) }
-                        ForEach(chats) { chat in
-                            Divider()
-                            forwardListNavLinkView(chat)
-                                .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
-                        }
-                    }
-                    .padding(.horizontal)
-                    .padding(.vertical, 8)
-                    .background(Color(uiColor: .systemBackground))
-                    .cornerRadius(12)
-                    .padding(.horizontal)
-                }
-                .background(Color(.systemGroupedBackground))
-            } else {
-                emptyList()
-            }
-        }
-    }
-
-    private func filterChatsToForwardTo() -> [Chat] {
-        var filteredChats = chatModel.chats.filter({ canForwardToChat($0) })
-        if let index = filteredChats.firstIndex(where: { $0.chatInfo.chatType == .local }) {
-            let privateNotes = filteredChats.remove(at: index)
-            filteredChats.insert(privateNotes, at: 0)
-        }
-        return filteredChats
-    }
-
-    private func filterChatSearched(_ chat: Chat, _ searchStr: String) -> Bool {
-        let cInfo = chat.chatInfo
-        return switch cInfo {
-        case let .direct(contact):
-            viewNameContains(cInfo, searchStr) ||
-            contact.profile.displayName.localizedLowercase.contains(searchStr) ||
-            contact.fullName.localizedLowercase.contains(searchStr)
-        default:
-            viewNameContains(cInfo, searchStr)
-        }
-
-        func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
-            cInfo.chatViewName.localizedLowercase.contains(s)
-        }
-    }
-
-    private func canForwardToChat(_ chat: Chat) -> Bool {
-        switch chat.chatInfo {
-        case let .direct(contact): contact.sendMsgEnabled && !contact.nextSendGrpInv
-        case let .group(groupInfo): groupInfo.sendMsgEnabled
-        case let .local(noteFolder): noteFolder.sendMsgEnabled
-        case .contactRequest: false
-        case .contactConnection: false
-        case .invalidJSON: false
-        }
-    }
-
-    private func emptyList() -> some View {
-        Text("No filtered chats")
-            .foregroundColor(.secondary)
-            .frame(maxWidth: .infinity)
-    }
-
-    @ViewBuilder private func forwardListNavLinkView(_ chat: Chat) -> some View {
-        Button {
-            dismiss()
-            if chat.id == fromChatInfo.id {
-                 composeState = ComposeState(
-                     message: composeState.message,
-                     preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                     contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
-                 )
-            } else {
-                composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                chatModel.chatId = chat.id
-            }
-        } label: {
-            HStack {
-                ChatInfoImage(chat: chat, size: 30)
-                    .padding(.trailing, 2)
-                Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(.primary)
-                    .lineLimit(1)
-                if chat.chatInfo.incognito {
-                    Spacer()
-                    Image(systemName: "theatermasks")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(.secondary)
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-}
-
-#Preview {
-    ChatItemForwardingView(
-        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
-        fromChatInfo: .direct(contact: Contact.sampleData),
-        composeState: Binding.constant(ComposeState(message: "hello"))
-    )
-}
@@ -11,7 +11,6 @@ import SimpleXChat

 struct ChatItemInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
    @Environment(\.colorScheme) var colorScheme
    var ci: ChatItem
    @Binding var chatItemInfo: ChatItemInfo?
@@ -22,7 +21,6 @@ struct ChatItemInfoView: View {
    enum CIInfoTab {
        case history
        case quote
-        case forwarded
        case delivery
    }

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

-    private var local: Bool {
-        switch ci.chatDir {
-        case .localSnd: true
-        case .localRcv: true
-        default: false
-        }
-    }
-
    @ViewBuilder private func itemInfoView() -> some View {
        if numTabs > 1 {
            TabView(selection: $selection) {
@@ -106,13 +93,6 @@ struct ChatItemInfoView: View {
                        }
                        .tag(CIInfoTab.quote)
                }
-                if let forwardedFromItem = chatItemInfo?.forwardedFromChatItem {
-                    forwardedFromTab(forwardedFromItem)
-                        .tabItem {
-                            Label(local ? "Saved" : "Forwarded", systemImage: "arrowshape.turn.up.forward")
-                        }
-                        .tag(CIInfoTab.forwarded)
-                }
            }
            .onAppear {
                if chatItemInfo?.memberDeliveryStatuses != nil {
@@ -295,74 +275,6 @@ struct ChatItemInfoView: View {
        : Color(uiColor: .tertiarySystemGroupedBackground)
    }

-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 16) {
-                details()
-                Divider().padding(.vertical)
-                Text(local ? "Saved from" : "Forwarded from")
-                    .font(.title2)
-                    .padding(.bottom, 4)
-                forwardedFromView(forwardedFromItem)
-            }
-            .padding()
-        }
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    private func forwardedFromView(_ forwardedFromItem: AChatItem) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Button {
-                Task {
-                    await MainActor.run {
-                        chatModel.chatId = forwardedFromItem.chatInfo.id
-                        dismiss()
-                    }
-                }
-            } label: {
-                forwardedFromSender(forwardedFromItem)
-            }
-
-            if !local {
-                Divider().padding(.top, 32)
-                Text("Recipient(s) can't see who this message is from.")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
-        HStack {
-            ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
-                .padding(.trailing, 6)
-
-            if forwardedFromItem.chatItem.chatDir.sent {
-                VStack(alignment: .leading) {
-                    Text("you")
-                        .italic()
-                        .foregroundColor(.primary)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-            } else if case let .groupRcv(groupMember) = forwardedFromItem.chatItem.chatDir {
-                VStack(alignment: .leading) {
-                    Text(groupMember.chatViewName)
-                        .foregroundColor(.primary)
-                        .lineLimit(1)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-            } else {
-                Text(forwardedFromItem.chatInfo.chatViewName)
-                    .foregroundColor(.primary)
-                    .lineLimit(1)
-            }
-        }
-    }
-
    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
        ScrollView {
            VStack(alignment: .leading, spacing: 16) {
@@ -383,7 +295,7 @@ struct ChatItemInfoView: View {
            let mss = membersStatuses(memberDeliveryStatuses)
            if !mss.isEmpty {
                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
                }
            } else {
                Text("No delivery information")
@@ -392,27 +304,24 @@ struct ChatItemInfoView: View {
        }
    }

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

-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus, _ sentViaProxy: Bool?) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
        HStack{
-            ProfileImage(imageStr: member.image, size: 30)
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
                .padding(.trailing, 2)
            Text(member.chatViewName)
                .lineLimit(1)
            Spacer()
-            if sentViaProxy == true {
-                Image(systemName: "arrow.forward")
-                    .foregroundColor(.secondary).opacity(0.67)
-            }
            let v = Group {
                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
                    switch status {
@@ -46,7 +46,7 @@ struct ChatItemView: View {
        let ci = chatItem
        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
-        } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
+        } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
            if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                EmojiItemView(chat: chat, chatItem: ci)
            } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
@@ -102,18 +102,14 @@ struct ChatItemContentView<Content: View>: View {
        case let .rcvChatPreference(feature, allowed, param):
            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
        case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
-        case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor)
-        case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor)
+            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
+        case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
+        case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
        case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
        case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
        case .sndModerated: deletedItemView()
        case .rcvModerated: deletedItemView()
        case .rcvBlocked: deletedItemView()
-        case let .sndDirectE2EEInfo(e2eeInfo): CIEventView(eventText: directE2EEInfoText(e2eeInfo))
-        case let .rcvDirectE2EEInfo(e2eeInfo): CIEventView(eventText: directE2EEInfoText(e2eeInfo))
-        case .sndGroupE2EEInfo: CIEventView(eventText: e2eeInfoNoPQText())
-        case .rcvGroupE2EEInfo: CIEventView(eventText: e2eeInfoNoPQText())
        case let .invalidJSON(json): CIInvalidJSONView(json: json)
        }
    }
@@ -127,7 +123,7 @@ struct ChatItemContentView<Content: View>: View {
    }

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

    private func eventItemView() -> some View {
@@ -149,7 +145,7 @@ struct ChatItemContentView<Content: View>: View {
    }

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

    private var mergedGroupEventText: Text? {
@@ -174,22 +170,6 @@ struct ChatItemContentView<Content: View>: View {
            Text(members)
        }
    }
-
-    private func directE2EEInfoText(_ info: E2EEInfo) -> Text {
-        info.pqEnabled
-        ? Text("Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.")
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .fontWeight(.light)
-        : e2eeInfoNoPQText()
-    }
-
-    private func e2eeInfoNoPQText() -> Text {
-        Text("Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.")
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .fontWeight(.light)
-    }
 }

 func chatEventText(_ text: Text) -> Text {
@@ -17,7 +17,6 @@ struct ChatView: View {
    @Environment(\.colorScheme) var colorScheme
    @Environment(\.dismiss) var dismiss
    @Environment(\.presentationMode) var presentationMode
-    @Environment(\.scenePhase) var scenePhase
    @State @ObservedObject var chat: Chat
    @State private var showChatInfoSheet: Bool = false
    @State private var showAddMembersSheet: Bool = false
@@ -83,11 +82,7 @@ struct ChatView: View {
            initChatView()
        }
        .onChange(of: chatModel.chatId) { cId in
-            showChatInfoSheet = false
-            if let cId {
-                if let c = chatModel.getChat(cId) {
-                    chat = c
-                }
+            if cId != nil {
                initChatView()
            } else {
                dismiss()
@@ -164,17 +159,12 @@ struct ChatView: View {
                switch cInfo {
                case let .direct(contact):
                    HStack {
-                        let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
-                        if callsPrefEnabled {
-                            if chatModel.activeCall == nil {
-                                callButton(contact, .audio, imageName: "phone")
-                                    .disabled(!contact.ready || !contact.active)
-                            } else if let call = chatModel.activeCall, call.contact.id == cInfo.id {
-                                endCallButton(call)
-                            }
+                        if contact.allowsFeature(.calls) {
+                            callButton(contact, .audio, imageName: "phone")
+                                .disabled(!contact.ready || !contact.active)
                        }
                        Menu {
-                            if callsPrefEnabled && chatModel.activeCall == nil {
+                            if contact.allowsFeature(.calls) {
                                Button {
                                    CallController.shared.startCall(contact, .video)
                                } label: {
@@ -183,7 +173,7 @@ struct ChatView: View {
                                .disabled(!contact.ready || !contact.active)
                            }
                            searchButton()
-                            ToggleNtfsButton(chat: chat)
+                            toggleNtfsButton(chat)
                                .disabled(!contact.ready || !contact.active)
                        } label: {
                            Image(systemName: "ellipsis")
@@ -212,7 +202,7 @@ struct ChatView: View {
                        }
                        Menu {
                            searchButton()
-                            ToggleNtfsButton(chat: chat)
+                            toggleNtfsButton(chat)
                        } label: {
                            Image(systemName: "ellipsis")
                        }
@@ -239,9 +229,7 @@ struct ChatView: View {

    private func initChatView() {
        let cInfo = chat.chatInfo
-        // This check prevents the call to apiContactInfo after the app is suspended, and the database is closed.
-        if case .active = scenePhase,
-           case let .direct(contact) = cInfo {
+        if case let .direct(contact) = cInfo {
            Task {
                do {
                    let (stats, _) = try await apiContactInfo(chat.chatInfo.apiId)
@@ -255,8 +243,7 @@ struct ChatView: View {
                }
            }
        }
-        if chatModel.draftChatId == cInfo.id && !composeState.forwarding,
-           let draft = chatModel.draft {
+        if chatModel.draftChatId == cInfo.id, let draft = chatModel.draft {
            composeState = draft
        }
        if chat.chatStats.unreadChat {
@@ -301,7 +288,7 @@ struct ChatView: View {
    }
    
    private func voiceWithoutFrame(_ ci: ChatItem) -> Bool {
-        ci.content.msgContent?.isVoice == true && ci.content.text.count == 0 && ci.quotedItem == nil && ci.meta.itemForwarded == nil
+        ci.content.msgContent?.isVoice == true && ci.content.text.count == 0 && ci.quotedItem == nil
    }

    private func chatItemsList() -> some View {
@@ -347,8 +334,8 @@ struct ChatView: View {
                .onChange(of: searchText) { _ in
                    loadChat(chat: chat, search: searchText)
                }
-                .onChange(of: chatModel.chatId) { chatId in
-                    if let chatId, let c = chatModel.getChat(chatId) {
+                .onChange(of: chatModel.chatId) { _ in
+                    if let chatId = chatModel.chatId, let c = chatModel.getChat(chatId) {
                        chat = c
                        showChatInfoSheet = false
                        loadChat(chat: c)
@@ -434,19 +421,7 @@ struct ChatView: View {
            Image(systemName: imageName)
        }
    }
-
-    private func endCallButton(_ call: Call) -> some View {
-        Button {
-            if let uuid = call.callkitUUID {
-                CallController.shared.endCall(callUUID: uuid)
-            } else {
-                CallController.shared.endCall(call: call) {}
-            }
-        } label: {
-            Image(systemName: "phone.down.fill").tint(.red)
-        }
-    }
-
+    
    private func searchButton() -> some View {
        Button {
            searchMode = true
@@ -519,7 +494,6 @@ struct ChatView: View {
            chat: chat,
            chatItem: ci,
            maxWidth: maxWidth,
-            itemWidth: maxWidth,
            composeState: $composeState,
            selectedMember: $selectedMember,
            chatView: self
@@ -532,7 +506,6 @@ struct ChatView: View {
        @ObservedObject var chat: Chat
        var chatItem: ChatItem
        var maxWidth: CGFloat
-        @State var itemWidth: CGFloat
        @Binding var composeState: ComposeState
        @Binding var selectedMember: GMember?
        var chatView: ChatView
@@ -544,7 +517,6 @@ struct ChatView: View {
        @State private var revealed = false
        @State private var showChatItemInfoSheet: Bool = false
        @State private var chatItemInfo: ChatItemInfo?
-        @State private var showForwardingSheet: Bool = false

        @State private var allowMenu: Bool = true

@@ -568,12 +540,7 @@ struct ChatView: View {
                        chatItemView(ci, nil, prev)
                    }
                } else {
-                    // Switch branches just to work around context menu problem when 'revealed' changes but size of item isn't
-                    if revealed {
-                        chatItemView(chatItem, range, prevItem)
-                    } else {
-                        chatItemView(chatItem, range, prevItem)
-                    }
+                    chatItemView(chatItem, range, prevItem)
                }
            }
        }
@@ -593,12 +560,12 @@ struct ChatView: View {
                            Text(memberNames(member, prevMember, memCount))
                                .font(.caption)
                                .foregroundStyle(.secondary)
-                                .lineLimit(2)
                                .padding(.leading, memberImageSize + 14)
                                .padding(.top, 7)
                        }
                        HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize)
+                            ProfileImage(imageStr: member.memberProfile.image)
+                                .frame(width: memberImageSize, height: memberImageSize)
                                .onTapGesture {
                                    if chatView.membersLoaded {
                                        selectedMember = m.getGroupMember(member.groupMemberId)
@@ -662,7 +629,7 @@ struct ChatView: View {
                    playbackState: $playbackState,
                    playbackTime: $playbackTime
                )
-                .uiKitContextMenu(hasImageOrVideo: ci.content.msgContent?.isImageOrVideo == true, maxWidth: maxWidth, itemWidth: $itemWidth, menu: uiMenu, allowMenu: $allowMenu)
+                .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                    chatItemReactions(ci)
@@ -673,7 +640,7 @@ struct ChatView: View {
                    Button("Delete for me", role: .destructive) {
                        deleteMessage(.cidmInternal)
                    }
-                    if let di = deletingItem, di.meta.deletable && !di.localNote {
+                    if let di = deletingItem, di.meta.editable && !di.localNote {
                        Button(broadcastDeleteButtonText, role: .destructive) {
                            deleteMessage(.cidmBroadcast)
                        }
@@ -699,14 +666,6 @@ struct ChatView: View {
                }) {
                    ChatItemInfoView(ci: ci, chatItemInfo: $chatItemInfo)
                }
-                .sheet(isPresented: $showForwardingSheet) {
-                    if #available(iOS 16.0, *) {
-                        ChatItemForwardingView(ci: ci, fromChatInfo: chat.chatInfo, composeState: $composeState)
-                            .presentationDetents([.fraction(0.8)])
-                    } else {
-                        ChatItemForwardingView(ci: ci, fromChatInfo: chat.chatInfo, composeState: $composeState)
-                    }
-                }
        }

        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
@@ -785,20 +744,11 @@ struct ChatView: View {
                    } else {
                        menu.append(saveFileAction(fileSource))
                    }
-                } else if let file = ci.file, case .rcvInvitation = file.fileStatus, fileSizeValid(file) {
-                    menu.append(downloadFileAction(file))
                }
                if ci.meta.editable && !mc.isVoice && !live {
                    menu.append(editAction(ci))
                }
-                if ci.meta.itemDeleted == nil
-                    && (ci.file == nil || (fileSource != nil && fileExists))
-                    && !ci.isLiveDummy && !live {
-                    menu.append(forwardUIAction(ci))
-                }
-                if !ci.isLiveDummy {
-                    menu.append(viewInfoUIAction(ci))
-                }
+                menu.append(viewInfoUIAction(ci))
                if revealed {
                    menu.append(hideUIAction())
                }
@@ -828,9 +778,6 @@ struct ChatView: View {
                menu.append(deleteUIAction(ci))
            } else if ci.mergeCategory != nil && ((range?.count ?? 0) > 1 || revealed) {
                menu.append(revealed ? shrinkUIAction() : expandUIAction())
-                menu.append(deleteUIAction(ci))
-            } else if ci.showLocalDelete {
-                menu.append(deleteUIAction(ci))
            }
            return menu
        }
@@ -850,15 +797,6 @@ struct ChatView: View {
            }
        }

-        private func forwardUIAction(_ ci: ChatItem) -> UIAction {
-            UIAction(
-                title: NSLocalizedString("Forward", comment: "chat item action"),
-                image: UIImage(systemName: "arrowshape.turn.up.forward")
-            ) { _ in
-                showForwardingSheet = true
-            }
-        }
-
        private func reactionUIMenuPreiOS16(_ rs: [UIAction]) -> UIMenu {
            UIMenu(
                title: NSLocalizedString("React…", comment: "chat item menu"),
@@ -956,21 +894,7 @@ struct ChatView: View {
                saveCryptoFile(fileSource)
            }
        }
-
-        private func downloadFileAction(_ file: CIFile) -> UIAction {
-            UIAction(
-                title: NSLocalizedString("Download", comment: "chat item action"),
-                image: UIImage(systemName: "arrow.down.doc")
-            ) { _ in
-                Task {
-                    logger.debug("ChatView downloadFileAction, in Task")
-                    if let user = m.currentUser {
-                        await receiveFile(user: user, fileId: file.fileId)
-                    }
-                }
-            }
-        }
-
+        
        private func editAction(_ ci: ChatItem) -> UIAction {
            UIAction(
                title: NSLocalizedString("Edit", comment: "chat item action"),
@@ -1043,7 +967,7 @@ struct ChatView: View {
                image: UIImage(systemName: "trash"),
                attributes: [.destructive]
            ) { _ in
-                if !revealed,
+                if !revealed && ci.meta.itemDeleted != nil,
                   let currIndex = m.getChatItemIndex(ci),
                   let ciCategory = ci.mergeCategory {
                    let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
@@ -1219,18 +1143,14 @@ struct ChatView: View {
    }
 }

-struct ToggleNtfsButton: View {
-    @ObservedObject var chat: Chat
-
-    var body: some View {
-        Button {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        } label: {
-            if chat.chatInfo.ntfsEnabled {
-                Label("Mute", systemImage: "speaker.slash")
-            } else {
-                Label("Unmute", systemImage: "speaker.wave.2")
-            }
+@ViewBuilder func toggleNtfsButton(_ chat: Chat) -> some View {
+    Button {
+        toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+    } label: {
+        if chat.chatInfo.ntfsEnabled {
+            Label("Mute", systemImage: "speaker.slash")
+        } else {
+            Label("Unmute", systemImage: "speaker.wave.2")
        }
    }
 }
@@ -23,7 +23,6 @@ enum ComposeContextItem {
    case noContextItem
    case quotedItem(chatItem: ChatItem)
    case editingItem(chatItem: ChatItem)
-    case forwardingItem(chatItem: ChatItem, fromChatInfo: ChatInfo)
 }

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

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

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

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

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

-    var attachmentPreview: Bool {
-        switch preview {
-        case .noPreview: false
-        case .linkPreview: false
-        case let .mediaPreviews(mediaPreviews): !mediaPreviews.isEmpty
-        case .voicePreview: false
-        case .filePreview: true
-        }
-    }
-
    var empty: Bool {
        message == "" && noPreview
    }
@@ -259,7 +234,6 @@ struct ComposeView: View {
    @Binding var keyboardVisible: Bool

    @State var linkUrl: URL? = nil
-    @State var hasSimplexLink: Bool = false
    @State var prevLinkUrl: URL? = nil
    @State var pendingLinkUrl: URL? = nil
    @State var cancelledLinks: Set<String> = []
@@ -286,16 +260,6 @@ struct ComposeView: View {
            if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                ContextInvitingContactMemberView()
            }
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
-            let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
-            if simplexLinkProhibited {
-                msgNotAllowedView("SimpleX links not allowed", icon: "link")
-            } else if fileProhibited {
-                msgNotAllowedView("Files and media not allowed", icon: "doc")
-            } else if voiceProhibited {
-                msgNotAllowedView("Voice messages not allowed", icon: "mic")
-            }
            contextItemView()
            switch (composeState.editing, composeState.preview) {
            case (true, .filePreview): EmptyView()
@@ -314,7 +278,7 @@ struct ComposeView: View {
                .padding(.bottom, 12)
                .padding(.leading, 12)
                if case let .group(g) = chat.chatInfo,
-                   !g.fullGroupPreferences.files.on(for: g.membership) {
+                   !g.fullGroupPreferences.files.on {
                    b.disabled(true).onTapGesture {
                        AlertManager.shared.showAlertMsg(
                            title: "Files and media prohibited!",
@@ -339,7 +303,6 @@ struct ComposeView: View {
                        },
                        nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                        voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
-                        disableSendButton: simplexLinkProhibited || fileProhibited || voiceProhibited,
                        showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                        startVoiceMessageRecording: {
                            Task {
@@ -374,18 +337,13 @@ struct ComposeView: View {
                }
            }
        }
-        .onChange(of: composeState.message) { msg in
+        .onChange(of: composeState.message) { _ in
            if composeState.linkPreviewAllowed {
-                if msg.count > 0 {
-                    showLinkPreview(msg)
+                if composeState.message.count > 0 {
+                    showLinkPreview(composeState.message)
                } else {
                    resetLinkPreview()
-                    hasSimplexLink = false
                }
-            } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
-            } else {
-                hasSimplexLink = false
            }
        }
        .onChange(of: chat.userCanSend) { canSend in
@@ -652,18 +610,6 @@ struct ComposeView: View {
        }
    }

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

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

        func sending() async {
@@ -890,27 +815,10 @@ struct ComposeView: View {
            return nil
        }

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

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

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

    private func isSimplexLink(_ link: String) -> Bool {
@@ -1074,9 +978,6 @@ struct ComposeView: View {
    }

    private func cancelLinkPreview() {
-        if let pendingLink = pendingLinkUrl?.absoluteString {
-            cancelledLinks.insert(pendingLink)
-        }
        if let uri = composeState.linkPreview?.uri.absoluteString {
            cancelledLinks.insert(uri)
        }
@@ -15,7 +15,6 @@ struct ContextItemView: View {
    let contextItem: ChatItem
    let contextIcon: String
    let cancelContextItem: () -> Void
-    var showSender: Bool = true

    var body: some View {
        HStack {
@@ -24,7 +23,7 @@ struct ContextItemView: View {
                .aspectRatio(contentMode: .fit)
                .frame(width: 16, height: 16)
                .foregroundColor(.secondary)
-            if showSender, let sender = contextItem.memberDisplayName {
+            if let sender = contextItem.memberDisplayName {
                VStack(alignment: .leading, spacing: 4) {
                    Text(sender).font(.caption).foregroundColor(.secondary)
                    msgContentView(lines: 2)
@@ -49,26 +48,14 @@ struct ContextItemView: View {
    }

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

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

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

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

-private func alignment(_ text: String) -> NSTextAlignment {
-    isRightToLeft(text) ? .right : .left
-}
-
 private class CustomUITextField: UITextView, UITextViewDelegate {
    var height: Binding<CGFloat>
    var newHeight: CGFloat = 0
@@ -216,6 +205,7 @@ struct NativeTextEditor_Previews: PreviewProvider{
            disableEditing: Binding.constant(false),
            height: Binding.constant(100),
            focused: Binding.constant(false),
+            alignment: TextAlignment.leading,
            onImagesAdded: { _ in }
        )
        .fixedSize(horizontal: false, vertical: true)
@@ -20,7 +20,6 @@ struct SendMessageView: View {
    var nextSendGrpInv: Bool = false
    var showVoiceMessageButton: Bool = true
    var voiceMessageAllowed: Bool = true
-    var disableSendButton = false
    var showEnableVoiceMessagesAlert: ChatInfo.ShowEnableVoiceMessagesAlert = .other
    var startVoiceMessageRecording: (() -> Void)? = nil
    var finishVoiceMessageRecording: (() -> Void)? = nil
@@ -54,11 +53,13 @@ struct SendMessageView: View {
                            .padding(.vertical, 8)
                            .frame(maxWidth: .infinity)
                    } else {
+                        let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
                        NativeTextEditor(
                            text: $composeState.message,
                            disableEditing: $composeState.inProgress,
                            height: $teHeight,
                            focused: $keyboardVisible,
+                            alignment: alignment,
                            onImagesAdded: onMediaAdded
                        )
                        .allowsTightening(false)
@@ -108,7 +109,6 @@ struct SendMessageView: View {
        } else if showVoiceMessageButton
            && composeState.message.isEmpty
            && !composeState.editing
-            && !composeState.forwarding
            && composeState.liveMessage == nil
            && ((composeState.noPreview && vmrs == .noRecording)
                || (vmrs == .recording && holdingVMR)) {
@@ -184,8 +184,7 @@ struct SendMessageView: View {
            !composeState.sendEnabled ||
            composeState.inProgress ||
            (!voiceMessageAllowed && composeState.voicePreview) ||
-            composeState.endLiveDisabled ||
-            disableSendButton
+            composeState.endLiveDisabled
        )
        .frame(width: 29, height: 29)
        .contextMenu{
@@ -35,7 +35,7 @@ struct ContactPreferencesView: View {
                .disabled(currentFeaturesAllowed == featuresAllowed)
            }
        }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
+        .modifier(BackButton {
            if currentFeaturesAllowed == featuresAllowed {
                dismiss()
            } else {
@@ -194,7 +194,8 @@ struct AddGroupMembersViewCommon: View {
            }
        } label: {
            HStack{
-                ProfileImage(imageStr: contact.image, size: 30)
+                ProfileImage(imageStr: contact.image)
+                    .frame(width: 30, height: 30)
                    .padding(.trailing, 2)
                Text(ChatInfo.direct(contact: contact).chatViewName)
                    .foregroundColor(prohibitedToInviteIncognito ? .secondary : .primary)
@@ -62,7 +62,7 @@ struct GroupChatInfoView: View {
        NavigationView {
            let members = chatModel.groupMembers
                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
-                .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }

            List {
                groupInfoHeader()
@@ -172,7 +172,8 @@ struct GroupChatInfoView: View {
    private func groupInfoHeader() -> some View {
        VStack {
            let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
            Text(cInfo.displayName)
@@ -216,7 +217,8 @@ struct GroupChatInfoView: View {
        var body: some View {
            let member = groupMember.wrapped
            let v = HStack{
-                ProfileImage(imageStr: member.image, size: 38)
+                ProfileImage(imageStr: member.image)
+                    .frame(width: 38, height: 38)
                    .padding(.trailing, 2)
                // TODO server connection status
                VStack(alignment: .leading) {
@@ -232,29 +234,39 @@ struct GroupChatInfoView: View {
                Spacer()
                memberInfo(member)
            }
-            
+
+            // revert from this:
            if user {
                v
-            } else if groupInfo.membership.memberRole >= .admin {
-                // TODO if there are more actions, refactor with lists of swipeActions
-                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
-                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
-                if canBlockForAll && canRemove {
-                    removeSwipe(member, blockForAllSwipe(member, v))
-                } else if canBlockForAll {
-                    blockForAllSwipe(member, v)
-                } else if canRemove {
-                    removeSwipe(member, v)
-                } else {
-                    v
-                }
+            } else if member.canBeRemoved(groupInfo: groupInfo) {
+                removeSwipe(member, blockSwipe(member, v))
            } else {
-                if !member.blockedByAdmin {
-                    blockSwipe(member, v)
-                } else {
-                    v
-                }
+                blockSwipe(member, v)
            }
+            // revert to this: vvv
+//            if user {
+//                v
+//            } else if groupInfo.membership.memberRole >= .admin {
+//                // TODO if there are more actions, refactor with lists of swipeActions
+//                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
+//                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
+//                if canBlockForAll && canRemove {
+//                    removeSwipe(member, blockForAllSwipe(member, v))
+//                } else if canBlockForAll {
+//                    blockForAllSwipe(member, v)
+//                } else if canRemove {
+//                    removeSwipe(member, v)
+//                } else {
+//                    v
+//                }
+//            } else {
+//                if !member.blockedByAdmin {
+//                    blockSwipe(member, v)
+//                } else {
+//                    v
+//                }
+//            }
+            // ^^^
        }

        @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
@@ -358,11 +370,7 @@ struct GroupChatInfoView: View {

    private func addOrEditWelcomeMessage() -> some View {
        NavigationLink {
-            GroupWelcomeView(
-                groupInfo: $groupInfo,
-                groupProfile: groupInfo.groupProfile,
-                welcomeText: groupInfo.groupProfile.description ?? ""
-            )
+            GroupWelcomeView(groupId: groupInfo.groupId, groupInfo: $groupInfo)
            .navigationTitle("Welcome message")
            .navigationBarTitleDisplayMode(.large)
        } label: {
@@ -83,7 +83,7 @@ struct GroupMemberInfoView: View {
                        Section {
                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
                                knownDirectChatButton(chat)
-                            } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                            } else if groupInfo.fullGroupPreferences.directMessages.on {
                                if let contactId = member.memberContactId {
                                    newDirectChatButton(contactId)
                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
@@ -110,7 +110,7 @@ struct GroupMemberInfoView: View {
                                Label("Share address", systemImage: "square.and.arrow.up")
                            }
                            if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
                                    connectViaAddressButton(contactLink)
                                }
                            } else {
@@ -168,11 +168,24 @@ struct GroupMemberInfoView: View {
                        }
                    }

-                    if groupInfo.membership.memberRole >= .admin {
-                        adminDestructiveSection(member)
-                    } else {
-                        nonAdminBlockSection(member)
+                    // revert from this:
+                    Section {
+                        if member.memberSettings.showMessages {
+                            blockMemberButton(member)
+                        } else {
+                            unblockMemberButton(member)
+                        }
+                        if member.canBeRemoved(groupInfo: groupInfo) {
+                            removeMemberButton(member)
+                        }
                    }
+                    // revert to this: vvv
+//                    if groupInfo.membership.memberRole >= .admin {
+//                        adminDestructiveSection(member)
+//                    } else {
+//                        nonAdminBlockSection(member)
+//                    }
+                    // ^^^

                    if developerTools {
                        Section("For console") {
@@ -305,7 +318,8 @@ struct GroupMemberInfoView: View {

    private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
        VStack {
-            ProfileImage(imageStr: mem.image, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                .padding(.top, 12)
                .padding()
            if mem.verified {
@@ -9,12 +9,6 @@
 import SwiftUI
 import SimpleXChat

-private let featureRoles: [(role: GroupMemberRole?, text: LocalizedStringKey)] = [
-    (nil, "all members"),
-    (.admin, "admins"),
-    (.owner, "owners")
-]
-
 struct GroupPreferencesView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject var chatModel: ChatModel
@@ -30,12 +24,10 @@ struct GroupPreferencesView: View {
            List {
                featureSection(.timedMessages, $preferences.timedMessages.enable)
                featureSection(.fullDelete, $preferences.fullDelete.enable)
-                featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
+                featureSection(.directMessages, $preferences.directMessages.enable)
                featureSection(.reactions, $preferences.reactions.enable)
-                featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
-                featureSection(.files, $preferences.files.enable, $preferences.files.role)
-                // TODO enable simplexLinks preference in 5.8
-                // featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.voice, $preferences.voice.enable)
+                featureSection(.files, $preferences.files.enable)
                featureSection(.history, $preferences.history.enable)

                if groupInfo.canEdit {
@@ -56,7 +48,7 @@ struct GroupPreferencesView: View {
                preferences.timedMessages.ttl = currentPreferences.timedMessages.ttl
            }
        }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
+        .modifier(BackButton {
            if currentPreferences == preferences {
                dismiss()
            } else {
@@ -72,7 +64,7 @@ struct GroupPreferencesView: View {
        }
    }

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

    private func savePreferences() {
@@ -11,32 +11,29 @@ import SimpleXChat

 struct GroupWelcomeView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject private var m: ChatModel
+    var groupId: Int64
    @Binding var groupInfo: GroupInfo
-    @State var groupProfile: GroupProfile
-    @State var welcomeText: String
+    @State private var welcomeText: String = ""
    @State private var editMode = true
    @FocusState private var keyboardVisible: Bool
    @State private var showSaveDialog = false

-    let maxByteCount = 1200
-
    var body: some View {
        VStack {
            if groupInfo.canEdit {
                editorView()
-                    .modifier(BackButton(disabled: Binding.constant(false)) {
-                        if welcomeTextUnchanged() {
+                    .modifier(BackButton {
+                        if welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil) {
                            dismiss()
                        } else {
                            showSaveDialog = true
                        }
                    })
-                    .confirmationDialog(
-                        welcomeTextFitsLimit() ? "Save welcome message?" : "Welcome message is too long",
-                        isPresented: $showSaveDialog
-                    ) {
-                        if welcomeTextFitsLimit() {
-                            Button("Save and update group profile") { save() }
+                    .confirmationDialog("Save welcome message?", isPresented: $showSaveDialog) {
+                        Button("Save and update group profile") {
+                            save()
+                            dismiss()
                        }
                        Button("Exit without saving") { dismiss() }
                    }
@@ -50,15 +47,14 @@ struct GroupWelcomeView: View {
            }
        }
        .onAppear {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                keyboardVisible = true
-            }
+            welcomeText = groupInfo.groupProfile.description ?? ""
+            keyboardVisible = true
        }
    }

    private func textPreview() -> some View {
        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
-            .frame(minHeight: 130, alignment: .topLeading)
+            .frame(minHeight: 140, alignment: .topLeading)
            .frame(maxWidth: .infinity, alignment: .leading)
    }

@@ -78,7 +74,7 @@ struct GroupWelcomeView: View {
                        }
                        .padding(.horizontal, -5)
                        .padding(.top, -8)
-                        .frame(height: 130, alignment: .topLeading)
+                        .frame(height: 140, alignment: .topLeading)
                        .frame(maxWidth: .infinity, alignment: .leading)
                    }
                } else {
@@ -97,9 +93,6 @@ struct GroupWelcomeView: View {
                }
                .disabled(welcomeText.isEmpty)
                copyButton()
-            } footer: {
-                Text(!welcomeTextFitsLimit() ? "Message too large" : "")
-                    .foregroundColor(.red)
            }

            Section {
@@ -120,15 +113,7 @@ struct GroupWelcomeView: View {
        Button("Save and update group profile") {
            save()
        }
-        .disabled(welcomeTextUnchanged() || !welcomeTextFitsLimit())
-    }
-
-    private func welcomeTextUnchanged() -> Bool {
-        welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil)
-    }
-
-    private func welcomeTextFitsLimit() -> Bool {
-        chatJsonLength(welcomeText) <= maxByteCount
+        .disabled(welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil))
    }

    private func save() {
@@ -138,13 +123,11 @@ struct GroupWelcomeView: View {
                if welcome?.count == 0 {
                    welcome = nil
                }
-                groupProfile.description = welcome
-                let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
-                await MainActor.run {
-                    groupInfo = gInfo
-                    ChatModel.shared.updateGroup(gInfo)
-                    dismiss()
-                }
+                var groupProfileUpdated = groupInfo.groupProfile
+                groupProfileUpdated.description = welcome
+                groupInfo = try await apiUpdateGroup(groupId, groupProfileUpdated)
+                m.updateGroup(groupInfo)
+                welcomeText = welcome ?? ""
            } catch let error {
                logger.error("apiUpdateGroup error: \(responseError(error))")
            }
@@ -154,6 +137,6 @@ struct GroupWelcomeView: View {

 struct GroupWelcomeView_Previews: PreviewProvider {
    static var previews: some View {
-        GroupProfileView(groupInfo: Binding.constant(GroupInfo.sampleData), groupProfile: GroupProfile.sampleData)
+        GroupWelcomeView(groupId: 1, groupInfo: Binding.constant(GroupInfo.sampleData))
    }
 }
@@ -92,7 +92,7 @@ struct ChatListNavLink: View {
                .swipeActions(edge: .leading, allowsFullSwipe: true) {
                    markReadButton()
                    toggleFavoriteButton()
-                    ToggleNtfsButton(chat: chat)
+                    toggleNtfsButton(chat)
                }
                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                    if !chat.chatItems.isEmpty {
@@ -181,7 +181,7 @@ struct ChatListNavLink: View {
            .swipeActions(edge: .leading, allowsFullSwipe: true) {
                markReadButton()
                toggleFavoriteButton()
-                ToggleNtfsButton(chat: chat)
+                toggleNtfsButton(chat)
            }
            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                if !chat.chatItems.isEmpty {
@@ -92,7 +92,8 @@ struct ChatListView: View {
            ToolbarItem(placement: .navigationBarLeading) {
                let user = chatModel.currentUser ?? User.sampleData
                ZStack(alignment: .topTrailing) {
-                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
+                    ProfileImage(imageStr: user.image, color: Color(uiColor: .quaternaryLabel))
+                        .frame(width: 32, height: 32)
                        .padding(.trailing, 4)
                    let allRead = chatModel.users
                        .filter { u in !u.user.activeUser && !u.user.hidden }
@@ -263,9 +264,7 @@ struct ChatListView: View {
        }

        func filtered(_ chat: Chat) -> Bool {
-            (chat.chatInfo.chatSettings?.favorite ?? false) ||
-            chat.chatStats.unreadChat ||
-            (chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0)
+            (chat.chatInfo.chatSettings?.favorite ?? false) || chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
        }

        func viewNameContains(_ cInfo: ChatInfo, _ s: String) -> Bool {
@@ -23,7 +23,8 @@ struct ChatPreviewView: View {
        let cItem = chat.chatItems.last
        return HStack(spacing: 8) {
            ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat, size: 63)
+                ChatInfoImage(chat: chat)
+                    .frame(width: 63, height: 63)
                chatPreviewImageOverlayIcon()
                    .padding([.bottom, .trailing], 1)
            }
@@ -33,7 +34,7 @@ struct ChatPreviewView: View {
                HStack(alignment: .top) {
                    chatPreviewTitle()
                    Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.updatedAt))
                        .font(.subheadline)
                        .frame(minWidth: 60, alignment: .trailing)
                        .foregroundColor(.secondary)
@@ -170,21 +171,10 @@ struct ChatPreviewView: View {
    }

    func chatItemPreview(_ cItem: ChatItem) -> Text {
-        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
+        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
        let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)

-        // same texts are in markedDeletedText in MarkedDeletedItemView, but it returns LocalizedStringKey;
-        // can be refactored into a single function if functions calling these are changed to return same type
-        func markedDeletedText() -> String {
-            switch cItem.meta.itemDeleted {
-            case let .moderated(_, byGroupMember): String.localizedStringWithFormat(NSLocalizedString("moderated by %@", comment: "marked deleted chat item preview text"), byGroupMember.displayName)
-            case .blocked: NSLocalizedString("blocked", comment: "marked deleted chat item preview text")
-            case .blockedByAdmin: NSLocalizedString("blocked by admin", comment: "marked deleted chat item preview text")
-            case .deleted, nil: NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
-            }
-        }
-
        func attachment() -> String? {
            switch cItem.content.msgContent {
            case .file: return "doc.fill"
@@ -240,14 +230,14 @@ struct ChatPreviewView: View {

    private func itemStatusMark(_ cItem: ChatItem) -> Text {
        switch cItem.meta.itemStatus {
-        case .sndErrorAuth, .sndError:
+        case .sndErrorAuth:
            return Text(Image(systemName: "multiply"))
                .font(.caption)
                .foregroundColor(.red) + Text(" ")
-        case .sndWarning:
+        case .sndError:
            return Text(Image(systemName: "exclamationmark.triangle.fill"))
                .font(.caption)
-                .foregroundColor(.orange) + Text(" ")
+                .foregroundColor(.yellow) + Text(" ")
        default: return Text("")
        }
    }
@@ -16,7 +16,8 @@ struct ContactRequestView: View {

    var body: some View {
        HStack(spacing: 8) {
-            ChatInfoImage(chat: chat, size: 63)
+            ChatInfoImage(chat: chat)
+                .frame(width: 63, height: 63)
                .padding(.leading, 4)
            VStack(alignment: .leading, spacing: 0) {
                HStack(alignment: .top) {
@@ -12,7 +12,6 @@ private let fillColorLight = Color(uiColor: UIColor(red: 0.99, green: 0.99, blue
 struct UserPicker: View {
    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
-    @Environment(\.scenePhase) var scenePhase
    @Binding var showSettings: Bool
    @Binding var showConnectDesktop: Bool
    @Binding var userPickerVisible: Bool
@@ -92,10 +91,7 @@ struct UserPicker: View {
        .opacity(userPickerVisible ? 1.0 : 0.0)
        .onAppear {
            do {
-                // This check prevents the call of listUsers after the app is suspended, and the database is closed.
-                if case .active = scenePhase {
-                    m.users = try listUsers()
-                }
+                m.users = try listUsers()
            } catch let error {
                logger.error("Error loading users \(responseError(error))")
            }
@@ -127,7 +123,8 @@ struct UserPicker: View {
            }
        }, label: {
            HStack(spacing: 0) {
-                ProfileImage(imageStr: user.image, size: 44, color: Color(uiColor: .tertiarySystemFill))
+                ProfileImage(imageStr: user.image, color: Color(uiColor: .tertiarySystemFill))
+                    .frame(width: 44, height: 44)
                    .padding(.trailing, 12)
                Text(user.chatViewName)
                    .fontWeight(user.activeUser ? .medium : .regular)
@@ -36,7 +36,6 @@ enum DatabaseEncryptionAlert: Identifiable {
 struct DatabaseEncryptionView: View {
    @EnvironmentObject private var m: ChatModel
    @Binding var useKeychain: Bool
-    var migration: Bool
    @State private var alert: DatabaseEncryptionAlert? = nil
    @State private var progressIndicator = false
    @State private var useKeychainToggle = storeDBPassphraseGroupDefault.get()
@@ -49,12 +48,7 @@ struct DatabaseEncryptionView: View {

    var body: some View {
        ZStack {
-            List {
-                if migration {
-                    chatStoppedView()
-                }
-                databaseEncryptionView()
-            }
+            databaseEncryptionView()
            if progressIndicator {
                ProgressView().scaleEffect(2)
            }
@@ -62,71 +56,72 @@ struct DatabaseEncryptionView: View {
    }

    private func databaseEncryptionView() -> some View {
-        Section {
-            settingsRow(storedKey ? "key.fill" : "key", color: storedKey ? .green : .secondary) {
-                Toggle("Save passphrase in Keychain", isOn: $useKeychainToggle)
+        List {
+            Section {
+                settingsRow(storedKey ? "key.fill" : "key", color: storedKey ? .green : .secondary) {
+                    Toggle("Save passphrase in Keychain", isOn: $useKeychainToggle)
                    .onChange(of: useKeychainToggle) { _ in
                        if useKeychainToggle {
                            setUseKeychain(true)
-                        } else if storedKey && !migration {
-                            // Don't show in migration process since it will remove the key after successfull encryption
+                        } else if storedKey {
                            alert = .keychainRemoveKey
                        } else {
                            setUseKeychain(false)
                        }
                    }
-                    .disabled(initialRandomDBPassphrase && !migration)
-            }
-
-            if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
-                PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-            }
-
-            PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
-            PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
-
-            settingsRow("lock.rotation") {
-                Button(migration ? "Set passphrase" : "Update database passphrase") {
-                    alert = currentKey == ""
-                    ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
-                    : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                    .disabled(initialRandomDBPassphrase)
                }
-            }
-            .disabled(
-                (m.chatDbEncrypted == true && currentKey == "") ||
-                currentKey == newKey ||
-                newKey != confirmNewKey ||
-                newKey == "" ||
-                !validKey(currentKey) ||
-                !validKey(newKey)
-            )
-        } header: {
-            Text(migration ? "Database passphrase" : "")
-        } footer: {
-            VStack(alignment: .leading, spacing: 16) {
-                if m.chatDbEncrypted == false {
-                    Text("Your chat database is not encrypted - set passphrase to encrypt it.")
-                } else if useKeychain {
-                    if storedKey {
-                        Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
-                        if initialRandomDBPassphrase && !migration {
-                            Text("Database is encrypted using a random passphrase, you can change it.")
+
+                if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
+                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
+                }
+
+                PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
+                PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
+
+                settingsRow("lock.rotation") {
+                    Button("Update database passphrase") {
+                        alert = currentKey == ""
+                        ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
+                        : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                    }
+                }
+                .disabled(
+                    (m.chatDbEncrypted == true && currentKey == "") ||
+                    currentKey == newKey ||
+                    newKey != confirmNewKey ||
+                    newKey == "" ||
+                    !validKey(currentKey) ||
+                    !validKey(newKey)
+                )
+            } header: {
+                Text("")
+            } footer: {
+                VStack(alignment: .leading, spacing: 16) {
+                    if m.chatDbEncrypted == false {
+                        Text("Your chat database is not encrypted - set passphrase to encrypt it.")
+                    } else if useKeychain {
+                        if storedKey {
+                            Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
+                            if initialRandomDBPassphrase {
+                                Text("Database is encrypted using a random passphrase, you can change it.")
+                            } else {
+                                Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                            }
                        } else {
-                            Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                            Text("iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications.")
                        }
                    } else {
-                        Text("iOS Keychain will be used to securely store passphrase after you restart the app or change passphrase - it will allow receiving push notifications.")
-                    }
-                } else {
-                    Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
-                    Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
-                    if  m.notificationMode == .instant && m.notificationPreview != .hidden && !migration {
-                        Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
+                        Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
+                        Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
+                        if  m.notificationMode == .instant && m.notificationPreview != .hidden {
+                            Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
+                        }
                    }
                }
+                .padding(.top, 1)
+                .font(.callout)
            }
-            .padding(.top, 1)
-            .font(.callout)
        }
        .onAppear {
            if initialRandomDBPassphrase { currentKey = kcDatabasePassword.get() ?? "" }
@@ -141,15 +136,9 @@ struct DatabaseEncryptionView: View {
            do {
                encryptionStartedDefault.set(true)
                encryptionStartedAtDefault.set(Date.now)
-                if !m.chatDbChanged {
-                    try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-                }
                try await apiStorageEncryption(currentKey: currentKey, newKey: newKey)
                encryptionStartedDefault.set(false)
                initialRandomDBPassphraseGroupDefault.set(false)
-                if migration {
-                    storeDBPassphraseGroupDefault.set(useKeychain)
-                }
                if useKeychain {
                    if kcDatabasePassword.set(newKey) {
                        await resetFormAfterEncryption(true)
@@ -159,9 +148,6 @@ struct DatabaseEncryptionView: View {
                        await operationEnded(.error(title: "Keychain error", error: "Error saving passphrase to keychain"))
                    }
                } else {
-                    if migration {
-                        removePassphraseFromKeyChain()
-                    }
                    await resetFormAfterEncryption()
                    await operationEnded(.databaseEncrypted)
                }
@@ -188,10 +174,7 @@ struct DatabaseEncryptionView: View {

    private func setUseKeychain(_ value: Bool) {
        useKeychain = value
-        // Postpone it when migrating to the end of encryption process
-        if !migration {
-            storeDBPassphraseGroupDefault.set(value)
-        }
+        storeDBPassphraseGroupDefault.set(value)
    }

    private func databaseEncryptionAlert(_ alertItem: DatabaseEncryptionAlert) -> Alert {
@@ -201,7 +184,13 @@ struct DatabaseEncryptionView: View {
                title: Text("Remove passphrase from keychain?"),
                message: Text("Instant push notifications will be hidden!\n") + storeSecurelyDanger(),
                primaryButton: .destructive(Text("Remove")) {
-                    removePassphraseFromKeyChain()
+                    if kcDatabasePassword.remove() {
+                        logger.debug("passphrase removed from keychain")
+                        setUseKeychain(false)
+                        storedKey = false
+                    } else {
+                        alert = .error(title: "Keychain error", error: "Failed to remove passphrase")
+                    }
                },
                secondaryButton: .cancel() {
                    withAnimation { useKeychainToggle = true }
@@ -247,16 +236,6 @@ struct DatabaseEncryptionView: View {
        }
    }

-    private func removePassphraseFromKeyChain() {
-        if kcDatabasePassword.remove() {
-            logger.debug("passphrase removed from keychain")
-            setUseKeychain(false)
-            storedKey = false
-        } else {
-            alert = .error(title: "Keychain error", error: "Failed to remove passphrase")
-        }
-    }
-
    private func storeSecurelySaved() -> Text {
        Text("Please store passphrase securely, you will NOT be able to change it if you lose it.")
    }
@@ -367,6 +346,6 @@ func validKey(_ s: String) -> Bool {

 struct DatabaseEncryptionView_Previews: PreviewProvider {
    static var previews: some View {
-        DatabaseEncryptionView(useKeychain: Binding.constant(true), migration: false)
+        DatabaseEncryptionView(useKeychain: Binding.constant(true))
    }
 }
@@ -64,7 +64,7 @@ struct DatabaseErrorView: View {
                case let .migrationError(mtrError):
                    titleText("Incompatible database version")
                    fileNameText(dbFile)
-                    Text("Error: ") + Text(DatabaseErrorView.mtrErrorDescription(mtrError))
+                    Text("Error: ") + Text(mtrErrorDescription(mtrError))
                }
            case let .errorSQL(dbFile, migrationSQLError):
                titleText("Database error")
@@ -105,7 +105,7 @@ struct DatabaseErrorView: View {
        Text("Migrations: \(ms.joined(separator: ", "))")
    }

-    static func mtrErrorDescription(_ err: MTRError) -> LocalizedStringKey {
+    private func mtrErrorDescription(_ err: MTRError) -> LocalizedStringKey {
        switch err {
        case let .noDown(dbMigrations):
            return "database version is newer than the app, but no down migration for: \(dbMigrations.joined(separator: ", "))"
@@ -116,7 +116,7 @@ struct DatabaseView: View {
                let color: Color = unencrypted ? .orange : .secondary
                settingsRow(unencrypted ? "lock.open" : useKeychain ? "key" : "lock", color: color) {
                    NavigationLink {
-                        DatabaseEncryptionView(useKeychain: $useKeychain, migration: false)
+                        DatabaseEncryptionView(useKeychain: $useKeychain)
                            .navigationTitle("Database passphrase")
                    } label: {
                        Text("Database passphrase")
@@ -485,10 +485,6 @@ func deleteChatAsync() async throws {
    _ = kcDatabasePassword.remove()
    storeDBPassphraseGroupDefault.set(true)
    deleteAppDatabaseAndFiles()
-    // Clean state so when creating new user the app will start chat automatically (see CreateProfile:createProfile())
-    DispatchQueue.main.async {
-        ChatModel.shared.users = []
-    }
 }

 struct DatabaseView_Previews: PreviewProvider {
@@ -188,7 +188,6 @@ struct MigrateToAppGroupView: View {
        let config = ArchiveConfig(archivePath: getDocumentsDirectory().appendingPathComponent(archiveName).path)
        Task {
            do {
-                try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
                try await apiExportArchive(config: config)
                await MainActor.run { setV3DBMigration(.exported) }
            } catch let error {
@@ -205,11 +204,7 @@ struct MigrateToAppGroupView: View {
                resetChatCtrl()
                try await MainActor.run { try initializeChat(start: false) }
                let _ = try await apiImportArchive(config: config)
-                let appSettings = try apiGetAppSettings(settings: AppSettings.current.prepareForExport())
-                await MainActor.run {
-                    appSettings.importIntoApp()
-                    setV3DBMigration(.migrated)
-                }
+                await MainActor.run { setV3DBMigration(.migrated) }
            } catch let error {
                dbContainerGroupDefault.set(.documents)
                await MainActor.run {
@@ -221,22 +216,16 @@ struct MigrateToAppGroupView: View {
    }
 }

-func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
+func exportChatArchive() async throws -> URL {
    let archiveTime = Date.now
    let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
    let archiveName = "simplex-chat.\(ts).zip"
-    let archivePath = (storagePath ?? getDocumentsDirectory()).appendingPathComponent(archiveName)
+    let archivePath = getDocumentsDirectory().appendingPathComponent(archiveName)
    let config = ArchiveConfig(archivePath: archivePath.path)
-    // Settings should be saved before changing a passphrase, otherwise the database needs to be migrated first
-    if !ChatModel.shared.chatDbChanged {
-        try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-    }
    try await apiExportArchive(config: config)
-    if storagePath == nil {
-        deleteOldArchive()
-        UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
-        chatArchiveTimeDefault.set(archiveTime)
-    }
+    deleteOldArchive()
+    UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
+    chatArchiveTimeDefault.set(archiveTime)
    return archivePath
 }

@@ -12,7 +12,6 @@ import SimpleXChat
 struct ChatInfoImage: View {
    @Environment(\.colorScheme) var colorScheme
    @ObservedObject var chat: Chat
-    var size: CGFloat
    var color = Color(uiColor: .tertiarySystemGroupedBackground)

    var body: some View {
@@ -29,7 +28,6 @@ struct ChatInfoImage: View {
        return ProfileImage(
            imageStr: chat.chatInfo.image,
            iconName: iconName,
-            size: size,
            color: iconColor
        )
    }
@@ -38,9 +36,8 @@ struct ChatInfoImage: View {
 struct ChatInfoImage_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoImage(
-            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
-            size: 63,
-            color:  Color(red: 0.9, green: 0.9, blue: 0.9)
+            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
+            , color:  Color(red: 0.9, green: 0.9, blue: 0.9)
        )
        .previewLayout(.fixed(width: 63, height: 63))
    }
@@ -11,43 +11,28 @@ import UIKit
 import SwiftUI

 extension View {
-    func uiKitContextMenu(hasImageOrVideo: Bool, maxWidth: CGFloat, itemWidth: Binding<CGFloat>, menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
-        Group {
-            if allowMenu.wrappedValue {
-                if hasImageOrVideo {
-                    InteractionView(content:
-                        self.environmentObject(ChatModel.shared)
-                        .overlay(DetermineWidthImageVideoItem())
-                        .onPreferenceChange(DetermineWidthImageVideoItem.Key.self) { itemWidth.wrappedValue = $0 == 0 ? maxWidth : $0 }
-                    , maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
-                    .frame(maxWidth: itemWidth.wrappedValue)
-                } else {
-                    InteractionView(content: self.environmentObject(ChatModel.shared), maxWidth: maxWidth, itemWidth: itemWidth, menu: menu)
-                        .fixedSize(horizontal: true, vertical: false)
+    func uiKitContextMenu(menu: Binding<UIMenu>, allowMenu: Binding<Bool>) -> some View {
+            self.overlay {
+                if allowMenu.wrappedValue {
+                    self.overlay(Color(uiColor: .systemBackground)).overlay(InteractionView(content: self, menu: menu))
                }
-            } else {
-                self
            }
-        }
    }
 }

-private class HostingViewHolder: UIView {
-    var contentSize: CGSize = CGSizeMake(0, 0)
-    override var intrinsicContentSize: CGSize { get { contentSize } }
+private struct InteractionConfig<Content: View> {
+    let content: Content
+    let menu: UIMenu
 }

-struct InteractionView<Content: View>: UIViewRepresentable {
+private struct InteractionView<Content: View>: UIViewRepresentable {
    let content: Content
-    var maxWidth: CGFloat
-    var itemWidth: Binding<CGFloat>
    @Binding var menu: UIMenu

    func makeUIView(context: Context) -> UIView {
-        let view = HostingViewHolder()
+        let view = UIView()
        view.backgroundColor = .clear
        let hostView = UIHostingController(rootView: content)
-        view.contentSize = hostView.view.intrinsicContentSize
        hostView.view.translatesAutoresizingMaskIntoConstraints = false
        let constraints = [
            hostView.view.topAnchor.constraint(equalTo: view.topAnchor),
@@ -59,20 +44,12 @@ struct InteractionView<Content: View>: UIViewRepresentable {
        ]
        view.addSubview(hostView.view)
        view.addConstraints(constraints)
-        view.layer.cornerRadius = 18
-        hostView.view.layer.cornerRadius = 18
        let menuInteraction = UIContextMenuInteraction(delegate: context.coordinator)
        view.addInteraction(menuInteraction)
        return view
    }

-    func updateUIView(_ uiView: UIView, context: Context) {
-        let was = (uiView as! HostingViewHolder).contentSize
-        (uiView as! HostingViewHolder).contentSize = uiView.subviews[0].sizeThatFits(CGSizeMake(itemWidth.wrappedValue, .infinity))
-        if was != (uiView as! HostingViewHolder).contentSize {
-            uiView.invalidateIntrinsicContentSize()
-        }
-    }
+    func updateUIView(_ uiView: UIView, context: Context) {}

    func makeCoordinator() -> Coordinator {
        Coordinator(self)
@@ -21,19 +21,6 @@ struct DetermineWidth: View {
    }
 }

-struct DetermineWidthImageVideoItem: View {
-    typealias Key = MaximumWidthImageVideoPreferenceKey
-    var body: some View {
-        GeometryReader { proxy in
-            Color.clear
-                .preference(
-                    key: MaximumWidthImageVideoPreferenceKey.self,
-                    value: proxy.size.width
-                )
-        }
-    }
-}
-
 struct MaximumWidthPreferenceKey: PreferenceKey {
    static var defaultValue: CGFloat = 0
    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
@@ -41,13 +28,6 @@ struct MaximumWidthPreferenceKey: PreferenceKey {
    }
 }

-struct MaximumWidthImageVideoPreferenceKey: PreferenceKey {
-    static var defaultValue: CGFloat = 0
-    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
 struct DetermineWidth_Previews: PreviewProvider {
    static var previews: some View {
        DetermineWidth()
@@ -9,51 +9,29 @@
 import SwiftUI
 import SimpleXChat

-let defaultProfileImageCorner = 22.5
-
 struct ProfileImage: View {
    var imageStr: String? = nil
    var iconName: String = "person.crop.circle.fill"
-    var size: CGFloat
    var color = Color(uiColor: .tertiarySystemGroupedBackground)
-    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
-
+    
    var body: some View {
        if let image = imageStr,
           let data = Data(base64Encoded: dropImagePrefix(image)),
           let uiImage = UIImage(data: data) {
-            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius)
+            Image(uiImage: uiImage)
+                .resizable()
+                .clipShape(Circle())
        } else {
            Image(systemName: iconName)
                .resizable()
                .foregroundColor(color)
-                .frame(width: size, height: size)
        }
    }
 }

-private let squareToCircleRatio = 0.935
-
-private let radiusFactor = (1 - squareToCircleRatio) / 50
-
-@ViewBuilder func clipProfileImage(_ img: Image, size: CGFloat, radius: Double) -> some View {
-    let v = img.resizable()
-    if radius >= 50 {
-        v.frame(width: size, height: size).clipShape(Circle())
-    } else if radius <= 0 {
-        let sz = size * squareToCircleRatio
-        v.frame(width: sz, height: sz).padding((size - sz) / 2)
-    } else {
-        let sz = size * (squareToCircleRatio + radius * radiusFactor)
-        v.frame(width: sz, height: sz)
-        .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
-        .padding((size - sz) / 2)
-    }
-}
-
 struct ProfileImage_Previews: PreviewProvider {
    static var previews: some View {
-        ProfileImage(imageStr: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAKHGlDQ1BJQ0MgUHJvZmlsZQAASImFVgdUVNcWve9Nb7QZeu9NehtAem/Sq6gMQ28OQxWxgAQjEFFEREARNFQFg1KjiIhiIQgoYA9IEFBisCAq6OQNJNH4//r/zDpz9ttzz7n73ffWmg0A6QCDxYqD+QCIT0hmezlYywQEBsngngEYCAIy0AC6DGYSy8rDwxUg8Xf9d7wbAxC33tHgzvrP3/9nCISFJzEBgIIRTGey2MkILkawT1oyi4tnEUxjI6IQvMLFkauYqxjQQtewwuoaHy8bBNMBwJMZDHYkAERbhJdJZUYic4hhCNZOCItOQDB3vjkzioFwxLsIXhcRl5IOAImrRzs+fivCk7QRrIL0shAcwNUW+tX8yH/tFfrPXgxG5D84Pi6F+dc9ck+HHJ7g641UMSQlQATQBHEgBaQDGcACbLAVYaIRJhx5Dv+9j77aZ4OsZIFtSEc0iARRIBnpt/9qlvfqpGSQBhjImnCEcUU+NtxnujZy4fbqVEiU/wuXdQyA9S0cDqfzC+e2F4DzyLkSB79wyi0A8KoBcL2GmcJOXePQ3C8MIAJeQAOiQArIAxXuWwMMgSmwBHbAGbgDHxAINgMmojceUZUGMkEWyAX54AA4DMpAJTgJ6sAZ0ALawQVwGVwDt8AQGAUPwQSYBi/AAngHliEIwkEUiAqJQtKQIqQO6UJ0yByyg1whLygQCoEioQQoBcqE9kD5UBFUBlVB9dBPUCd0GboBDUP3oUloDnoNfYRRMBmmwZKwEqwF02Er2AX2gTfBkXAinAHnwPvhUrgaPg23wZfhW/AoPAG/gBdRAEVCCaFkURooOsoG5Y4KQkWg2KidqDxUCaoa1YTqQvWj7qAmUPOoD2gsmoqWQWugTdGOaF80E52I3okuQJeh69Bt6D70HfQkegH9GUPBSGDUMSYYJ0wAJhKThsnFlGBqMK2Yq5hRzDTmHRaLFcIqY42wjthAbAx2O7YAewzbjO3BDmOnsIs4HE4Up44zw7njGLhkXC7uKO407hJuBDeNe48n4aXxunh7fBA+AZ+NL8E34LvxI/gZ/DKBj6BIMCG4E8II2wiFhFOELsJtwjRhmchPVCaaEX2IMcQsYimxiXiV+Ij4hkQiyZGMSZ6kaNJuUinpLOk6aZL0gSxAViPbkIPJKeT95FpyD/k++Q2FQlGiWFKCKMmU/ZR6yhXKE8p7HiqPJo8TTxjPLp5ynjaeEZ6XvAReRV4r3s28GbwlvOd4b/PO8xH4lPhs+Bh8O/nK+Tr5xvkW+an8Ovzu/PH8BfwN/Df4ZwVwAkoCdgJhAjkCJwWuCExRUVR5qg2VSd1DPUW9Sp2mYWnKNCdaDC2fdoY2SFsQFBDUF/QTTBcsF7woOCGEElISchKKEyoUahEaE/ooLClsJRwuvE+4SXhEeElEXMRSJFwkT6RZZFTko6iMqJ1orOhB0XbRx2JoMTUxT7E0seNiV8XmxWnipuJM8TzxFvEHErCEmoSXxHaJkxIDEouSUpIOkizJo5JXJOelhKQspWKkiqW6peakqdLm0tHSxdKXpJ/LCMpYycTJlMr0ySzISsg6yqbIVskOyi7LKcv5ymXLNcs9lifK0+Uj5Ivle+UXFKQV3BQyFRoVHigSFOmKUYpHFPsVl5SUlfyV9iq1K80qiyg7KWcoNyo/UqGoWKgkqlSr3FXFqtJVY1WPqQ6pwWoGalFq5Wq31WF1Q/Vo9WPqw+sw64zXJayrXjeuQdaw0kjVaNSY1BTSdNXM1mzXfKmloBWkdVCrX+uztoF2nPYp7Yc6AjrOOtk6XTqvddV0mbrlunf1KHr2erv0OvRe6avrh+sf179nQDVwM9hr0GvwydDIkG3YZDhnpGAUYlRhNE6n0T3oBfTrxhhja+NdxheMP5gYmiSbtJj8YaphGmvaYDq7Xnl9+PpT66fM5MwYZlVmE+Yy5iHmJ8wnLGQtGBbVFk8t5S3DLGssZ6xUrWKsTlu9tNa2Zlu3Wi/ZmNjssOmxRdk62ObZDtoJ2Pnaldk9sZezj7RvtF9wMHDY7tDjiHF0cTzoOO4k6cR0qndacDZy3uHc50J28XYpc3nqqubKdu1yg92c3Q65PdqguCFhQ7s7cHdyP+T+2EPZI9HjZ0+sp4dnueczLx2vTK9+b6r3Fu8G73c+1j6FPg99VXxTfHv9eP2C/er9lvxt/Yv8JwK0AnYE3AoUC4wO7AjCBfkF1QQtbrTbeHjjdLBBcG7w2CblTembbmwW2xy3+eIW3i2MLedCMCH+IQ0hKwx3RjVjMdQptCJ0gWnDPMJ8EWYZVhw2F24WXhQ+E2EWURQxG2kWeShyLsoiqiRqPtomuiz6VYxjTGXMUqx7bG0sJ84/rjkeHx8S35kgkBCb0LdVamv61mGWOiuXNZFokng4cYHtwq5JgpI2JXUk05A/0oEUlZTvUiZTzVPLU9+n+aWdS+dPT0gf2Ka2bd+2mQz7jB+3o7czt/dmymZmZU7usNpRtRPaGbqzd5f8rpxd07sddtdlEbNis37J1s4uyn67x39PV45kzu6cqe8cvmvM5cll547vNd1b+T36++jvB/fp7Tu673NeWN7NfO38kvyVAmbBzR90fij9gbM/Yv9goWHh8QPYAwkHxg5aHKwr4i/KKJo65HaorVimOK/47eEth2+U6JdUHiEeSTkyUepa2nFU4eiBoytlUWWj5dblzRUSFfsqlo6FHRs5bnm8qVKyMr/y44noE/eqHKraqpWqS05iT6aefHbK71T/j/Qf62vEavJrPtUm1E7UedX11RvV1zdINBQ2wo0pjXOng08PnbE909Gk0VTVLNScfxacTTn7/KeQn8ZaXFp6z9HPNZ1XPF/RSm3Na4PatrUttEe1T3QEdgx3Onf2dpl2tf6s+XPtBdkL5RcFLxZ2E7tzujmXMi4t9rB65i9HXp7q3dL78ErAlbt9nn2DV12uXr9mf+1Kv1X/petm1y/cMLnReZN+s/2W4a22AYOB1l8MfmkdNBxsu210u2PIeKhreP1w94jFyOU7tneu3XW6e2t0w+jwmO/YvfHg8Yl7Yfdm78fdf/Ug9cHyw92PMI/yHvM9Lnki8aT6V9VfmycMJy5O2k4OPPV++nCKOfXit6TfVqZznlGelcxIz9TP6s5emLOfG3q+8fn0C9aL5fnc3/l/r3ip8vL8H5Z/DCwELEy/Yr/ivC54I/qm9q3+295Fj8Un7+LfLS/lvRd9X/eB/qH/o//HmeW0FdxK6SfVT12fXT4/4sRzOCwGm7FqBVBIwhERALyuBYASCAB1CPEPG9f8119+BvrK2fyNwVndL5jhvubRVsMQgCakeCFp04OsQ1LJEgAe5NodqT6WANbT+yf/iqQIPd21PXgaAcDJcjivtwJAQHLFgcNZ9uBwPlUgYhHf1z37f7V9g9e8ITewiP88wfWIYET6HPg21nzjV2fybQVcxfrg2/onng/F50lD/ccAAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAABigAwAEAAAAAQAAABgAAAAAwf1XlwAAAaNJREFUSA3FlT1LA0EQQBN/gYUYRTksJZVgEbCR/D+7QMr8ABtttBBCsLGzsLG2sxaxED/ie4d77u0dyaE5HHjczn7MzO7M7nU6/yXz+bwLhzCCjTQO+rZhDH3opuNLdRYN4RHe4RIKJ7R34Ro+4AEGSw2mE1iUwT18gpI74WvkGlccu4XNdH0jnYU7cAUacidn37qR23cOxc4aGU0nYUAn7iSWEHkz46w0ocdQu1X6B/AMQZ5o7KfBqNOfwRH8JB7FajGhnmcpKvQe3MEbvILiDm5gPXaCHnZr4vvFGMoEKudKn8YvQIOOe+YzCPop7dwJ3zRfJ7GDuso4YJGRa0yZgg4tUaNXdGrbuZWKKxzYYEJc2xp9AUUjGt8KC2jvgYadF8+10vJyDnNLXwbdiWUZi0fUK01Eoc+AZhCLZVzK4Vq6sDUdz+0dEcbbTTIOJmAyTVhx/WmvrExbv2jtPhWLKodjCtefZiEeZeVZWWSndgwj6fVf3XON8Qwq15++uoqrfYVrow6dGBpCq79ME291jaB0/Q2CPncyht/99MNO/vr9AqW/CGi8sJqbAAAAAElFTkSuQmCC", size: 63)
+        ProfileImage(imageStr: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAKHGlDQ1BJQ0MgUHJvZmlsZQAASImFVgdUVNcWve9Nb7QZeu9NehtAem/Sq6gMQ28OQxWxgAQjEFFEREARNFQFg1KjiIhiIQgoYA9IEFBisCAq6OQNJNH4//r/zDpz9ttzz7n73ffWmg0A6QCDxYqD+QCIT0hmezlYywQEBsngngEYCAIy0AC6DGYSy8rDwxUg8Xf9d7wbAxC33tHgzvrP3/9nCISFJzEBgIIRTGey2MkILkawT1oyi4tnEUxjI6IQvMLFkauYqxjQQtewwuoaHy8bBNMBwJMZDHYkAERbhJdJZUYic4hhCNZOCItOQDB3vjkzioFwxLsIXhcRl5IOAImrRzs+fivCk7QRrIL0shAcwNUW+tX8yH/tFfrPXgxG5D84Pi6F+dc9ck+HHJ7g641UMSQlQATQBHEgBaQDGcACbLAVYaIRJhx5Dv+9j77aZ4OsZIFtSEc0iARRIBnpt/9qlvfqpGSQBhjImnCEcUU+NtxnujZy4fbqVEiU/wuXdQyA9S0cDqfzC+e2F4DzyLkSB79wyi0A8KoBcL2GmcJOXePQ3C8MIAJeQAOiQArIAxXuWwMMgSmwBHbAGbgDHxAINgMmojceUZUGMkEWyAX54AA4DMpAJTgJ6sAZ0ALawQVwGVwDt8AQGAUPwQSYBi/AAngHliEIwkEUiAqJQtKQIqQO6UJ0yByyg1whLygQCoEioQQoBcqE9kD5UBFUBlVB9dBPUCd0GboBDUP3oUloDnoNfYRRMBmmwZKwEqwF02Er2AX2gTfBkXAinAHnwPvhUrgaPg23wZfhW/AoPAG/gBdRAEVCCaFkURooOsoG5Y4KQkWg2KidqDxUCaoa1YTqQvWj7qAmUPOoD2gsmoqWQWugTdGOaF80E52I3okuQJeh69Bt6D70HfQkegH9GUPBSGDUMSYYJ0wAJhKThsnFlGBqMK2Yq5hRzDTmHRaLFcIqY42wjthAbAx2O7YAewzbjO3BDmOnsIs4HE4Up44zw7njGLhkXC7uKO407hJuBDeNe48n4aXxunh7fBA+AZ+NL8E34LvxI/gZ/DKBj6BIMCG4E8II2wiFhFOELsJtwjRhmchPVCaaEX2IMcQsYimxiXiV+Ij4hkQiyZGMSZ6kaNJuUinpLOk6aZL0gSxAViPbkIPJKeT95FpyD/k++Q2FQlGiWFKCKMmU/ZR6yhXKE8p7HiqPJo8TTxjPLp5ynjaeEZ6XvAReRV4r3s28GbwlvOd4b/PO8xH4lPhs+Bh8O/nK+Tr5xvkW+an8Ovzu/PH8BfwN/Df4ZwVwAkoCdgJhAjkCJwWuCExRUVR5qg2VSd1DPUW9Sp2mYWnKNCdaDC2fdoY2SFsQFBDUF/QTTBcsF7woOCGEElISchKKEyoUahEaE/ooLClsJRwuvE+4SXhEeElEXMRSJFwkT6RZZFTko6iMqJ1orOhB0XbRx2JoMTUxT7E0seNiV8XmxWnipuJM8TzxFvEHErCEmoSXxHaJkxIDEouSUpIOkizJo5JXJOelhKQspWKkiqW6peakqdLm0tHSxdKXpJ/LCMpYycTJlMr0ySzISsg6yqbIVskOyi7LKcv5ymXLNcs9lifK0+Uj5Ivle+UXFKQV3BQyFRoVHigSFOmKUYpHFPsVl5SUlfyV9iq1K80qiyg7KWcoNyo/UqGoWKgkqlSr3FXFqtJVY1WPqQ6pwWoGalFq5Wq31WF1Q/Vo9WPqw+sw64zXJayrXjeuQdaw0kjVaNSY1BTSdNXM1mzXfKmloBWkdVCrX+uztoF2nPYp7Yc6AjrOOtk6XTqvddV0mbrlunf1KHr2erv0OvRe6avrh+sf179nQDVwM9hr0GvwydDIkG3YZDhnpGAUYlRhNE6n0T3oBfTrxhhja+NdxheMP5gYmiSbtJj8YaphGmvaYDq7Xnl9+PpT66fM5MwYZlVmE+Yy5iHmJ8wnLGQtGBbVFk8t5S3DLGssZ6xUrWKsTlu9tNa2Zlu3Wi/ZmNjssOmxRdk62ObZDtoJ2Pnaldk9sZezj7RvtF9wMHDY7tDjiHF0cTzoOO4k6cR0qndacDZy3uHc50J28XYpc3nqqubKdu1yg92c3Q65PdqguCFhQ7s7cHdyP+T+2EPZI9HjZ0+sp4dnueczLx2vTK9+b6r3Fu8G73c+1j6FPg99VXxTfHv9eP2C/er9lvxt/Yv8JwK0AnYE3AoUC4wO7AjCBfkF1QQtbrTbeHjjdLBBcG7w2CblTembbmwW2xy3+eIW3i2MLedCMCH+IQ0hKwx3RjVjMdQptCJ0gWnDPMJ8EWYZVhw2F24WXhQ+E2EWURQxG2kWeShyLsoiqiRqPtomuiz6VYxjTGXMUqx7bG0sJ84/rjkeHx8S35kgkBCb0LdVamv61mGWOiuXNZFokng4cYHtwq5JgpI2JXUk05A/0oEUlZTvUiZTzVPLU9+n+aWdS+dPT0gf2Ka2bd+2mQz7jB+3o7czt/dmymZmZU7usNpRtRPaGbqzd5f8rpxd07sddtdlEbNis37J1s4uyn67x39PV45kzu6cqe8cvmvM5cll547vNd1b+T36++jvB/fp7Tu673NeWN7NfO38kvyVAmbBzR90fij9gbM/Yv9goWHh8QPYAwkHxg5aHKwr4i/KKJo65HaorVimOK/47eEth2+U6JdUHiEeSTkyUepa2nFU4eiBoytlUWWj5dblzRUSFfsqlo6FHRs5bnm8qVKyMr/y44noE/eqHKraqpWqS05iT6aefHbK71T/j/Qf62vEavJrPtUm1E7UedX11RvV1zdINBQ2wo0pjXOng08PnbE909Gk0VTVLNScfxacTTn7/KeQn8ZaXFp6z9HPNZ1XPF/RSm3Na4PatrUttEe1T3QEdgx3Onf2dpl2tf6s+XPtBdkL5RcFLxZ2E7tzujmXMi4t9rB65i9HXp7q3dL78ErAlbt9nn2DV12uXr9mf+1Kv1X/petm1y/cMLnReZN+s/2W4a22AYOB1l8MfmkdNBxsu210u2PIeKhreP1w94jFyOU7tneu3XW6e2t0w+jwmO/YvfHg8Yl7Yfdm78fdf/Ug9cHyw92PMI/yHvM9Lnki8aT6V9VfmycMJy5O2k4OPPV++nCKOfXit6TfVqZznlGelcxIz9TP6s5emLOfG3q+8fn0C9aL5fnc3/l/r3ip8vL8H5Z/DCwELEy/Yr/ivC54I/qm9q3+295Fj8Un7+LfLS/lvRd9X/eB/qH/o//HmeW0FdxK6SfVT12fXT4/4sRzOCwGm7FqBVBIwhERALyuBYASCAB1CPEPG9f8119+BvrK2fyNwVndL5jhvubRVsMQgCakeCFp04OsQ1LJEgAe5NodqT6WANbT+yf/iqQIPd21PXgaAcDJcjivtwJAQHLFgcNZ9uBwPlUgYhHf1z37f7V9g9e8ITewiP88wfWIYET6HPg21nzjV2fybQVcxfrg2/onng/F50lD/ccAAAA4ZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAKgAgAEAAAAAQAAABigAwAEAAAAAQAAABgAAAAAwf1XlwAAAaNJREFUSA3FlT1LA0EQQBN/gYUYRTksJZVgEbCR/D+7QMr8ABtttBBCsLGzsLG2sxaxED/ie4d77u0dyaE5HHjczn7MzO7M7nU6/yXz+bwLhzCCjTQO+rZhDH3opuNLdRYN4RHe4RIKJ7R34Ro+4AEGSw2mE1iUwT18gpI74WvkGlccu4XNdH0jnYU7cAUacidn37qR23cOxc4aGU0nYUAn7iSWEHkz46w0ocdQu1X6B/AMQZ5o7KfBqNOfwRH8JB7FajGhnmcpKvQe3MEbvILiDm5gPXaCHnZr4vvFGMoEKudKn8YvQIOOe+YzCPop7dwJ3zRfJ7GDuso4YJGRa0yZgg4tUaNXdGrbuZWKKxzYYEJc2xp9AUUjGt8KC2jvgYadF8+10vJyDnNLXwbdiWUZi0fUK01Eoc+AZhCLZVzK4Vq6sDUdz+0dEcbbTTIOJmAyTVhx/WmvrExbv2jtPhWLKodjCtefZiEeZeVZWWSndgwj6fVf3XON8Qwq15++uoqrfYVrow6dGBpCq79ME291jaB0/Q2CPncyht/99MNO/vr9AqW/CGi8sJqbAAAAAElFTkSuQmCC")
            .previewLayout(.fixed(width: 63, height: 63))
            .background(.black)
    }
@@ -1,734 +0,0 @@
-//
-//  MigrateFromDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 14.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private enum MigrationFromState: Equatable {
-    case chatStopInProgress
-    case chatStopFailed(reason: String)
-    case passphraseNotSet
-    case passphraseConfirmation
-    case uploadConfirmation
-    case archiving
-    case uploadProgress(uploadedBytes: Int64, totalBytes: Int64, fileId: Int64, archivePath: URL, ctrl: chat_ctrl?)
-    case uploadFailed(totalBytes: Int64, archivePath: URL)
-    case linkCreation
-    case linkShown(fileId: Int64, link: String, archivePath: URL, ctrl: chat_ctrl)
-    case finished(chatDeletion: Bool)
-}
-
-private enum MigrateFromDeviceViewAlert: Identifiable {
-    case deleteChat(_ title: LocalizedStringKey = "Delete chat profile?", _ text: LocalizedStringKey = "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.")
-    case startChat(_ title: LocalizedStringKey = "Start chat?", _ text: LocalizedStringKey = "Warning: starting chat on multiple devices is not supported and will cause message delivery failures")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case let .deleteChat(title, text): return "\(title) \(text)"
-        case let .startChat(title, text): return "\(title) \(text)"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateFromDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showSettings: Bool
-    @Binding var showProgressOnSettings: Bool
-    @State private var migrationState: MigrationFromState = .chatStopInProgress
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @AppStorage(GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE, store: groupDefaults) private var initialRandomDBPassphrase: Bool = false
-    @State private var alert: MigrateFromDeviceViewAlert?
-    @State private var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    @State private var backDisabled: Bool = false
-
-    var body: some View {
-        if authorized {
-            migrateView()
-        } else {
-            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
-                .onAppear(perform: runAuth)
-        }
-    }
-
-    private func runAuth() { authorize(NSLocalizedString("Open migration to another device", comment: "authentication reason"), $authorized) }
-
-    func migrateView() -> some View {
-        VStack {
-            switch migrationState {
-            case .chatStopInProgress:
-                chatStopInProgressView()
-            case let .chatStopFailed(reason):
-                chatStopFailedView(reason)
-            case .passphraseNotSet:
-                passphraseNotSetView()
-            case .passphraseConfirmation:
-                PassphraseConfirmationView(migrationState: $migrationState, alert: $alert)
-            case .uploadConfirmation:
-                uploadConfirmationView()
-            case .archiving:
-                archivingView()
-            case let .uploadProgress(uploaded, total, _, archivePath, _):
-                uploadProgressView(uploaded, totalBytes: total, archivePath)
-            case let .uploadFailed(total, archivePath):
-                uploadFailedView(totalBytes: total, archivePath)
-            case .linkCreation:
-                linkCreationView()
-            case let .linkShown(fileId, link, archivePath, ctrl):
-                linkShownView(fileId, link, archivePath, ctrl)
-            case let .finished(chatDeletion):
-                finishedView(chatDeletion)
-            }
-        }
-        .modifier(BackButton(label: "Back", disabled: $backDisabled) {
-            dismiss()
-        })
-        .onChange(of: migrationState) { state in
-            backDisabled = switch migrationState {
-            case .chatStopInProgress, .archiving, .linkShown, .finished: true
-            case .chatStopFailed, .passphraseNotSet, .passphraseConfirmation, .uploadConfirmation, .uploadProgress, .uploadFailed, .linkCreation: false
-            }
-        }
-        .onAppear {
-            stopChat()
-        }
-        .onDisappear {
-            Task {
-                if !backDisabled {
-                    await MainActor.run {
-                        showProgressOnSettings = true
-                    }
-                    await startChatAndDismiss(false)
-                    await MainActor.run {
-                        showProgressOnSettings = false
-                    }
-                }
-                if case let .uploadProgress(_, _, fileId, _, ctrl) = migrationState, let ctrl {
-                    await cancelUploadedArchive(fileId, ctrl)
-                }
-                chatReceiver?.stopAndCleanUp()
-                try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .startChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .destructive(Text("Start chat")) {
-                        Task {
-                            await startChatAndDismiss()
-                        }
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .deleteChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .default(Text("Delete")) {
-                        deleteChatAndDismiss()
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func chatStopInProgressView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Stopping chat")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func chatStopFailedView(_ reason: String) -> some View {
-        List {
-            Section {
-                Text(reason)
-                Button(action: stopChat) {
-                    settingsRow("stop.fill") {
-                        Text("Stop chat").foregroundColor(.red)
-                    }
-                }
-            } header: {
-                Text("Error stopping chat")
-            } footer: {
-                Text("In order to continue, chat should be stopped.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func passphraseNotSetView() -> some View {
-        DatabaseEncryptionView(useKeychain: $useKeychain, migration: true)
-            .onChange(of: initialRandomDBPassphrase) { initial in
-                if !initial {
-                    migrationState = .uploadConfirmation
-                }
-            }
-    }
-
-    private func uploadConfirmationView() -> some View {
-        List {
-            Section {
-                Button(action: { migrationState = .archiving }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Archive and upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Confirm upload")
-            } footer: {
-                Text("All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func archivingView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Archiving database")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            exportArchive()
-        }
-    }
-
-    private func uploadProgressView(_ uploadedBytes: Int64, totalBytes: Int64, _ archivePath: URL) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Uploading archive")
-                }
-            }
-            let ratio = Float(uploadedBytes) / Float(totalBytes)
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: uploadedBytes, countStyle: .binary)) uploaded")
-        }
-        .onAppear {
-            startUploading(totalBytes, archivePath)
-        }
-    }
-
-    private func uploadFailedView(totalBytes: Int64, _ archivePath: URL) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Repeat upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Upload failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stopAndCleanUp()
-        }
-    }
-
-    private func linkCreationView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Creating archive link")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func linkShownView(_ fileId: Int64, _ link: String, _ archivePath: URL, _ ctrl: chat_ctrl) -> some View {
-        List {
-            Section {
-                Button(action: { cancelMigration(fileId, ctrl) }) {
-                    settingsRow("multiply") {
-                        Text("Cancel migration").foregroundColor(.red)
-                    }
-                }
-                Button(action: { finishMigration(fileId, ctrl) }) {
-                    settingsRow("checkmark") {
-                        Text("Finalize migration").foregroundColor(.accentColor)
-                    }
-                }
-            } footer: {
-                VStack(alignment: .leading, spacing: 16) {
-                    Text("**Warning**: the archive will be removed.")
-                    Text("Choose _Migrate from another device_ on the new device and scan QR code.")
-                }
-                .font(.callout)
-            }
-            Section("Show QR code") {
-                SimpleXLinkQRCode(uri: link)
-                    .padding()
-                    .background(
-                        RoundedRectangle(cornerRadius: 12, style: .continuous)
-                            .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                    )
-                    .padding(.horizontal)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-            }
-
-            Section("Or securely share this file link") {
-                shareLinkView(link)
-            }
-            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
-        }
-    }
-
-    private func finishedView(_ chatDeletion: Bool) -> some View {
-        ZStack {
-            List {
-                Section {
-                    Button(action: { alert = .startChat() }) {
-                        settingsRow("play.fill") {
-                            Text("Start chat").foregroundColor(.red)
-                        }
-                    }
-                    Button(action: { alert = .deleteChat() }) {
-                        settingsRow("trash.fill") {
-                            Text("Delete database from this device").foregroundColor(.accentColor)
-                        }
-                    }
-                } header: {
-                    Text("Migration complete")
-                } footer: {
-                    VStack(alignment: .leading, spacing: 16) {
-                        Text("You **must not** use the same database on two devices.")
-                        Text("**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.")
-                    }
-                    .font(.callout)
-                }
-            }
-            if chatDeletion {
-                progressView()
-            }
-        }
-    }
-
-    private func shareLinkView(_ link: String) -> some View {
-        HStack {
-            linkTextView(link)
-            Button {
-                showShareSheet(items: [link])
-            } label: {
-                Image(systemName: "square.and.arrow.up")
-                    .padding(.top, -7)
-            }
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func linkTextView(_ link: String) -> some View {
-        Text(link)
-            .lineLimit(1)
-            .font(.caption)
-            .truncationMode(.middle)
-    }
-
-    static func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey) -> some View {
-        ZStack {
-            VStack {
-                Text(description)
-                    .font(.title3)
-                    .hidden()
-
-                Text(title)
-                    .font(.system(size: 54))
-                    .bold()
-                    .foregroundColor(.accentColor)
-
-                Text(description)
-                    .font(.title3)
-            }
-
-            Circle()
-                .trim(from: 0, to: CGFloat(value))
-                .stroke(
-                    Color.accentColor,
-                    style: StrokeStyle(lineWidth: 27)
-                )
-                .rotationEffect(.degrees(180))
-                .animation(.linear, value: value)
-                .frame(maxWidth: .infinity)
-                .padding(.horizontal)
-                .padding(.horizontal)
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func stopChat() {
-        Task {
-            do {
-                try await stopChatAsync()
-                do {
-                    try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
-                    await MainActor.run {
-                        migrationState = initialRandomDBPassphraseGroupDefault.get() ? .passphraseNotSet :  .passphraseConfirmation
-                    }
-                } catch let error {
-                    alert = .error(title: "Error saving settings", error: error.localizedDescription)
-                    migrationState = .chatStopFailed(reason: NSLocalizedString("Error saving settings", comment: "when migrating"))
-                }
-            } catch let e {
-                await MainActor.run {
-                    migrationState = .chatStopFailed(reason: e.localizedDescription)
-                }
-            }
-        }
-    }
-
-    private func exportArchive() {
-        Task {
-            do {
-                try? FileManager.default.createDirectory(at: getMigrationTempFilesDirectory(), withIntermediateDirectories: true)
-                let archivePath = try await exportChatArchive(getMigrationTempFilesDirectory())
-                if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
-                    let totalBytes = attrs[.size] as? Int64 {
-                    await MainActor.run {
-                        migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                    }
-                } else {
-                    await MainActor.run {
-                        alert = .error(title: "Exported file doesn't exist")
-                        migrationState = .uploadConfirmation
-                    }
-                }
-            } catch let error {
-                await MainActor.run {
-                    alert = .error(title: "Error exporting chat database", error: responseError(error))
-                    migrationState = .uploadConfirmation
-                }
-            }
-        }
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startUploading(_ totalBytes: Int64, _ archivePath: URL) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
-                await MainActor.run {
-                    switch msg {
-                    case let .sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize):
-                        if case let .uploadProgress(uploaded, total, _, _, _) = migrationState, uploaded != total {
-                            migrationState = .uploadProgress(uploadedBytes: sentSize, totalBytes: totalSize, fileId: fileTransferMeta.fileId, archivePath: archivePath, ctrl: ctrl)
-                        }
-                    case .sndFileRedirectStartXFTP:
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkCreation
-                        }
-                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
-                        let cfg = getNetCfg()
-                        let data = MigrationFileLinkData.init(
-                            networkConfig: MigrationFileLinkData.NetworkConfig(
-                                socksProxy: cfg.socksProxy,
-                                hostMode: cfg.hostMode,
-                                requiredHostMode: cfg.requiredHostMode
-                            )
-                        )
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkShown(fileId: fileTransferMeta.fileId, link: data.addToLink(link: rcvURIs[0]), archivePath: archivePath, ctrl: ctrl)
-                        }
-                    case .sndFileError:
-                        alert = .error(title: "Upload failed", error: "Check your internet connection and try again")
-                        migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await uploadStandaloneFile(user: user, file: CryptoFile.plain(archivePath.lastPathComponent), ctrl: ctrl)
-            await MainActor.run {
-                guard let res = res else {
-                    migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-                    return alert = .error(title: "Error uploading the archive", error: error ?? "")
-                }
-                migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: res.fileSize, fileId: res.fileId, archivePath: archivePath, ctrl: ctrl)
-            }
-        }
-    }
-
-    private func cancelUploadedArchive(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func cancelMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedArchive(fileId, ctrl)
-            await startChatAndDismiss()
-        }
-    }
-
-    private func finishMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedArchive(fileId, ctrl)
-            await MainActor.run {
-                migrationState = .finished(chatDeletion: false)
-            }
-        }
-    }
-
-    private func deleteChatAndDismiss() {
-        Task {
-            do {
-                try await deleteChatAsync()
-                m.chatDbChanged = true
-                m.chatInitialized = false
-                migrationState = .finished(chatDeletion: true)
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    resetChatCtrl()
-                    do {
-                        try initializeChat(start: false)
-                        m.chatDbChanged = false
-                        AppChatState.shared.set(.active)
-                    } catch let error {
-                        fatalError("Error starting chat \(responseError(error))")
-                    }
-                    showSettings = false
-                }
-            } catch let error {
-                alert = .error(title: "Error deleting database", error: responseError(error))
-            }
-        }
-    }
-
-    private func startChatAndDismiss(_ dismiss: Bool = true) async {
-        AppChatState.shared.set(.active)
-        do {
-            if m.chatDbChanged {
-                resetChatCtrl()
-                try initializeChat(start: true)
-                m.chatDbChanged = false
-            } else {
-                try startChat(refreshInvitations: true)
-            }
-        } catch let error {
-            alert = .error(title: "Error starting chat", error: responseError(error))
-        }
-        // Hide settings anyway if chatDbStatus is not ok, probably passphrase needs to be entered
-        if dismiss || m.chatDbStatus != .ok {
-            await MainActor.run {
-                showSettings = false
-            }
-        }
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseConfirmationView: View {
-    @Binding var migrationState: MigrationFromState
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var currentKey: String = ""
-    @State private var verifyingPassphrase: Bool = false
-    @FocusState private var keyboardVisible: Bool
-    @Binding var alert: MigrateFromDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                chatStoppedView()
-                Section {
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                        .focused($keyboardVisible)
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            await verifyDatabasePassphrase(currentKey)
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow(useKeychain ? "key" : "lock", color: .secondary) {
-                            Text("Verify passphrase")
-                        }
-                    }
-                    .disabled(verifyingPassphrase || currentKey.isEmpty)
-                } header: {
-                    Text("Verify database passphrase")
-                } footer: {
-                    Text("Confirm that you remember database passphrase to migrate it.")
-                        .font(.callout)
-                }
-                .onAppear {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                        keyboardVisible = true
-                    }
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-
-    private func verifyDatabasePassphrase(_ dbKey: String) async {
-        do {
-            try await testStorageEncryption(key: dbKey)
-            await MainActor.run {
-                migrationState = .uploadConfirmation
-            }
-        } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorOpen(.errorNotADatabase))) = error as? ChatResponse {
-                showErrorOnMigrationIfNeeded(.errorNotADatabase(dbFile: ""), $alert)
-            } else {
-                alert = .error(title: "Error", error: NSLocalizedString("Error verifying passphrase:", comment: "") + " " + String(String(describing: error)))
-            }
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateFromDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-func chatStoppedView() -> some View {
-    settingsRow("exclamationmark.octagon.fill", color: .red) {
-        Text("Chat is stopped")
-    }
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.databaseUrl = databaseUrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
-            }
-            logger.debug("processReceivedMsg: \(msg.responseType)")
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stopAndCleanUp() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_chat.db")
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_agent.db")
-    }
-}
-
-struct MigrateFromDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateFromDevice(showSettings: Binding.constant(true), showProgressOnSettings: Binding.constant(false))
-    }
-}
@@ -1,717 +0,0 @@
-//
-//  MigrateToDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-enum MigrationToDeviceState: Codable, Equatable {
-    case downloadProgress(link: String, archiveName: String)
-    case archiveImport(archiveName: String)
-    case passphrase
-
-    // Here we check whether it's needed to show migration process after app restart or not
-    // It's important to NOT show the process when archive was corrupted/not fully downloaded
-    static func makeMigrationState() -> MigrationToState? {
-        let state: MigrationToDeviceState? = UserDefaults.standard.string(forKey: DEFAULT_MIGRATION_TO_STAGE) != nil ? decodeJSON(UserDefaults.standard.string(forKey: DEFAULT_MIGRATION_TO_STAGE)!) : nil
-        var initial: MigrationToState? = .pasteOrScanLink
-        //logger.debug("Inited with migrationState: \(String(describing: state))")
-        switch state {
-        case nil:
-            initial = nil
-        case .downloadProgress:
-            // No migration happens at the moment actually since archive were not downloaded fully
-            logger.debug("MigrateToDevice: archive wasn't fully downloaded, removed broken file")
-            initial = nil
-        case let .archiveImport(archiveName):
-            let archivePath = getMigrationTempFilesDirectory().path + "/" + archiveName
-            initial = .archiveImportFailed(archivePath: archivePath)
-        case .passphrase:
-            initial = .passphrase(passphrase: "")
-        }
-        if initial == nil {
-            UserDefaults.standard.removeObject(forKey: DEFAULT_MIGRATION_TO_STAGE)
-            try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-        }
-        return initial
-    }
-
-    static func save(_ state: MigrationToDeviceState?) {
-        if let state {
-            UserDefaults.standard.setValue(encodeJSON(state), forKey: DEFAULT_MIGRATION_TO_STAGE)
-        } else {
-            UserDefaults.standard.removeObject(forKey: DEFAULT_MIGRATION_TO_STAGE)
-        }
-    }
-}
-
-enum MigrationToState: Equatable {
-    case pasteOrScanLink
-    case linkDownloading(link: String)
-    case downloadProgress(downloadedBytes: Int64, totalBytes: Int64, fileId: Int64, link: String, archivePath: String, ctrl: chat_ctrl?)
-    case downloadFailed(totalBytes: Int64, link: String, archivePath: String)
-    case archiveImport(archivePath: String)
-    case archiveImportFailed(archivePath: String)
-    case passphrase(passphrase: String)
-    case migrationConfirmation(status: DBMigrationResult, passphrase: String, useKeychain: Bool)
-    case migration(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Bool)
-    case onion(appSettings: AppSettings)
-}
-
-private enum MigrateToDeviceViewAlert: Identifiable {
-    case chatImportedWithErrors(title: LocalizedStringKey = "Chat database imported",
-                                text: LocalizedStringKey = "Some non-fatal errors occurred during import - you may see Chat console for more details.")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case .chatImportedWithErrors: return "chatImportedWithErrors"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateToDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @Binding var migrationState: MigrationToState?
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var alert: MigrateToDeviceViewAlert?
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    // Prevent from hiding the view until migration is finished or app deleted
-    @State private var backDisabled: Bool = false
-    @State private var showQRCodeScanner: Bool = true
-
-    var body: some View {
-        VStack {
-            switch migrationState {
-            case nil: EmptyView()
-            case .pasteOrScanLink:
-                pasteOrScanLinkView()
-            case let .linkDownloading(link):
-                linkDownloadingView(link)
-            case let .downloadProgress(downloaded, total, _, _, _, _):
-                downloadProgressView(downloaded, totalBytes: total)
-            case let .downloadFailed(total, link, archivePath):
-                downloadFailedView(totalBytes: total, link, archivePath)
-            case let .archiveImport(archivePath):
-                archiveImportView(archivePath)
-            case let .archiveImportFailed(archivePath):
-                archiveImportFailedView(archivePath)
-            case let .passphrase(passphrase):
-                PassphraseEnteringView(migrationState: $migrationState, currentKey: passphrase, alert: $alert)
-            case let .migrationConfirmation(status, passphrase, useKeychain):
-                migrationConfirmationView(status, passphrase, useKeychain)
-            case let .migration(passphrase, confirmation, useKeychain):
-                migrationView(passphrase, confirmation, useKeychain)
-            case let .onion(appSettings):
-                OnionView(appSettings: appSettings, finishMigration: finishMigration)
-            }
-        }
-        .onAppear {
-            backDisabled = switch migrationState {
-            case nil, .pasteOrScanLink, .linkDownloading, .downloadProgress, .downloadFailed, .archiveImportFailed: false
-            case .archiveImport, .passphrase, .migrationConfirmation, .migration, .onion: true
-            }
-        }
-        .onChange(of: migrationState) { state in
-            backDisabled = switch state {
-            case nil, .pasteOrScanLink, .linkDownloading, .downloadProgress, .downloadFailed, .archiveImportFailed: false
-            case .archiveImport, .passphrase, .migrationConfirmation, .migration, .onion: true
-            }
-        }
-        .onDisappear {
-            Task {
-                if case .archiveImportFailed = migrationState {
-                    // Original database is not exist, nothing is setup correctly for showing to a user yet. Return to clean state
-                    deleteAppDatabaseAndFiles()
-                    initChatAndMigrate()
-                } else if case let .downloadProgress(_, _, fileId, _, _, ctrl) = migrationState, let ctrl {
-                    await stopArchiveDownloading(fileId, ctrl)
-                }
-                chatReceiver?.stopAndCleanUp()
-                if !backDisabled {
-                    try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-                    MigrationToDeviceState.save(nil)
-                }
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .chatImportedWithErrors(title, text): 
-                return Alert(title: Text(title), message: Text(text))
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func pasteOrScanLinkView() -> some View {
-        ZStack {
-            List {
-                Section("Scan QR code") {
-                    ScannerInView(showQRCodeScanner: $showQRCodeScanner) { resp in
-                        switch resp {
-                        case let .success(r):
-                            let link = r.string
-                            if strHasSimplexFileLink(link.trimmingCharacters(in: .whitespaces)) {
-                                migrationState = .linkDownloading(link: link.trimmingCharacters(in: .whitespaces))
-                            } else {
-                                alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                            }
-                        case let .failure(e):
-                            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-                            alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                        }
-                    }
-                }
-                if developerTools {
-                    Section("Or paste archive link") {
-                        pasteLinkView()
-                    }
-                }
-            }
-        }
-    }
-
-    private func pasteLinkView() -> some View {
-        Button {
-            if let str = UIPasteboard.general.string {
-                if strHasSimplexFileLink(str.trimmingCharacters(in: .whitespaces)) {
-                    migrationState = .linkDownloading(link: str.trimmingCharacters(in: .whitespaces))
-                } else {
-                    alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                }
-            }
-        } label: {
-            Text("Tap to paste link")
-        }
-        .disabled(!ChatModel.shared.pasteboardHasStrings)
-        .frame(maxWidth: .infinity, alignment: .center)
-    }
-
-    private func linkDownloadingView(_ link: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading link details")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            downloadLinkDetails(link)
-        }
-    }
-
-    private func downloadProgressView(_ downloadedBytes: Int64, totalBytes: Int64) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading archive")
-                }
-            }
-            let ratio = Float(downloadedBytes) / Float(max(totalBytes, 1))
-            MigrateFromDevice.largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: downloadedBytes, countStyle: .binary)) downloaded")
-        }
-    }
-
-    private func downloadFailedView(totalBytes: Int64, _ link: String, _ archivePath: String) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    try? FileManager.default.removeItem(atPath: archivePath)
-                    migrationState = .linkDownloading(link: link)
-                }) {
-                    settingsRow("tray.and.arrow.down") {
-                        Text("Repeat download").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Download failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stopAndCleanUp()
-            try? FileManager.default.removeItem(atPath: archivePath)
-            MigrationToDeviceState.save(nil)
-        }
-    }
-
-    private func archiveImportView(_ archivePath: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Importing archive")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            importArchive(archivePath)
-        }
-    }
-
-    private func archiveImportFailedView(_ archivePath: String) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .archiveImport(archivePath: archivePath)
-                }) {
-                    settingsRow("square.and.arrow.down") {
-                        Text("Repeat import").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Import failed")
-            } footer: {
-                Text("You can give another try.")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func migrationConfirmationView(_ status: DBMigrationResult, _ passphrase: String, _ useKeychain: Bool) -> some View {
-        List {
-            let (header, button, footer, confirmation): (LocalizedStringKey, LocalizedStringKey?, String, MigrationConfirmation?) = switch status {
-            case let .errorMigration(_, migrationError):
-                switch migrationError {
-                case .upgrade:
-                    ("Database upgrade",
-                    "Upgrade and open chat",
-                     "",
-                     .yesUp)
-                case .downgrade:
-                    ("Database downgrade",
-                    "Downgrade and open chat",
-                     NSLocalizedString("Warning: you may lose some data!", comment: ""),
-                    .yesUpDown)
-                case let .migrationError(mtrError):
-                    ("Incompatible database version",
-                     nil,
-                     "\(NSLocalizedString("Error: ", comment: "")) \(DatabaseErrorView.mtrErrorDescription(mtrError))",
-                     nil)
-                }
-            default: ("Error", nil, "Unknown error", nil)
-            }
-            Section {
-                if let button, let confirmation {
-                    Button(action: {
-                        migrationState = .migration(passphrase: passphrase, confirmation: confirmation, useKeychain: useKeychain)
-                    }) {
-                        settingsRow("square.and.arrow.down") {
-                            Text(button).foregroundColor(.accentColor)
-                        }
-                    }
-                } else {
-                    EmptyView()
-                }
-            } header: {
-                Text(header)
-            } footer: {
-                Text(footer)
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func migrationView(_ passphrase: String, _ confirmation: MigrationConfirmation, _ useKeychain: Bool) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Migrating")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            startChat(passphrase, confirmation, useKeychain)
-        }
-    }
-
-    struct OnionView: View {
-        @State var appSettings: AppSettings
-        @State private var onionHosts: OnionHosts = .no
-        var finishMigration: (AppSettings) -> Void
-
-        var body: some View {
-            List {
-                Section {
-                    Button(action: {
-                        var updated = appSettings.networkConfig!
-                        let (hostMode, requiredHostMode) = onionHosts.hostMode
-                        updated.hostMode = hostMode
-                        updated.requiredHostMode = requiredHostMode
-                        updated.socksProxy = nil
-                        appSettings.networkConfig = updated
-                        finishMigration(appSettings)
-                    }) {
-                        settingsRow("checkmark") {
-                            Text("Apply").foregroundColor(.accentColor)
-                        }
-                    }
-                } header: {
-                    Text("Confirm network settings")
-                } footer: {
-                    Text("Please confirm that network settings are correct for this device.")
-                        .font(.callout)
-                }
-
-                Section("Network settings") {
-                    Picker("Use .onion hosts", selection: $onionHosts) {
-                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-                }
-            }
-        }
-    }
-
-    private func downloadLinkDetails(_ link: String) {
-        let archiveTime = Date.now
-        let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
-        let archiveName = "simplex-chat.\(ts).zip"
-        let archivePath = getMigrationTempFilesDirectory().appendingPathComponent(archiveName)
-
-        startDownloading(0, link, archivePath.path)
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startDownloading(_ totalBytes: Int64, _ link: String, _ archivePath: String) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
-                await MainActor.run {
-                    switch msg {
-                    case let .rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer):
-                        migrationState = .downloadProgress(downloadedBytes: receivedSize, totalBytes: totalSize, fileId: rcvFileTransfer.fileId, link: link, archivePath: archivePath, ctrl: ctrl)
-                        MigrationToDeviceState.save(.downloadProgress(link: link, archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
-                    case .rcvStandaloneFileComplete:
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            // User closed the whole screen before new state was saved
-                            if migrationState == nil {
-                                MigrationToDeviceState.save(nil)
-                            } else {
-                                migrationState = .archiveImport(archivePath: archivePath)
-                                MigrationToDeviceState.save(.archiveImport(archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
-                            }
-                        }
-                    case .rcvFileError:
-                        alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
-                        migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                    case .chatError(_, .error(.noRcvFileUser)):
-                        alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
-                        migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await downloadStandaloneFile(user: user, url: link, file: CryptoFile.plain(URL(fileURLWithPath: archivePath).lastPathComponent), ctrl: ctrl)
-            if res == nil {
-                await MainActor.run {
-                    migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                }
-                return alert = .error(title: "Error downloading the archive", error: error ?? "")
-            }
-        }
-    }
-
-    private func importArchive(_ archivePath: String) {
-        Task {
-            do {
-                if !hasChatCtrl() {
-                    chatInitControllerRemovingDatabases()
-                }
-                try await apiDeleteStorage()
-                do {
-                    let config = ArchiveConfig(archivePath: archivePath)
-                    let archiveErrors = try await apiImportArchive(config: config)
-                    if !archiveErrors.isEmpty {
-                        alert = .chatImportedWithErrors()
-                    }
-                    await MainActor.run {
-                        migrationState = .passphrase(passphrase: "")
-                        MigrationToDeviceState.save(.passphrase)
-                    }
-                } catch let error {
-                    await MainActor.run {
-                        migrationState = .archiveImportFailed(archivePath: archivePath)
-                    }
-                    alert = .error(title: "Error importing chat database", error: responseError(error))
-                }
-            } catch let error {
-                await MainActor.run {
-                    migrationState = .archiveImportFailed(archivePath: archivePath)
-                }
-                alert = .error(title: "Error deleting chat database", error: responseError(error))
-            }
-        }
-    }
-
-
-    private func stopArchiveDownloading(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func startChat(_ passphrase: String, _ confirmation: MigrationConfirmation, _ useKeychain: Bool) {
-        if useKeychain {
-            _ = kcDatabasePassword.set(passphrase)
-        } else {
-            _ = kcDatabasePassword.remove()
-        }
-        storeDBPassphraseGroupDefault.set(useKeychain)
-        initialRandomDBPassphraseGroupDefault.set(false)
-        AppChatState.shared.set(.active)
-        Task {
-            do {
-                resetChatCtrl()
-                try initializeChat(start: false, confirmStart: false, dbKey: passphrase, refreshInvitations: true, confirmMigrations: confirmation)
-                var appSettings = try apiGetAppSettings(settings: AppSettings.current.prepareForExport())
-                let hasOnionConfigured = appSettings.networkConfig?.socksProxy != nil || appSettings.networkConfig?.hostMode == .onionHost
-                appSettings.networkConfig?.socksProxy = nil
-                appSettings.networkConfig?.hostMode = .publicHost
-                appSettings.networkConfig?.requiredHostMode = true
-                await MainActor.run {
-                    if hasOnionConfigured {
-                        migrationState = .onion(appSettings: appSettings)
-                    } else {
-                        finishMigration(appSettings)
-                    }
-                }
-            } catch let error {
-                hideView()
-                AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
-            }
-        }
-    }
-
-    private func finishMigration(_ appSettings: AppSettings) {
-        do {
-            try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            MigrationToDeviceState.save(nil)
-            appSettings.importIntoApp()
-            try SimpleX.startChat(refreshInvitations: true)
-            AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
-        } catch let error {
-            AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
-        }
-        hideView()
-    }
-
-    private func hideView() {
-        onboardingStageDefault.set(.onboardingComplete)
-        m.onboardingStage = .onboardingComplete
-        dismiss()
-    }
-
-    private func strHasSimplexFileLink(_ text: String) -> Bool {
-        text.starts(with: "simplex:/file") || text.starts(with: "https://simplex.chat/file")
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseEnteringView: View {
-    @Binding var migrationState: MigrationToState?
-    @State private var useKeychain = true
-    @State var currentKey: String
-    @State private var verifyingPassphrase: Bool = false
-    @FocusState private var keyboardVisible: Bool
-    @Binding var alert: MigrateToDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                Section {
-                    settingsRow("key", color: .secondary) {
-                        Toggle("Save passphrase in Keychain", isOn: $useKeychain)
-                    }
-
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                        .focused($keyboardVisible)
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            let (status, _) = chatInitTemporaryDatabase(url: getAppDatabasePath(), key: currentKey, confirmation: .yesUp)
-                            let success = switch status {
-                            case .ok, .invalidConfirmation: true
-                            default: false
-                            }
-                            if success {
-                                await MainActor.run {
-                                    migrationState = .migration(passphrase: currentKey, confirmation: .yesUp, useKeychain: useKeychain)
-                                }
-                            } else if case .errorMigration = status {
-                                await MainActor.run {
-                                    migrationState = .migrationConfirmation(status: status, passphrase: currentKey, useKeychain: useKeychain)
-                                }
-                            } else {
-                                showErrorOnMigrationIfNeeded(status, $alert)
-                            }
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow("key", color: .secondary) {
-                            Text("Open chat")
-                        }
-                    }
-                    .disabled(verifyingPassphrase || currentKey.isEmpty)
-                } header: {
-                    Text("Enter passphrase")
-                } footer: {
-                    VStack(alignment: .leading, spacing: 16) {
-                        if useKeychain {
-                            Text("iOS Keychain is used to securely store passphrase - it allows receiving push notifications.")
-                        } else {
-                            Text("You have to enter passphrase every time the app starts - it is not stored on the device.")
-                            Text("**Please note**: you will NOT be able to recover or change passphrase if you lose it.")
-                            Text("**Warning**: Instant push notifications require passphrase saved in Keychain.")
-                        }
-                    }
-                    .font(.callout)
-                    .padding(.top, 1)
-                    .onTapGesture { keyboardVisible = false }
-                }
-                .onAppear {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                        keyboardVisible = true
-                    }
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateToDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.databaseUrl = databaseUrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
-            }
-            logger.debug("processReceivedMsg: \(msg.responseType)")
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stopAndCleanUp() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_chat.db")
-        try? FileManager.default.removeItem(atPath: "\(databaseUrl.path)_agent.db")
-    }
-}
-
-struct MigrateToDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateToDevice(migrationState: Binding.constant(.pasteOrScanLink))
-    }
-}
@@ -70,7 +70,9 @@ struct AddGroupView: View {

                ZStack(alignment: .center) {
                    ZStack(alignment: .topTrailing) {
-                        ProfileImage(imageStr: profile.image, size: 128, color: Color(uiColor: .secondarySystemGroupedBackground))
+                        ProfileImage(imageStr: profile.image, color: Color(uiColor: .secondarySystemGroupedBackground))
+                            .aspectRatio(1, contentMode: .fit)
+                            .frame(maxWidth: 128, maxHeight: 128)
                        if profile.image != nil {
                            Button {
                                profile.image = nil
@@ -86,7 +86,7 @@ struct NewChatView: View {
                        }
                }
                if case .connect = selection {
-                    ConnectView(showQRCodeScanner: $showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
+                    ConnectView(showQRCodeScanner: showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
                        .transition(.move(edge: .trailing))
                }
            }
@@ -284,7 +284,8 @@ private struct InviteView: View {

 private struct ConnectView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showQRCodeScanner: Bool
+    @State var showQRCodeScanner = false
+    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
    @Binding var pastedLink: String
    @Binding var alert: NewChatViewAlert?
    @State private var sheet: PlanAndConnectActionSheet?
@@ -294,13 +295,32 @@ private struct ConnectView: View {
            Section("Paste the link you received") {
                pasteLinkView()
            }
-            Section("Or scan QR code") {
-                ScannerInView(showQRCodeScanner: $showQRCodeScanner, processQRCode: processQRCode)
-            }
+
+            scanCodeView()
        }
        .actionSheet(item: $sheet) { s in
            planAndConnectActionSheet(s, dismiss: true, cleanup: { pastedLink = "" })
        }
+        .onAppear {
+            let status = AVCaptureDevice.authorizationStatus(for: .video)
+            cameraAuthorizationStatus = status
+            if showQRCodeScanner {
+                switch status {
+                case .notDetermined: askCameraAuthorization()
+                case .restricted: showQRCodeScanner = false
+                case .denied: showQRCodeScanner = false
+                case .authorized: ()
+                @unknown default: askCameraAuthorization()
+                }
+            }
+        }
+    }
+
+    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
+        AVCaptureDevice.requestAccess(for: .video) { allowed in
+            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
+            if allowed { cb?() }
+        }
    }

    @ViewBuilder private func pasteLinkView() -> some View {
@@ -331,45 +351,8 @@ private struct ConnectView: View {
        }
    }

-    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            let link = r.string
-            if strIsSimplexLink(r.string) {
-                connect(link)
-            } else {
-                alert = .newChatSomeAlert(alert: .someAlert(
-                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
-                    id: "processQRCode: code is not a SimpleX link"
-                ))
-            }
-        case let .failure(e):
-            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: .someAlert(
-                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
-                id: "processQRCode: failure"
-            ))
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = .planAndConnectAlert(alert: $0) },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: nil
-        )
-    }
-}
-
-struct ScannerInView: View {
-    @Binding var showQRCodeScanner: Bool
-    let processQRCode: (_ resp: Result<ScanResult, ScanError>) -> Void
-    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
-
-    var body: some View {
-        Group {
+    private func scanCodeView() -> some View {
+        Section("Or scan QR code") {
            if showQRCodeScanner, case .authorized = cameraAuthorizationStatus {
                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
                    .aspectRatio(1, contentMode: .fit)
@@ -413,26 +396,37 @@ struct ScannerInView: View {
                .disabled(cameraAuthorizationStatus == .restricted)
            }
        }
-        .onAppear {
-            let status = AVCaptureDevice.authorizationStatus(for: .video)
-            cameraAuthorizationStatus = status
-            if showQRCodeScanner {
-                switch status {
-                case .notDetermined: askCameraAuthorization()
-                case .restricted: showQRCodeScanner = false
-                case .denied: showQRCodeScanner = false
-                case .authorized: ()
-                @unknown default: askCameraAuthorization()
-                }
+    }
+
+    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
+        switch resp {
+        case let .success(r):
+            let link = r.string
+            if strIsSimplexLink(r.string) {
+                connect(link)
+            } else {
+                alert = .newChatSomeAlert(alert: .someAlert(
+                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
+                    id: "processQRCode: code is not a SimpleX link"
+                ))
            }
+        case let .failure(e):
+            logger.error("processQRCode QR code error: \(e.localizedDescription)")
+            alert = .newChatSomeAlert(alert: .someAlert(
+                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
+                id: "processQRCode: failure"
+            ))
        }
    }

-    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
-        AVCaptureDevice.requestAccess(for: .video) { allowed in
-            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
-            if allowed { cb?() }
-        }
+    private func connect(_ link: String) {
+        planAndConnect(
+            link,
+            showAlert: { alert = .planAndConnectAlert(alert: $0) },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: nil
+        )
    }
 }

@@ -166,10 +166,8 @@ private func createProfile(_ displayName: String, showAlert: (UserProfileAlert)
    )
    let m = ChatModel.shared
    do {
-        AppChatState.shared.set(.active)
        m.currentUser = try apiCreateActiveUser(profile)
-        // .isEmpty check is redundant here, but it makes it clearer what is going on
-        if m.users.isEmpty || m.users.allSatisfy({ $0.user.hidden }) {
+        if m.users.isEmpty {
            try startChat()
            withAnimation {
                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
@@ -7,7 +7,6 @@
 //

 import SwiftUI
-import SimpleXChat

 struct SimpleXInfo: View {
    @EnvironmentObject var m: ChatModel
@@ -45,15 +44,6 @@ struct SimpleXInfo: View {
                    if onboarding {
                        OnboardingActionButton()
                        Spacer()
-
-                        Button {
-                            m.migrationState = .pasteOrScanLink
-                        } label: {
-                            Label("Migrate from another device", systemImage: "tray.and.arrow.down")
-                                .font(.subheadline)
-                        }
-                        .padding(.bottom, 8)
-                        .frame(maxWidth: .infinity)
                    }

                    Button {
@@ -64,24 +54,9 @@ struct SimpleXInfo: View {
                    }
                    .padding(.bottom, 8)
                    .frame(maxWidth: .infinity)
-
                }
                .frame(minHeight: g.size.height)
            }
-            .sheet(isPresented: Binding(
-                get: { m.migrationState != nil },
-                set: { _ in
-                    m.migrationState = nil
-                    MigrationToDeviceState.save(nil) }
-            )) {
-                NavigationView {
-                    VStack(alignment: .leading) {
-                        MigrateToDevice(migrationState: $m.migrationState)
-                    }
-                    .navigationTitle("Migrate here")
-                    .background(colorScheme == .light ? Color(uiColor: .tertiarySystemGroupedBackground) : .clear)
-                }
-            }
            .sheet(isPresented: $showHowItWorks) {
                HowItWorks(onboarding: onboarding)
            }
@@ -112,7 +87,6 @@ struct SimpleXInfo: View {

 struct OnboardingActionButton: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme

    var body: some View {
        if m.currentUser == nil {
@@ -137,21 +111,6 @@ struct OnboardingActionButton: View {
        .frame(maxWidth: .infinity)
        .padding(.bottom)
    }
-
-    private func actionButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
-        Button {
-            withAnimation {
-                action()
-            }
-        } label: {
-            HStack {
-                Text(label).font(.title2)
-                Image(systemName: "greaterthan")
-            }
-        }
-        .frame(maxWidth: .infinity)
-        .padding(.bottom)
-    }
 }

 struct SimpleXInfo_Previews: PreviewProvider {
@@ -344,68 +344,6 @@ private let versionDescriptions: [VersionDescription] = [
                description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
            ),
        ]
-    ),
-    VersionDescription(
-        version: "v5.6",
-        post: URL(string: "https://simplex.chat/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.html"),
-        features: [
-            FeatureDescription(
-                icon: "key",
-                title: "Quantum resistant encryption",
-                description: "Enable in direct chats (BETA)!"
-            ),
-            FeatureDescription(
-                icon: "tray.and.arrow.up",
-                title: "App data migration",
-                description: "Migrate to another device via QR code."
-            ),
-            FeatureDescription(
-                icon: "phone",
-                title: "Picture-in-picture calls",
-                description: "Use the app while in the call."
-            ),
-            FeatureDescription(
-                icon: "hand.raised",
-                title: "Safer groups",
-                description: "Admins can block a member for all."
-            ),
-            FeatureDescription(
-                icon: "character",
-                title: "Hungarian interface",
-                description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            ),
-        ]
-    ),
-    VersionDescription(
-        version: "v5.7",
-        post: URL(string: "https://simplex.chat/blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.html"),
-        features: [
-            FeatureDescription(
-                icon: "key",
-                title: "Quantum resistant encryption",
-                description: "Will be enabled in direct chats!"
-            ),
-            FeatureDescription(
-                icon: "arrowshape.turn.up.forward",
-                title: "Forward and save messages",
-                description: "Message source remains private."
-            ),
-            FeatureDescription(
-                icon: "music.note",
-                title: "In-call sounds",
-                description: "When connecting audio and video calls."
-            ),
-            FeatureDescription(
-                icon: "person.crop.square",
-                title: "Shape profile images",
-                description: "Square, circle, or anything in between."
-            ),
-            FeatureDescription(
-                icon: "antenna.radiowaves.left.and.right",
-                title: "Network management",
-                description: "More reliable network connection."
-            )
-        ]
    )
 ]

@@ -58,7 +58,7 @@ struct ConnectDesktopView: View {
    var body: some View {
        if viaSettings {
            viewBody
-                .modifier(BackButton(label: "Back", disabled: Binding.constant(false)) {
+                .modifier(BackButton(label: "Back") {
                    if m.activeRemoteCtrl {
                        alert = .disconnectDesktop(action: .back)
                    } else {
@@ -51,10 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
-                    // intSettingPicker("Receiving concurrency", selection: $netCfg.rcvConcurrency, values: [1, 2, 4, 8, 12, 16, 24], label: "")
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 45_000, 60_000, 90_000, 120_000], label: secondsLabel)
                    timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                    intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                    Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)
@@ -1,74 +0,0 @@
-//
-//  AppSettings.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 26.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SimpleXChat
-import SwiftUI
-
-extension AppSettings {
-    public func importIntoApp() {
-        let def = UserDefaults.standard
-        if var val = networkConfig {
-            // migrating from Android/desktop BUT shouldn't be here ever because it should be changed in migration stage
-            if case .onionViaSocks = val.hostMode {
-                val.hostMode = .publicHost
-                val.requiredHostMode = true
-            }
-            val.socksProxy = nil
-            setNetCfg(val)
-        }
-        if let val = privacyEncryptLocalFiles { privacyEncryptLocalFilesGroupDefault.set(val) }
-        if let val = privacyAskToApproveRelays { privacyAskToApproveRelaysGroupDefault.set(val) }
-        if let val = privacyAcceptImages {
-            privacyAcceptImagesGroupDefault.set(val)
-            def.setValue(val, forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
-        }
-        if let val = privacyLinkPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS) }
-        if let val = privacyShowChatPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) }
-        if let val = privacySaveLastDraft { def.setValue(val, forKey: DEFAULT_PRIVACY_SAVE_LAST_DRAFT) }
-        if let val = privacyProtectScreen { def.setValue(val, forKey: DEFAULT_PRIVACY_PROTECT_SCREEN) }
-        if let val = notificationMode { ChatModel.shared.notificationMode = val.toNotificationsMode() }
-        if let val = notificationPreviewMode { ntfPreviewModeGroupDefault.set(val) }
-        if let val = webrtcPolicyRelay { def.setValue(val, forKey: DEFAULT_WEBRTC_POLICY_RELAY) }
-        if let val = webrtcICEServers { def.setValue(val, forKey: DEFAULT_WEBRTC_ICE_SERVERS) }
-        if let val = confirmRemoteSessions { def.setValue(val, forKey: DEFAULT_CONFIRM_REMOTE_SESSIONS) }
-        if let val = connectRemoteViaMulticast { def.setValue(val, forKey: DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) }
-        if let val = connectRemoteViaMulticastAuto { def.setValue(val, forKey: DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO) }
-        if let val = developerTools { def.setValue(val, forKey: DEFAULT_DEVELOPER_TOOLS) }
-        if let val = confirmDBUpgrades { confirmDBUpgradesGroupDefault.set(val) }
-        if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
-        if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
-        if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
-    }
-
-    public static var current: AppSettings {
-        let def = UserDefaults.standard
-        var c = AppSettings.defaults
-        c.networkConfig = getNetCfg()
-        c.privacyEncryptLocalFiles = privacyEncryptLocalFilesGroupDefault.get()
-        c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
-        c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()
-        c.privacyLinkPreviews = def.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
-        c.privacyShowChatPreviews = def.bool(forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS)
-        c.privacySaveLastDraft = def.bool(forKey: DEFAULT_PRIVACY_SAVE_LAST_DRAFT)
-        c.privacyProtectScreen = def.bool(forKey: DEFAULT_PRIVACY_PROTECT_SCREEN)
-        c.notificationMode = AppSettingsNotificationMode.from(ChatModel.shared.notificationMode)
-        c.notificationPreviewMode = ntfPreviewModeGroupDefault.get()
-        c.webrtcPolicyRelay = def.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
-        c.webrtcICEServers = def.stringArray(forKey: DEFAULT_WEBRTC_ICE_SERVERS)
-        c.confirmRemoteSessions = def.bool(forKey: DEFAULT_CONFIRM_REMOTE_SESSIONS)
-        c.connectRemoteViaMulticast = def.bool(forKey: DEFAULT_CONNECT_REMOTE_VIA_MULTICAST)
-        c.connectRemoteViaMulticastAuto = def.bool(forKey: DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO)
-        c.developerTools = def.bool(forKey: DEFAULT_DEVELOPER_TOOLS)
-        c.confirmDBUpgrades = confirmDBUpgradesGroupDefault.get()
-        c.androidCallOnLockScreen = AppSettingsLockScreenCalls(rawValue: def.string(forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN)!)
-        c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
-        c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
-        return c
-    }
-}
@@ -17,14 +17,11 @@ let interfaceStyleNames: [LocalizedStringKey] = ["System", "Light", "Dark"]
 let appSettingsURL = URL(string: UIApplication.openSettingsURLString)!

 struct AppearanceSettings: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
    @EnvironmentObject var sceneDelegate: SceneDelegate
    @State private var iconLightTapped = false
    @State private var iconDarkTapped = false
    @State private var userInterfaceStyle = getUserInterfaceStyleDefault()
    @State private var uiTintColor = getUIAccentColorDefault()
-    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileImageCornerRadius = defaultProfileImageCorner

    var body: some View {
        VStack{
@@ -47,23 +44,6 @@ struct AppearanceSettings: View {
                    }
                }

-                Section("Profile images") {
-                    HStack(spacing: 16) {
-                        if let img = m.currentUser?.image, img != "" {
-                            ProfileImage(imageStr: img, size: 60)
-                        } else {
-                            clipProfileImage(Image(colorScheme == .light ? "icon-dark" : "icon-light"), size: 60, radius: profileImageCornerRadius)
-                        }
-
-                        Slider(
-                            value: $profileImageCornerRadius,
-                            in: 0...50,
-                            step: 2.5
-                        )
-                    }
-                    .foregroundColor(.secondary)
-                }
-
                Section {
                    Picker("Theme", selection: $userInterfaceStyle) {
                        ForEach(interfaceStyles, id: \.self) { style in
@@ -113,7 +93,7 @@ struct AppearanceSettings: View {
            }
            ._onButtonGesture { tapped.wrappedValue = $0 } perform: {}
            .overlay(tapped.wrappedValue ? Color.secondary : Color.clear)
-            .cornerRadius(13.5)
+            .cornerRadius(20)
    }
 }

@@ -42,6 +42,25 @@ struct DeveloperView: View {
                } footer: {
                    (developerTools ? Text("Show:") : Text("Hide:")) + Text(" ") + Text("Database IDs and Transport isolation option.")
                }
+
+//                Section {
+//                    settingsRow("arrow.up.doc") {
+//                        Toggle("Send videos and files via XFTP", isOn: $xftpSendEnabled)
+//                            .onChange(of: xftpSendEnabled) { _ in
+//                                do {
+//                                    try setXFTPConfig(getXFTPCfg())
+//                                } catch {
+//                                    logger.error("setXFTPConfig: cannot set XFTP config \(responseError(error))")
+//                                }
+//                            }
+//                    }
+//                } header: {
+//                    Text("Experimental")
+//                } footer: {
+//                    if xftpSendEnabled {
+//                        Text("v4.6.1+ is required to receive via XFTP.")
+//                    }
+//                }
            }
        }
    }
@@ -12,32 +12,24 @@ import SimpleXChat
 private enum NetworkAlert: Identifiable {
    case updateOnionHosts(hosts: OnionHosts)
    case updateSessionMode(mode: TransportSessionMode)
-    case updateSMPProxyMode(proxyMode: SMPProxyMode)
-    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
    case error(err: String)

    var id: String {
        switch self {
        case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
        case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
-        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
-        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
        case let .error(err): return "error \(err)"
        }
    }
 }

 struct NetworkAndServers: View {
-    @EnvironmentObject var m: ChatModel
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = true
    @State private var cfgLoaded = false
    @State private var currentNetCfg = NetCfg.defaults
    @State private var netCfg = NetCfg.defaults
    @State private var onionHosts: OnionHosts = .no
    @State private var sessionMode: TransportSessionMode = .user
-    @State private var proxyMode: SMPProxyMode = .never
-    @State private var proxyFallback: SMPProxyFallback = .allow
    @State private var alert: NetworkAlert?

    var body: some View {
@@ -82,30 +74,6 @@ struct NetworkAndServers: View {
                    Text("Using .onion hosts requires compatible VPN provider.")
                }

-                Section {
-                    Picker("Private routing", selection: $proxyMode) {
-                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-
-                    Picker("Allow downgrade", selection: $proxyFallback) {
-                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
-                    }
-                    .disabled(proxyMode == .never)
-                    .frame(height: 36)
-
-                    Toggle("Show message status", isOn: $showSentViaProxy)
-                } header: {
-                    Text("Private message routing")
-                } footer: {
-                    VStack(alignment: .leading) {
-                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
-                        if showSentViaProxy {
-                            Text("Show → on messages sent via private routing.")
-                        }
-                    }
-                }
-
                Section("Calls") {
                    NavigationLink {
                        RTCServers()
@@ -114,14 +82,6 @@ struct NetworkAndServers: View {
                        Text("WebRTC ICE servers")
                    }
                }
-
-                Section("Network connection") {
-                    HStack {
-                        Text(m.networkInfo.networkType.text)
-                        Spacer()
-                        Image(systemName: "circle.fill").foregroundColor(m.networkInfo.online ? .green : .red)
-                    }
-                }
            }
        }
        .onAppear {
@@ -130,24 +90,14 @@ struct NetworkAndServers: View {
            currentNetCfg = getNetCfg()
            resetNetCfgView()
        }
-        .onChange(of: onionHosts) { hosts in
-            if hosts != OnionHosts(netCfg: currentNetCfg) {
-                alert = .updateOnionHosts(hosts: hosts)
+        .onChange(of: onionHosts) { _ in
+            if onionHosts != OnionHosts(netCfg: currentNetCfg) {
+                alert = .updateOnionHosts(hosts: onionHosts)
            }
        }
-        .onChange(of: sessionMode) { mode in
-            if mode != netCfg.sessionMode {
-                alert = .updateSessionMode(mode: mode)
-            }
-        }
-        .onChange(of: proxyMode) { mode in
-            if mode != netCfg.smpProxyMode {
-                alert = .updateSMPProxyMode(proxyMode: mode)
-            }
-        }
-        .onChange(of: proxyFallback) { fallbackMode in
-            if fallbackMode != netCfg.smpProxyFallback {
-                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
+        .onChange(of: sessionMode) { _ in
+            if sessionMode != netCfg.sessionMode {
+                alert = .updateSessionMode(mode: sessionMode)
            }
        }
        .alert(item: $alert) { a in
@@ -178,30 +128,6 @@ struct NetworkAndServers: View {
                        resetNetCfgView()
                    }
                )
-            case let .updateSMPProxyMode(proxyMode):
-                return Alert(
-                    title: Text("Message routing mode"),
-                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyMode = proxyMode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSMPProxyFallback(proxyFallback):
-                return Alert(
-                    title: Text("Message routing fallback"),
-                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyFallback = proxyFallback
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
            case let .error(err):
                return Alert(
                    title: Text("Error updating settings"),
@@ -231,8 +157,6 @@ struct NetworkAndServers: View {
        netCfg = currentNetCfg
        onionHosts = OnionHosts(netCfg: netCfg)
        sessionMode = netCfg.sessionMode
-        proxyMode = netCfg.smpProxyMode
-        proxyFallback = netCfg.smpProxyFallback
    }

    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
@@ -249,23 +173,6 @@ struct NetworkAndServers: View {
        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
        }
    }
-    
-    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
-        switch mode {
-        case .always: return "Always use private routing."
-        case .unknown: return "Use private routing with unknown servers."
-        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
-        case .never: return "Do NOT use private routing."
-        }
-    }
-
-    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
-        switch proxyFallback {
-        case .allow: return "Send messages directly when your or destination server does not support private routing."
-        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
-        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
-        }
-    }
 }

 struct NetworkServersView_Previews: PreviewProvider {
@@ -76,10 +76,6 @@ struct NotificationsView: View {
                        Text(m.notificationPreview.label)
                    }
                }
-
-                if let server = m.notificationServer {
-                    smpServers("Push server", [server])
-                }
            } header: {
                Text("Push notifications")
            } footer: {
@@ -91,9 +87,6 @@ struct NotificationsView: View {
            }
        }
        .disabled(legacyDatabase)
-        .onAppear {
-            (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
-        }
    }

    private func notificationAlert(_ alert: NotificationAlert, _ token: DeviceToken) -> Alert {
@@ -132,7 +125,6 @@ struct NotificationsView: View {
                        m.tokenStatus = .new
                        notificationMode = .off
                        m.notificationMode = .off
-                        m.notificationServer = nil
                    }
                } catch let error {
                    await MainActor.run {
@@ -143,13 +135,11 @@ struct NotificationsView: View {
                }
            default:
                do {
-                    let _ = try await apiRegisterToken(token: token, notificationMode: mode)
-                    let (_, tknStatus, ntfMode, ntfServer) = apiGetNtfToken()
+                    let status = try await apiRegisterToken(token: token, notificationMode: mode)
                    await MainActor.run {
-                        m.tokenStatus = tknStatus
-                        notificationMode = ntfMode
-                        m.notificationMode = ntfMode
-                        m.notificationServer = ntfServer
+                        m.tokenStatus = status
+                        notificationMode = mode
+                        m.notificationMode = mode
                    }
                } catch let error {
                    await MainActor.run {
@@ -16,7 +16,6 @@ struct PrivacySettings: View {
    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
-    @AppStorage(GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS, store: groupDefaults) private var askToApproveRelays = true
    @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -65,6 +64,18 @@ struct PrivacySettings: View {
                }

                Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                            .onChange(of: encryptLocalFiles) {
+                                setEncryptLocalFiles($0)
+                            }
+                    }
+                    settingsRow("photo") {
+                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
+                            .onChange(of: autoAcceptImages) {
+                                privacyAcceptImagesGroupDefault.set($0)
+                            }
+                    }
                    settingsRow("network") {
                        Toggle("Send link previews", isOn: $useLinkPreviews)
                    }
@@ -97,32 +108,6 @@ struct PrivacySettings: View {
                    Text("Chats")
                }

-                Section {
-                    settingsRow("lock.doc") {
-                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                            .onChange(of: encryptLocalFiles) {
-                                setEncryptLocalFiles($0)
-                            }
-                    }
-                    settingsRow("photo") {
-                        Toggle("Auto-accept images", isOn: $autoAcceptImages)
-                            .onChange(of: autoAcceptImages) {
-                                privacyAcceptImagesGroupDefault.set($0)
-                            }
-                    }
-                    settingsRow("network.badge.shield.half.filled") {
-                        Toggle("Protect IP address", isOn: $askToApproveRelays)
-                    }
-                } header: {
-                    Text("Files")
-                } footer: {
-                    if askToApproveRelays {
-                        Text("The app will ask to confirm downloads from unknown file servers (except .onion).")
-                    } else {
-                        Text("Without Tor or VPN, your IP address will be visible to file servers.")
-                    }
-                }
-
                Section {
                    settingsRow("person") {
                        Toggle("Contacts", isOn: $contactReceipts)
@@ -31,7 +31,7 @@ struct ProtocolServerView: View {
                ProgressView().scaleEffect(2)
            }
        }
-        .modifier(BackButton(label: "Your \(proto) servers", disabled: Binding.constant(false)) {
+        .modifier(BackButton(label: "Your \(proto) servers") {
            server = serverToEdit
            dismiss()
        })
@@ -117,7 +117,6 @@ struct ProtocolServerView: View {

 struct BackButton: ViewModifier {
    var label: LocalizedStringKey = "Back"
-    @Binding var disabled: Bool
    var action: () -> Void

    func body(content: Content) -> some View {
@@ -131,7 +130,6 @@ struct BackButton: ViewModifier {
                        Text(label)
                    }
                }
-                .disabled(disabled)
            }
        }
    }
@@ -95,7 +95,7 @@ struct ProtocolServersView: View {
        .sheet(isPresented: $showScanProtoServer) {
            ScanProtocolServer(servers: $servers)
        }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
+        .modifier(BackButton {
            if saveDisabled {
                dismiss()
                justOpened = false
@@ -27,7 +27,7 @@ let DEFAULT_NOTIFICATION_ALERT_SHOWN = "notificationAlertShown"
 let DEFAULT_WEBRTC_POLICY_RELAY = "webrtcPolicyRelay"
 let DEFAULT_WEBRTC_ICE_SERVERS = "webrtcICEServers"
 let DEFAULT_CALL_KIT_CALLS_IN_RECENTS = "callKitCallsInRecents"
-let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages" // unused. Use GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES instead
+let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
 let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
@@ -45,24 +45,18 @@ let DEFAULT_ACCENT_COLOR_RED = "accentColorRed"
 let DEFAULT_ACCENT_COLOR_GREEN = "accentColorGreen"
 let DEFAULT_ACCENT_COLOR_BLUE = "accentColorBlue"
 let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle"
-let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
 let DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE = "showHiddenProfilesNotice"
 let DEFAULT_SHOW_MUTE_PROFILE_ALERT = "showMuteProfileAlert"
 let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
-let DEFAULT_MIGRATION_TO_STAGE = "migrationToStage"
-let DEFAULT_MIGRATION_FROM_STAGE = "migrationFromStage"
 let DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME = "customDisappearingMessageTime"
 let DEFAULT_SHOW_UNREAD_AND_FAVORITES = "showUnreadAndFavorites"
 let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
-let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
-
-let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"

 let appDefaults: [String: Any] = [
    DEFAULT_SHOW_LA_NOTICE: false,
@@ -89,7 +83,6 @@ let appDefaults: [String: Any] = [
    DEFAULT_ACCENT_COLOR_GREEN: 0.533,
    DEFAULT_ACCENT_COLOR_BLUE: 1.000,
    DEFAULT_USER_INTERFACE_STYLE: 0,
-    DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
    DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
    DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
    DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE: true,
@@ -100,8 +93,6 @@ let appDefaults: [String: Any] = [
    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
-    DEFAULT_SHOW_SENT_VIA_RPOXY: false,
-    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue
 ]

 // not used anymore
@@ -157,14 +148,10 @@ struct SettingsView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var sceneDelegate: SceneDelegate
    @Binding var showSettings: Bool
-    @State private var showProgress: Bool = false

    var body: some View {
        ZStack {
            settingsView()
-            if showProgress {
-                progressView()
-            }
            if let la = chatModel.laRequest {
                LocalAuthView(authRequest: la)
            }
@@ -215,17 +202,9 @@ struct SettingsView: View {
                    } label: {
                        settingsRow("desktopcomputer") { Text("Use from desktop") }
                    }
-
-                    NavigationLink {
-                        MigrateFromDevice(showSettings: $showSettings, showProgressOnSettings: $showProgress)
-                            .navigationTitle("Migrate device")
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        settingsRow("tray.and.arrow.up") { Text("Migrate to another device") }
-                    }
                }
                .disabled(chatModel.chatRunning != true)
-
+                
                Section("Settings") {
                    NavigationLink {
                        NotificationsView()
@@ -370,13 +349,6 @@ struct SettingsView: View {
        }
    }

-    private func progressView() -> some View {
-        VStack {
-            ProgressView().scaleEffect(2)
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity )
-    }
-
    private enum NotificationAlert {
        case enable
        case error(LocalizedStringKey, String)
@@ -429,7 +401,8 @@ struct ProfilePreview: View {

    var body: some View {
        HStack {
-            ProfileImage(imageStr: profileOf.image, size: 44, color: color)
+            ProfileImage(imageStr: profileOf.image, color: color)
+                .frame(width: 44, height: 44)
                .padding(.trailing, 6)
                .padding(.vertical, 6)
            VStack(alignment: .leading) {
@@ -47,7 +47,7 @@ struct UserAddressView: View {
                userAddressScrollView()
            } else {
                userAddressScrollView()
-                    .modifier(BackButton(disabled: Binding.constant(false)) {
+                    .modifier(BackButton {
                        if savedAAS == aas {
                            dismiss()
                        } else {
@@ -188,7 +188,9 @@ struct UserProfile: View {
 }

 func profileImageView(_ imageStr: String?) -> some View {
-    ProfileImage(imageStr: imageStr, size: 192)
+    ProfileImage(imageStr: imageStr)
+        .aspectRatio(1, contentMode: .fit)
+        .frame(maxWidth: 192, maxHeight: 192)
 }

 func editImageButton(action: @escaping () -> Void) -> some View {
@@ -276,7 +276,6 @@ struct UserProfilesView: View {
                    // Deleting the last visible user while having hidden one(s)
                    try await deleteUser()
                    try await changeActiveUserAsync_(nil, viewPwd: nil)
-                    try? await stopChatAsync()
                    await MainActor.run {
                        onboardingStageDefault.set(.step1_SimpleXInfo)
                        m.onboardingStage = .step1_SimpleXInfo
@@ -309,7 +308,8 @@ struct UserProfilesView: View {
            }
        } label: {
            HStack {
-                ProfileImage(imageStr: user.image, size: 44, color: Color(uiColor: .tertiarySystemFill))
+                ProfileImage(imageStr: user.image, color: Color(uiColor: .tertiarySystemFill))
+                    .frame(width: 44, height: 44)
                    .padding(.vertical, 4)
                    .padding(.trailing, 12)
                Text(user.chatViewName)
@@ -107,10 +107,6 @@
        <target>%@ připojen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ downloaded" xml:space="preserve">
-        <source>%@ downloaded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ je připojen!</target>
@@ -131,10 +127,6 @@
        <target>%@ servery</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ uploaded" xml:space="preserve">
-        <source>%@ uploaded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ wants to connect!" xml:space="preserve">
        <source>%@ wants to connect!</source>
        <target>%@ se chce připojit!</target>
@@ -340,10 +332,6 @@
        <target>**Nejsoukromější**: nepoužívejte server oznámení SimpleX Chat, pravidelně kontrolujte zprávy na pozadí (závisí na tom, jak často aplikaci používáte).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve">
-        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Upozornění**: Pokud heslo ztratíte, NEBUDETE jej moci obnovit ani změnit.</target>
@@ -359,10 +347,6 @@
        <target>**Upozornění**: Okamžitě doručovaná oznámení vyžadují přístupové heslo uložené v Klíčence.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve">
-        <source>**Warning**: the archive will be removed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
        <source>**e2e encrypted** audio call</source>
        <target>**e2e šifrovaný** audio hovor</target>
@@ -614,10 +598,6 @@
        <target>Změna adresy bude přerušena. Budou použity staré přijímací adresy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Admins can block a member for all." xml:space="preserve">
-        <source>Admins can block a member for all.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
        <source>Admins can create the links to join groups.</source>
        <target>Správci mohou vytvářet odkazy pro připojení ke skupinám.</target>
@@ -671,10 +651,6 @@
        <target>Všechny vaše kontakty zůstanou připojeny. Aktualizace profilu bude odeslána vašim kontaktům.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
-        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
        <source>Allow</source>
        <target>Povolit</target>
@@ -720,10 +696,6 @@
        <target>Povolit nevratné smazání odeslaných zpráv. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
-        <source>Allow to send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
        <source>Allow to send files and media.</source>
        <target>Povolit odesílání souborů a médii.</target>
@@ -802,10 +774,6 @@
        <target>Sestavení aplikace: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="App data migration" xml:space="preserve">
-        <source>App data migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
        <source>App encrypts new local files (except videos).</source>
        <target>Aplikace šifruje nové místní soubory (s výjimkou videí).</target>
@@ -841,18 +809,6 @@
        <target>Vzhled</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Apply" xml:space="preserve">
-        <source>Apply</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Archive and upload" xml:space="preserve">
-        <source>Archive and upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Archiving database" xml:space="preserve">
-        <source>Archiving database</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Attach" xml:space="preserve">
        <source>Attach</source>
        <target>Připojit</target>
@@ -1033,10 +989,6 @@
        <target>Zrušit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Cancel migration" xml:space="preserve">
-        <source>Cancel migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
        <source>Cannot access keychain to save database password</source>
        <target>Nelze získat přístup ke klíčence pro uložení hesla databáze</target>
@@ -1047,10 +999,6 @@
        <target>Nelze přijmout soubor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Cellular" xml:space="preserve">
-        <source>Cellular</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Change" xml:space="preserve">
        <source>Change</source>
        <target>Změnit</target>
@@ -1141,10 +1089,6 @@
        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat migrated!" xml:space="preserve">
-        <source>Chat migrated!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Předvolby chatu</target>
@@ -1165,10 +1109,6 @@
        <target>Čínské a Španělské rozhranní</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve">
-        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Choose file" xml:space="preserve">
        <source>Choose file</source>
        <target>Vybrat soubor</target>
@@ -1238,10 +1178,6 @@
        <target>Potvrdit aktualizaci databáze</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Confirm network settings" xml:space="preserve">
-        <source>Confirm network settings</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Confirm new passphrase…" xml:space="preserve">
        <source>Confirm new passphrase…</source>
        <target>Potvrdit novou heslovou frázi…</target>
@@ -1252,14 +1188,6 @@
        <target>Potvrdit heslo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
-        <source>Confirm that you remember database passphrase to migrate it.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Confirm upload" xml:space="preserve">
-        <source>Confirm upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect" xml:space="preserve">
        <source>Connect</source>
        <target>Připojit</target>
@@ -1500,10 +1428,6 @@ This is your own one-time link!</source>
        <target>Vytvořeno na %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Creating archive link" xml:space="preserve">
-        <source>Creating archive link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Creating link…" xml:space="preserve">
        <source>Creating link…</source>
        <note>No comment provided by engineer.</note>
@@ -1719,10 +1643,6 @@ This cannot be undone!</source>
        <target>Odstranění databáze</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete database from this device" xml:space="preserve">
-        <source>Delete database from this device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete file" xml:space="preserve">
        <source>Delete file</source>
        <target>Smazat soubor</target>
@@ -2007,27 +1927,11 @@ This cannot be undone!</source>
        <target>Snížit a otevřít chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Download" xml:space="preserve">
-        <source>Download</source>
-        <note>chat item action</note>
-      </trans-unit>
-      <trans-unit id="Download failed" xml:space="preserve">
-        <source>Download failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Download file" xml:space="preserve">
        <source>Download file</source>
        <target>Stáhnout soubor</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Downloading archive" xml:space="preserve">
-        <source>Downloading archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Downloading link details" xml:space="preserve">
-        <source>Downloading link details</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Duplicate display name!" xml:space="preserve">
        <source>Duplicate display name!</source>
        <target>Duplicitní zobrazované jméno!</target>
@@ -2082,10 +1986,6 @@ This cannot be undone!</source>
        <target>Povolit pro všechny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
-        <source>Enable in direct chats (BETA)!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
        <source>Enable instant notifications?</source>
        <target>Povolit okamžitá oznámení?</target>
@@ -2116,10 +2016,6 @@ This cannot be undone!</source>
        <target>Povolit sebedestrukční heslo</target>
        <note>set passcode view</note>
      </trans-unit>
-      <trans-unit id="Enabled for" xml:space="preserve">
-        <source>Enabled for</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Encrypt" xml:space="preserve">
        <source>Encrypt</source>
        <target>Šifrovat</target>
@@ -2201,10 +2097,6 @@ This cannot be undone!</source>
        <source>Enter group name…</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter passphrase" xml:space="preserve">
-        <source>Enter passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Zadejte přístupovou frázi…</target>
@@ -2352,10 +2244,6 @@ This cannot be undone!</source>
        <target>Chyba mazání uživatelského profilu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error downloading the archive" xml:space="preserve">
-        <source>Error downloading the archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
        <target>Chyba povolení potvrzení o doručení!</target>
@@ -2430,10 +2318,6 @@ This cannot be undone!</source>
        <target>Při ukládání přístupové fráze do klíčenky došlo k chybě</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error saving settings" xml:space="preserve">
-        <source>Error saving settings</source>
-        <note>when migrating</note>
-      </trans-unit>
      <trans-unit id="Error saving user password" xml:space="preserve">
        <source>Error saving user password</source>
        <target>Chyba ukládání hesla uživatele</target>
@@ -2503,14 +2387,6 @@ This cannot be undone!</source>
        <target>Chyba aktualizace soukromí uživatele</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error uploading the archive" xml:space="preserve">
-        <source>Error uploading the archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error verifying passphrase:" xml:space="preserve">
-        <source>Error verifying passphrase:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error: " xml:space="preserve">
        <source>Error: </source>
        <target>Chyba: </target>
@@ -2560,10 +2436,6 @@ This cannot be undone!</source>
        <target>Exportovaný archiv databáze.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exported file doesn't exist" xml:space="preserve">
-        <source>Exported file doesn't exist</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
        <target>Exportuji archiv databáze…</target>
@@ -2623,10 +2495,6 @@ This cannot be undone!</source>
        <target>Soubory a média jsou zakázány v této skupině.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Files and media not allowed" xml:space="preserve">
-        <source>Files and media not allowed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
        <source>Files and media prohibited!</source>
        <target>Soubory a média jsou zakázány!</target>
@@ -2637,14 +2505,6 @@ This cannot be undone!</source>
        <target>Filtrovat nepřečtené a oblíbené chaty.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Finalize migration" xml:space="preserve">
-        <source>Finalize migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Finalize migration on another device." xml:space="preserve">
-        <source>Finalize migration on another device.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
        <source>Finally, we have them! 🚀</source>
        <target>Konečně je máme! 🚀</target>
@@ -2690,22 +2550,6 @@ This cannot be undone!</source>
        <target>Pro konzoli</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Forward" xml:space="preserve">
-        <source>Forward</source>
-        <note>chat item action</note>
-      </trans-unit>
-      <trans-unit id="Forward and save messages" xml:space="preserve">
-        <source>Forward and save messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Forwarded" xml:space="preserve">
-        <source>Forwarded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Forwarded from" xml:space="preserve">
-        <source>Forwarded from</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <note>No comment provided by engineer.</note>
@@ -2812,10 +2656,6 @@ This cannot be undone!</source>
        <target>Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
-        <source>Group members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
        <source>Group members can send direct messages.</source>
        <target>Členové skupiny mohou posílat přímé zprávy.</target>
@@ -2950,10 +2790,6 @@ This cannot be undone!</source>
        <target>Jak používat servery</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Hungarian interface" xml:space="preserve">
-        <source>Hungarian interface</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="ICE servers (one per line)" xml:space="preserve">
        <source>ICE servers (one per line)</source>
        <target>Servery ICE (jeden na řádek)</target>
@@ -3019,14 +2855,6 @@ This cannot be undone!</source>
        <target>Import databáze</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Import failed" xml:space="preserve">
-        <source>Import failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Importing archive" xml:space="preserve">
-        <source>Importing archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -3041,19 +2869,11 @@ This cannot be undone!</source>
        <target>Vylepšená konfigurace serveru</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
-        <source>In order to continue, chat should be stopped.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
        <target>V odpovědi na</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="In-call sounds" xml:space="preserve">
-        <source>In-call sounds</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
        <target>Inkognito</target>
@@ -3156,10 +2976,6 @@ This cannot be undone!</source>
        <source>Invalid link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid migration confirmation" xml:space="preserve">
-        <source>Invalid migration confirmation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid name!" xml:space="preserve">
        <source>Invalid name!</source>
        <note>No comment provided by engineer.</note>
@@ -3510,19 +3326,11 @@ This is your link for group %@!</source>
        <target>Reakce na zprávy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message source remains private." xml:space="preserve">
-        <source>Message source remains private.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
        <source>Message text</source>
        <target>Text zprávy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message too large" xml:space="preserve">
-        <source>Message too large</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Messages" xml:space="preserve">
        <source>Messages</source>
        <target>Zprávy</target>
@@ -3537,47 +3345,11 @@ This is your link for group %@!</source>
        <source>Messages from %@ will be shown!</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
-        <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
-        <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate device" xml:space="preserve">
-        <source>Migrate device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate from another device" xml:space="preserve">
-        <source>Migrate from another device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate here" xml:space="preserve">
-        <source>Migrate here</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate to another device" xml:space="preserve">
-        <source>Migrate to another device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
-        <source>Migrate to another device via QR code.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrating" xml:space="preserve">
-        <source>Migrating</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Přenášení archivu databáze…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migration complete" xml:space="preserve">
-        <source>Migration complete</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
        <source>Migration error:</source>
        <target>Chyba přenášení:</target>
@@ -3618,10 +3390,6 @@ This is your link for group %@!</source>
        <target>Další vylepšení se chystají již brzy!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="More reliable network connection." xml:space="preserve">
-        <source>More reliable network connection.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
        <source>Most likely this connection is deleted.</source>
        <target>Pravděpodobně je toto spojení smazáno.</target>
@@ -3657,14 +3425,6 @@ This is your link for group %@!</source>
        <target>Síť a servery</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Network connection" xml:space="preserve">
-        <source>Network connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Network management" xml:space="preserve">
-        <source>Network management</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
        <source>Network settings</source>
        <target>Nastavení sítě</target>
@@ -3774,10 +3534,6 @@ This is your link for group %@!</source>
        <target>Žádná historie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No network connection" xml:space="preserve">
-        <source>No network connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Nemáte oprávnění nahrávat hlasové zprávy</target>
@@ -3949,10 +3705,6 @@ This is your link for group %@!</source>
        <source>Open group</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Open migration to another device" xml:space="preserve">
-        <source>Open migration to another device</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Otevřít uživatelské profily</target>
@@ -3967,26 +3719,14 @@ This is your link for group %@!</source>
        <source>Opening app…</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Or paste archive link" xml:space="preserve">
-        <source>Or paste archive link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Or scan QR code" xml:space="preserve">
        <source>Or scan QR code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Or securely share this file link" xml:space="preserve">
-        <source>Or securely share this file link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Or show this code" xml:space="preserve">
        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Other" xml:space="preserve">
-        <source>Other</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Počet PING</target>
@@ -4063,10 +3803,6 @@ This is your link for group %@!</source>
        <target>Chyba dešifrování</target>
        <note>message decrypt error item</note>
      </trans-unit>
-      <trans-unit id="Picture-in-picture calls" xml:space="preserve">
-        <source>Picture-in-picture calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
        <source>Please ask your contact to enable sending voice messages.</source>
        <target>Prosím, požádejte kontaktní osobu, aby umožnila odesílání hlasových zpráv.</target>
@@ -4087,10 +3823,6 @@ This is your link for group %@!</source>
        <target>Zkontrolujte prosím nastavení své i svého kontaktu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
-        <source>Please confirm that network settings are correct for this device.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
        <source>Please contact developers.
 Error: %@</source>
@@ -4195,10 +3927,6 @@ Error: %@</source>
        <target>Profilový obrázek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile images" xml:space="preserve">
-        <source>Profile images</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
        <source>Profile name</source>
        <note>No comment provided by engineer.</note>
@@ -4237,10 +3965,6 @@ Error: %@</source>
        <target>Zakázat reakce na zprávy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
-        <source>Prohibit sending SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
        <source>Prohibit sending direct messages to members.</source>
        <target>Zakázat odesílání přímých zpráv členům.</target>
@@ -4286,14 +4010,6 @@ Error: %@</source>
        <target>Nabízená oznámení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Push server" xml:space="preserve">
-        <source>Push server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Quantum resistant encryption" xml:space="preserve">
-        <source>Quantum resistant encryption</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Rate the app" xml:space="preserve">
        <source>Rate the app</source>
        <target>Ohodnoťte aplikaci</target>
@@ -4368,10 +4084,6 @@ Error: %@</source>
        <target>Přijímací adresa bude změněna na jiný server. Změna adresy bude dokončena po připojení odesílatele.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
        <source>Receiving file will be stopped.</source>
        <target>Příjem souboru bude zastaven.</target>
@@ -4386,10 +4098,6 @@ Error: %@</source>
        <source>Recent history and improved [directory bot](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Recipient(s) can't see who this message is from." xml:space="preserve">
-        <source>Recipient(s) can't see who this message is from.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
        <source>Recipients see updates as you type them.</source>
        <target>Příjemci uvidí aktualizace během jejich psaní.</target>
@@ -4484,22 +4192,10 @@ Error: %@</source>
        <source>Repeat connection request?</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat download" xml:space="preserve">
-        <source>Repeat download</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat import" xml:space="preserve">
-        <source>Repeat import</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Repeat join request?" xml:space="preserve">
        <source>Repeat join request?</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat upload" xml:space="preserve">
-        <source>Repeat upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Odpověď</target>
@@ -4599,10 +4295,6 @@ Error: %@</source>
        <target>SMP servery</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Safer groups" xml:space="preserve">
-        <source>Safer groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Uložit</target>
@@ -4683,19 +4375,11 @@ Error: %@</source>
        <target>Uložit uvítací zprávu?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Saved" xml:space="preserve">
-        <source>Saved</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Saved WebRTC ICE servers will be removed" xml:space="preserve">
        <source>Saved WebRTC ICE servers will be removed</source>
        <target>Uložené servery WebRTC ICE budou odstraněny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Saved from" xml:space="preserve">
-        <source>Saved from</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Saved message" xml:space="preserve">
        <source>Saved message</source>
        <note>message info title</note>
@@ -4970,10 +4654,6 @@ Error: %@</source>
        <target>Nastavit heslo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Set passphrase" xml:space="preserve">
-        <source>Set passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set passphrase to export" xml:space="preserve">
        <source>Set passphrase to export</source>
        <target>Nastavení přístupové fráze pro export</target>
@@ -4994,10 +4674,6 @@ Error: %@</source>
        <target>Nastavení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Shape profile images" xml:space="preserve">
-        <source>Shape profile images</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
        <source>Share</source>
        <target>Sdílet</target>
@@ -5032,10 +4708,6 @@ Error: %@</source>
        <target>Sdílet s kontakty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Show QR code" xml:space="preserve">
-        <source>Show QR code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show calls in phone history" xml:space="preserve">
        <source>Show calls in phone history</source>
        <target>Ukaž hovory v historii telefonu</target>
@@ -5114,14 +4786,6 @@ Error: %@</source>
      <trans-unit id="SimpleX links" xml:space="preserve">
        <source>SimpleX links</source>
        <target>Odkazy na SimpleX</target>
-        <note>chat feature</note>
-      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
-        <source>SimpleX links are prohibited in this group.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
-        <source>SimpleX links not allowed</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
@@ -5159,10 +4823,6 @@ Error: %@</source>
        <target>Někdo</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
-        <source>Square, circle, or anything in between.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Začít chat</target>
@@ -5187,10 +4847,6 @@ Error: %@</source>
        <target>Zastavit SimpleX</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Stop chat" xml:space="preserve">
-        <source>Stop chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
        <source>Stop chat to enable database actions</source>
        <target>Zastavte chat pro povolení akcí databáze</target>
@@ -5231,10 +4887,6 @@ Error: %@</source>
        <target>Přestat sdílet adresu?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Stopping chat" xml:space="preserve">
-        <source>Stopping chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Submit" xml:space="preserve">
        <source>Submit</source>
        <target>Odeslat</target>
@@ -5477,14 +5129,6 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Tuto akci nelze vzít zpět - váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
-        <source>This chat is protected by end-to-end encryption.</source>
-        <note>E2EE info chat item</note>
-      </trans-unit>
-      <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
-        <source>This chat is protected by quantum resistant end-to-end encryption.</source>
-        <note>E2EE info chat item</note>
-      </trans-unit>
      <trans-unit id="This device name" xml:space="preserve">
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
@@ -5765,19 +5409,11 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Zvýšit a otevřít chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Upload failed" xml:space="preserve">
-        <source>Upload failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Upload file" xml:space="preserve">
        <source>Upload file</source>
        <target>Nahrát soubor</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Uploading archive" xml:space="preserve">
-        <source>Uploading archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use .onion hosts" xml:space="preserve">
        <source>Use .onion hosts</source>
        <target>Použít hostitele .onion</target>
@@ -5826,10 +5462,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Použít server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use the app while in the call." xml:space="preserve">
-        <source>Use the app while in the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
        <source>User profile</source>
        <target>Profil uživatele</target>
@@ -5862,14 +5494,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <source>Verify connections</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify database passphrase" xml:space="preserve">
-        <source>Verify database passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify passphrase" xml:space="preserve">
-        <source>Verify passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Ověření bezpečnostního kódu</target>
@@ -5928,10 +5552,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Hlasové zprávy jsou v této skupině zakázány.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages not allowed" xml:space="preserve">
-        <source>Voice messages not allowed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
        <source>Voice messages prohibited!</source>
        <target>Hlasové zprávy jsou zakázány!</target>
@@ -5961,10 +5581,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Čekám na video</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
-        <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
        <source>Warning: you may lose some data!</source>
        <target>Upozornění: můžete ztratit nějaká data!</target>
@@ -5985,10 +5601,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Uvítací zpráva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Welcome message is too long" xml:space="preserve">
-        <source>Welcome message is too long</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="What's new" xml:space="preserve">
        <source>What's new</source>
        <target>Co je nového</target>
@@ -5999,10 +5611,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Když je k dispozici</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
-        <source>When connecting audio and video calls.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
        <source>When people request to connect, you can accept or reject it.</source>
        <target>Když někdo požádá o připojení, můžete žádost přijmout nebo odmítnout.</target>
@@ -6013,18 +5621,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Pokud s někým sdílíte inkognito profil, bude tento profil použit pro skupiny, do kterých vás pozve.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="WiFi" xml:space="preserve">
-        <source>WiFi</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
-        <source>Will be enabled in direct chats!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Wired ethernet" xml:space="preserve">
-        <source>Wired ethernet</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="With encrypted files and media." xml:space="preserve">
        <source>With encrypted files and media.</source>
        <note>No comment provided by engineer.</note>
@@ -6058,10 +5654,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Vy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
-        <source>You **must not** use the same database on two devices.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You accepted connection" xml:space="preserve">
        <source>You accepted connection</source>
        <target>Přijali jste spojení</target>
@@ -6141,10 +5733,6 @@ Repeat join request?</source>
        <target>Můžete je povolit později v nastavení Soukromí &amp; Bezpečnosti aplikace</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can give another try." xml:space="preserve">
-        <source>You can give another try.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
        <source>You can hide or mute a user profile - swipe it to the right.</source>
        <target>Profil uživatele můžete skrýt nebo ztlumit - přejeďte prstem doprava.</target>
@@ -6488,10 +6076,6 @@ Servery SimpleX nevidí váš profil.</target>
        <target>správce</target>
        <note>member role</note>
      </trans-unit>
-      <trans-unit id="admins" xml:space="preserve">
-        <source>admins</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
        <target>povoluji šifrování pro %@…</target>
@@ -6502,10 +6086,6 @@ Servery SimpleX nevidí váš profil.</target>
        <target>povoluji šifrování…</target>
        <note>chat item text</note>
      </trans-unit>
-      <trans-unit id="all members" xml:space="preserve">
-        <source>all members</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
        <source>always</source>
        <target>vždy</target>
@@ -6536,7 +6116,7 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="blocked" xml:space="preserve">
        <source>blocked</source>
-        <note>marked deleted chat item preview text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="blocked %@" xml:space="preserve">
        <source>blocked %@</source>
@@ -6544,7 +6124,7 @@ Servery SimpleX nevidí váš profil.</target>
      </trans-unit>
      <trans-unit id="blocked by admin" xml:space="preserve">
        <source>blocked by admin</source>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item</note>
      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
@@ -6828,10 +6408,6 @@ Servery SimpleX nevidí váš profil.</target>
        <source>event happened</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="forwarded" xml:space="preserve">
-        <source>forwarded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>skupina smazána</target>
@@ -6974,7 +6550,7 @@ Servery SimpleX nevidí váš profil.</target>
      <trans-unit id="moderated by %@" xml:space="preserve">
        <source>moderated by %@</source>
        <target>moderovaný %@</target>
-        <note>marked deleted chat item preview text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="months" xml:space="preserve">
        <source>months</source>
@@ -7038,19 +6614,11 @@ Servery SimpleX nevidí váš profil.</target>
        <target>vlastník</target>
        <note>member role</note>
      </trans-unit>
-      <trans-unit id="owners" xml:space="preserve">
-        <source>owners</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="peer-to-peer" xml:space="preserve">
        <source>peer-to-peer</source>
        <target>peer-to-peer</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
-        <source>quantum resistant e2e encryption</source>
-        <note>chat item text</note>
-      </trans-unit>
      <trans-unit id="received answer…" xml:space="preserve">
        <source>received answer…</source>
        <target>obdržel odpověď…</target>
@@ -7089,14 +6657,6 @@ Servery SimpleX nevidí váš profil.</target>
        <target>odstranil vás</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="saved" xml:space="preserve">
-        <source>saved</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="saved from %@" xml:space="preserve">
-        <source>saved from %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
        <source>sec</source>
        <target>sek</target>
@@ -7130,10 +6690,6 @@ Servery SimpleX nevidí váš profil.</target>
        <source>set new profile picture</source>
        <note>profile update event chat item</note>
      </trans-unit>
-      <trans-unit id="standard end-to-end encryption" xml:space="preserve">
-        <source>standard end-to-end encryption</source>
-        <note>chat item text</note>
-      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
        <source>starting…</source>
        <target>začíná…</target>
@@ -7230,10 +6786,6 @@ Servery SimpleX nevidí váš profil.</target>
        <target>ano</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="you" xml:space="preserve">
-        <source>you</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="you are invited to group" xml:space="preserve">
        <source>you are invited to group</source>
        <target>jste pozváni do skupiny</target>
@@ -105,10 +105,6 @@
        <source>%@ connected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ downloaded" xml:space="preserve">
-        <source>%@ downloaded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ on yhdistetty!</target>
@@ -129,10 +125,6 @@
        <target>%@ palvelimet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ uploaded" xml:space="preserve">
-        <source>%@ uploaded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ wants to connect!" xml:space="preserve">
        <source>%@ wants to connect!</source>
        <target>%@ haluaa muodostaa yhteyden!</target>
@@ -338,10 +330,6 @@
        <target>**Yksityisin**: älä käytä SimpleX Chat -ilmoituspalvelinta, tarkista viestit ajoittain taustalla (riippuu siitä, kuinka usein käytät sovellusta).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve">
-        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Huomaa**: et voi palauttaa tai muuttaa tunnuslausetta, jos kadotat sen.</target>
@@ -357,10 +345,6 @@
        <target>**Varoitus**: Välittömät push-ilmoitukset vaativat tunnuslauseen, joka on tallennettu Keychainiin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve">
-        <source>**Warning**: the archive will be removed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
        <source>**e2e encrypted** audio call</source>
        <target>**e2e-salattu** äänipuhelu</target>
@@ -609,10 +593,6 @@
        <target>Osoitteenmuutos keskeytetään. Käytetään vanhaa vastaanotto-osoitetta.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Admins can block a member for all." xml:space="preserve">
-        <source>Admins can block a member for all.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
        <source>Admins can create the links to join groups.</source>
        <target>Ylläpitäjät voivat luoda linkkejä ryhmiin liittymiseen.</target>
@@ -666,10 +646,6 @@
        <target>Kaikki kontaktisi pysyvät yhteydessä. Profiilipäivitys lähetetään kontakteillesi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
-        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
        <source>Allow</source>
        <target>Salli</target>
@@ -715,10 +691,6 @@
        <target>Salli lähetettyjen viestien peruuttamaton poistaminen. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
-        <source>Allow to send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
        <source>Allow to send files and media.</source>
        <target>Salli tiedostojen ja median lähettäminen.</target>
@@ -797,10 +769,6 @@
        <target>Sovellusversio: %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="App data migration" xml:space="preserve">
-        <source>App data migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
        <source>App encrypts new local files (except videos).</source>
        <note>No comment provided by engineer.</note>
@@ -835,18 +803,6 @@
        <target>Ulkonäkö</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Apply" xml:space="preserve">
-        <source>Apply</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Archive and upload" xml:space="preserve">
-        <source>Archive and upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Archiving database" xml:space="preserve">
-        <source>Archiving database</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Attach" xml:space="preserve">
        <source>Attach</source>
        <target>Liitä</target>
@@ -1026,10 +982,6 @@
        <target>Peruuta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Cancel migration" xml:space="preserve">
-        <source>Cancel migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
        <source>Cannot access keychain to save database password</source>
        <target>Ei pääsyä avainnippuun tietokannan salasanan tallentamiseksi</target>
@@ -1040,10 +992,6 @@
        <target>Tiedostoa ei voi vastaanottaa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Cellular" xml:space="preserve">
-        <source>Cellular</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Change" xml:space="preserve">
        <source>Change</source>
        <target>Muuta</target>
@@ -1134,10 +1082,6 @@
        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Chat migrated!" xml:space="preserve">
-        <source>Chat migrated!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Chat-asetukset</target>
@@ -1158,10 +1102,6 @@
        <target>Kiinalainen ja espanjalainen käyttöliittymä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve">
-        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Choose file" xml:space="preserve">
        <source>Choose file</source>
        <target>Valitse tiedosto</target>
@@ -1231,10 +1171,6 @@
        <target>Vahvista tietokannan päivitykset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Confirm network settings" xml:space="preserve">
-        <source>Confirm network settings</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Confirm new passphrase…" xml:space="preserve">
        <source>Confirm new passphrase…</source>
        <target>Vahvista uusi tunnuslause…</target>
@@ -1245,14 +1181,6 @@
        <target>Vahvista salasana</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
-        <source>Confirm that you remember database passphrase to migrate it.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Confirm upload" xml:space="preserve">
-        <source>Confirm upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect" xml:space="preserve">
        <source>Connect</source>
        <target>Yhdistä</target>
@@ -1493,10 +1421,6 @@ This is your own one-time link!</source>
        <target>Luotu %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Creating archive link" xml:space="preserve">
-        <source>Creating archive link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Creating link…" xml:space="preserve">
        <source>Creating link…</source>
        <note>No comment provided by engineer.</note>
@@ -1712,10 +1636,6 @@ This cannot be undone!</source>
        <target>Poista tietokanta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete database from this device" xml:space="preserve">
-        <source>Delete database from this device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete file" xml:space="preserve">
        <source>Delete file</source>
        <target>Poista tiedosto</target>
@@ -2000,27 +1920,11 @@ This cannot be undone!</source>
        <target>Alenna ja avaa keskustelu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Download" xml:space="preserve">
-        <source>Download</source>
-        <note>chat item action</note>
-      </trans-unit>
-      <trans-unit id="Download failed" xml:space="preserve">
-        <source>Download failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Download file" xml:space="preserve">
        <source>Download file</source>
        <target>Lataa tiedosto</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Downloading archive" xml:space="preserve">
-        <source>Downloading archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Downloading link details" xml:space="preserve">
-        <source>Downloading link details</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Duplicate display name!" xml:space="preserve">
        <source>Duplicate display name!</source>
        <target>Päällekkäinen näyttönimi!</target>
@@ -2075,10 +1979,6 @@ This cannot be undone!</source>
        <target>Salli kaikille</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enable in direct chats (BETA)!" xml:space="preserve">
-        <source>Enable in direct chats (BETA)!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enable instant notifications?" xml:space="preserve">
        <source>Enable instant notifications?</source>
        <target>Salli välittömät ilmoitukset?</target>
@@ -2109,10 +2009,6 @@ This cannot be undone!</source>
        <target>Ota itsetuhoava pääsykoodi käyttöön</target>
        <note>set passcode view</note>
      </trans-unit>
-      <trans-unit id="Enabled for" xml:space="preserve">
-        <source>Enabled for</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Encrypt" xml:space="preserve">
        <source>Encrypt</source>
        <target>Salaa</target>
@@ -2193,10 +2089,6 @@ This cannot be undone!</source>
        <source>Enter group name…</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter passphrase" xml:space="preserve">
-        <source>Enter passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Syötä tunnuslause…</target>
@@ -2343,10 +2235,6 @@ This cannot be undone!</source>
        <target>Virhe käyttäjäprofiilin poistamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error downloading the archive" xml:space="preserve">
-        <source>Error downloading the archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
        <source>Error enabling delivery receipts!</source>
        <target>Virhe toimituskuittauksien sallimisessa!</target>
@@ -2421,10 +2309,6 @@ This cannot be undone!</source>
        <target>Virhe tunnuslauseen tallentamisessa avainnippuun</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error saving settings" xml:space="preserve">
-        <source>Error saving settings</source>
-        <note>when migrating</note>
-      </trans-unit>
      <trans-unit id="Error saving user password" xml:space="preserve">
        <source>Error saving user password</source>
        <target>Virhe käyttäjän salasanan tallentamisessa</target>
@@ -2493,14 +2377,6 @@ This cannot be undone!</source>
        <target>Virhe päivitettäessä käyttäjän tietosuojaa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Error uploading the archive" xml:space="preserve">
-        <source>Error uploading the archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error verifying passphrase:" xml:space="preserve">
-        <source>Error verifying passphrase:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error: " xml:space="preserve">
        <source>Error: </source>
        <target>Virhe: </target>
@@ -2550,10 +2426,6 @@ This cannot be undone!</source>
        <target>Viety tietokanta-arkisto.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Exported file doesn't exist" xml:space="preserve">
-        <source>Exported file doesn't exist</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Exporting database archive…" xml:space="preserve">
        <source>Exporting database archive…</source>
        <target>Tietokanta-arkiston vienti…</target>
@@ -2613,10 +2485,6 @@ This cannot be undone!</source>
        <target>Tiedostot ja media ovat tässä ryhmässä kiellettyjä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Files and media not allowed" xml:space="preserve">
-        <source>Files and media not allowed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Files and media prohibited!" xml:space="preserve">
        <source>Files and media prohibited!</source>
        <target>Tiedostot ja media kielletty!</target>
@@ -2627,14 +2495,6 @@ This cannot be undone!</source>
        <target>Suodata lukemattomia- ja suosikkikeskusteluja.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Finalize migration" xml:space="preserve">
-        <source>Finalize migration</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Finalize migration on another device." xml:space="preserve">
-        <source>Finalize migration on another device.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Finally, we have them! 🚀" xml:space="preserve">
        <source>Finally, we have them! 🚀</source>
        <target>Vihdoinkin meillä! 🚀</target>
@@ -2680,22 +2540,6 @@ This cannot be undone!</source>
        <target>Konsoliin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Forward" xml:space="preserve">
-        <source>Forward</source>
-        <note>chat item action</note>
-      </trans-unit>
-      <trans-unit id="Forward and save messages" xml:space="preserve">
-        <source>Forward and save messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Forwarded" xml:space="preserve">
-        <source>Forwarded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Forwarded from" xml:space="preserve">
-        <source>Forwarded from</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Found desktop" xml:space="preserve">
        <source>Found desktop</source>
        <note>No comment provided by engineer.</note>
@@ -2802,10 +2646,6 @@ This cannot be undone!</source>
        <target>Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can send SimpleX links." xml:space="preserve">
-        <source>Group members can send SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
        <source>Group members can send direct messages.</source>
        <target>Ryhmän jäsenet voivat lähettää suoraviestejä.</target>
@@ -2940,10 +2780,6 @@ This cannot be undone!</source>
        <target>Miten käytät palvelimiasi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Hungarian interface" xml:space="preserve">
-        <source>Hungarian interface</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="ICE servers (one per line)" xml:space="preserve">
        <source>ICE servers (one per line)</source>
        <target>ICE-palvelimet (yksi per rivi)</target>
@@ -3009,14 +2845,6 @@ This cannot be undone!</source>
        <target>Tuo tietokanta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Import failed" xml:space="preserve">
-        <source>Import failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Importing archive" xml:space="preserve">
-        <source>Importing archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -3031,19 +2859,11 @@ This cannot be undone!</source>
        <target>Parannettu palvelimen kokoonpano</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
-        <source>In order to continue, chat should be stopped.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="In reply to" xml:space="preserve">
        <source>In reply to</source>
        <target>Vastauksena</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="In-call sounds" xml:space="preserve">
-        <source>In-call sounds</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito" xml:space="preserve">
        <source>Incognito</source>
        <target>Incognito</target>
@@ -3146,10 +2966,6 @@ This cannot be undone!</source>
        <source>Invalid link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid migration confirmation" xml:space="preserve">
-        <source>Invalid migration confirmation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid name!" xml:space="preserve">
        <source>Invalid name!</source>
        <note>No comment provided by engineer.</note>
@@ -3500,19 +3316,11 @@ This is your link for group %@!</source>
        <target>Viestireaktiot ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message source remains private." xml:space="preserve">
-        <source>Message source remains private.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Message text" xml:space="preserve">
        <source>Message text</source>
        <target>Viestin teksti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Message too large" xml:space="preserve">
-        <source>Message too large</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Messages" xml:space="preserve">
        <source>Messages</source>
        <target>Viestit</target>
@@ -3527,47 +3335,11 @@ This is your link for group %@!</source>
        <source>Messages from %@ will be shown!</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
-        <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
-        <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate device" xml:space="preserve">
-        <source>Migrate device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate from another device" xml:space="preserve">
-        <source>Migrate from another device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate here" xml:space="preserve">
-        <source>Migrate here</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate to another device" xml:space="preserve">
-        <source>Migrate to another device</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrate to another device via QR code." xml:space="preserve">
-        <source>Migrate to another device via QR code.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Migrating" xml:space="preserve">
-        <source>Migrating</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Siirretään tietokannan arkistoa…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Migration complete" xml:space="preserve">
-        <source>Migration complete</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migration error:" xml:space="preserve">
        <source>Migration error:</source>
        <target>Siirtovirhe:</target>
@@ -3608,10 +3380,6 @@ This is your link for group %@!</source>
        <target>Lisää parannuksia on tulossa pian!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="More reliable network connection." xml:space="preserve">
-        <source>More reliable network connection.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
        <source>Most likely this connection is deleted.</source>
        <target>Todennäköisesti tämä yhteys on poistettu.</target>
@@ -3647,14 +3415,6 @@ This is your link for group %@!</source>
        <target>Verkko ja palvelimet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Network connection" xml:space="preserve">
-        <source>Network connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Network management" xml:space="preserve">
-        <source>Network management</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Network settings" xml:space="preserve">
        <source>Network settings</source>
        <target>Verkkoasetukset</target>
@@ -3763,10 +3523,6 @@ This is your link for group %@!</source>
        <target>Ei historiaa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="No network connection" xml:space="preserve">
-        <source>No network connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Ei lupaa ääniviestin tallentamiseen</target>
@@ -3937,10 +3693,6 @@ This is your link for group %@!</source>
        <source>Open group</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Open migration to another device" xml:space="preserve">
-        <source>Open migration to another device</source>
-        <note>authentication reason</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Avaa käyttäjäprofiilit</target>
@@ -3955,26 +3707,14 @@ This is your link for group %@!</source>
        <source>Opening app…</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Or paste archive link" xml:space="preserve">
-        <source>Or paste archive link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Or scan QR code" xml:space="preserve">
        <source>Or scan QR code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Or securely share this file link" xml:space="preserve">
-        <source>Or securely share this file link</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Or show this code" xml:space="preserve">
        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Other" xml:space="preserve">
-        <source>Other</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING-määrä</target>
@@ -4051,10 +3791,6 @@ This is your link for group %@!</source>
        <target>Pysyvä salauksen purkuvirhe</target>
        <note>message decrypt error item</note>
      </trans-unit>
-      <trans-unit id="Picture-in-picture calls" xml:space="preserve">
-        <source>Picture-in-picture calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
        <source>Please ask your contact to enable sending voice messages.</source>
        <target>Pyydä kontaktiasi sallimaan ääniviestien lähettäminen.</target>
@@ -4075,10 +3811,6 @@ This is your link for group %@!</source>
        <target>Tarkista omasi ja kontaktin asetukset.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Please confirm that network settings are correct for this device." xml:space="preserve">
-        <source>Please confirm that network settings are correct for this device.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
        <source>Please contact developers.
 Error: %@</source>
@@ -4183,10 +3915,6 @@ Error: %@</source>
        <target>Profiilikuva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile images" xml:space="preserve">
-        <source>Profile images</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile name" xml:space="preserve">
        <source>Profile name</source>
        <note>No comment provided by engineer.</note>
@@ -4225,10 +3953,6 @@ Error: %@</source>
        <target>Estä viestireaktiot.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
-        <source>Prohibit sending SimpleX links.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
        <source>Prohibit sending direct messages to members.</source>
        <target>Estä suorien viestien lähettäminen jäsenille.</target>
@@ -4274,14 +3998,6 @@ Error: %@</source>
        <target>Push-ilmoitukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Push server" xml:space="preserve">
-        <source>Push server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Quantum resistant encryption" xml:space="preserve">
-        <source>Quantum resistant encryption</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Rate the app" xml:space="preserve">
        <source>Rate the app</source>
        <target>Arvioi sovellus</target>
@@ -4356,10 +4072,6 @@ Error: %@</source>
        <target>Vastaanotto-osoite vaihdetaan toiseen palvelimeen. Osoitteenmuutos tehdään sen jälkeen, kun lähettäjä tulee verkkoon.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Receiving concurrency" xml:space="preserve">
-        <source>Receiving concurrency</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Receiving file will be stopped." xml:space="preserve">
        <source>Receiving file will be stopped.</source>
        <target>Tiedoston vastaanotto pysäytetään.</target>
@@ -4374,10 +4086,6 @@ Error: %@</source>
        <source>Recent history and improved [directory bot](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Recipient(s) can't see who this message is from." xml:space="preserve">
-        <source>Recipient(s) can't see who this message is from.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Recipients see updates as you type them." xml:space="preserve">
        <source>Recipients see updates as you type them.</source>
        <target>Vastaanottajat näkevät päivitykset, kun kirjoitat niitä.</target>
@@ -4472,22 +4180,10 @@ Error: %@</source>
        <source>Repeat connection request?</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat download" xml:space="preserve">
-        <source>Repeat download</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat import" xml:space="preserve">
-        <source>Repeat import</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Repeat join request?" xml:space="preserve">
        <source>Repeat join request?</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat upload" xml:space="preserve">
-        <source>Repeat upload</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Vastaa</target>
@@ -4587,10 +4283,6 @@ Error: %@</source>
        <target>SMP-palvelimet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Safer groups" xml:space="preserve">
-        <source>Safer groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Tallenna</target>
@@ -4671,19 +4363,11 @@ Error: %@</source>
        <target>Tallenna tervetuloviesti?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Saved" xml:space="preserve">
-        <source>Saved</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Saved WebRTC ICE servers will be removed" xml:space="preserve">
        <source>Saved WebRTC ICE servers will be removed</source>
        <target>Tallennetut WebRTC ICE -palvelimet poistetaan</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Saved from" xml:space="preserve">
-        <source>Saved from</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Saved message" xml:space="preserve">
        <source>Saved message</source>
        <note>message info title</note>
@@ -4957,10 +4641,6 @@ Error: %@</source>
        <target>Aseta pääsykoodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Set passphrase" xml:space="preserve">
-        <source>Set passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set passphrase to export" xml:space="preserve">
        <source>Set passphrase to export</source>
        <target>Aseta tunnuslause vientiä varten</target>
@@ -4981,10 +4661,6 @@ Error: %@</source>
        <target>Asetukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Shape profile images" xml:space="preserve">
-        <source>Shape profile images</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Share" xml:space="preserve">
        <source>Share</source>
        <target>Jaa</target>
@@ -5019,10 +4695,6 @@ Error: %@</source>
        <target>Jaa kontaktien kanssa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Show QR code" xml:space="preserve">
-        <source>Show QR code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Show calls in phone history" xml:space="preserve">
        <source>Show calls in phone history</source>
        <target>Näytä puhelut puhelinhistoriassa</target>
@@ -5101,14 +4773,6 @@ Error: %@</source>
      <trans-unit id="SimpleX links" xml:space="preserve">
        <source>SimpleX links</source>
        <target>SimpleX-linkit</target>
-        <note>chat feature</note>
-      </trans-unit>
-      <trans-unit id="SimpleX links are prohibited in this group." xml:space="preserve">
-        <source>SimpleX links are prohibited in this group.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="SimpleX links not allowed" xml:space="preserve">
-        <source>SimpleX links not allowed</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
@@ -5145,10 +4809,6 @@ Error: %@</source>
        <target>Joku</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Square, circle, or anything in between." xml:space="preserve">
-        <source>Square, circle, or anything in between.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Aloita keskustelu</target>
@@ -5173,10 +4833,6 @@ Error: %@</source>
        <target>Lopeta SimpleX</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Stop chat" xml:space="preserve">
-        <source>Stop chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
        <source>Stop chat to enable database actions</source>
        <target>Pysäytä keskustelu tietokantatoimien mahdollistamiseksi</target>
@@ -5217,10 +4873,6 @@ Error: %@</source>
        <target>Lopeta osoitteen jakaminen?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Stopping chat" xml:space="preserve">
-        <source>Stopping chat</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Submit" xml:space="preserve">
        <source>Submit</source>
        <target>Lähetä</target>
@@ -5463,14 +5115,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tätä toimintoa ei voi kumota - profiilisi, kontaktisi, viestisi ja tiedostosi poistuvat peruuttamattomasti.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This chat is protected by end-to-end encryption." xml:space="preserve">
-        <source>This chat is protected by end-to-end encryption.</source>
-        <note>E2EE info chat item</note>
-      </trans-unit>
-      <trans-unit id="This chat is protected by quantum resistant end-to-end encryption." xml:space="preserve">
-        <source>This chat is protected by quantum resistant end-to-end encryption.</source>
-        <note>E2EE info chat item</note>
-      </trans-unit>
      <trans-unit id="This device name" xml:space="preserve">
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
@@ -5750,19 +5394,11 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Päivitä ja avaa keskustelu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Upload failed" xml:space="preserve">
-        <source>Upload failed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Upload file" xml:space="preserve">
        <source>Upload file</source>
        <target>Lataa tiedosto</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Uploading archive" xml:space="preserve">
-        <source>Uploading archive</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use .onion hosts" xml:space="preserve">
        <source>Use .onion hosts</source>
        <target>Käytä .onion-isäntiä</target>
@@ -5811,10 +5447,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käytä palvelinta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use the app while in the call." xml:space="preserve">
-        <source>Use the app while in the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
        <source>User profile</source>
        <target>Käyttäjäprofiili</target>
@@ -5847,14 +5479,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <source>Verify connections</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify database passphrase" xml:space="preserve">
-        <source>Verify database passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify passphrase" xml:space="preserve">
-        <source>Verify passphrase</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Tarkista turvakoodi</target>
@@ -5913,10 +5537,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Ääniviestit ovat kiellettyjä tässä ryhmässä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Voice messages not allowed" xml:space="preserve">
-        <source>Voice messages not allowed</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Voice messages prohibited!" xml:space="preserve">
        <source>Voice messages prohibited!</source>
        <target>Ääniviestit kielletty!</target>
@@ -5946,10 +5566,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Odottaa videota</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Warning: starting chat on multiple devices is not supported and will cause message delivery failures" xml:space="preserve">
-        <source>Warning: starting chat on multiple devices is not supported and will cause message delivery failures</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Warning: you may lose some data!" xml:space="preserve">
        <source>Warning: you may lose some data!</source>
        <target>Varoitus: saatat menettää joitain tietoja!</target>
@@ -5970,10 +5586,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Tervetuloviesti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Welcome message is too long" xml:space="preserve">
-        <source>Welcome message is too long</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="What's new" xml:space="preserve">
        <source>What's new</source>
        <target>Uusimmat</target>
@@ -5984,10 +5596,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Kun saatavilla</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="When connecting audio and video calls." xml:space="preserve">
-        <source>When connecting audio and video calls.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="When people request to connect, you can accept or reject it." xml:space="preserve">
        <source>When people request to connect, you can accept or reject it.</source>
        <target>Kun ihmiset pyytävät yhteyden muodostamista, voit hyväksyä tai hylätä sen.</target>
@@ -5998,18 +5606,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Kun jaat inkognitoprofiilin jonkun kanssa, tätä profiilia käytetään ryhmissä, joihin tämä sinut kutsuu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="WiFi" xml:space="preserve">
-        <source>WiFi</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Will be enabled in direct chats!" xml:space="preserve">
-        <source>Will be enabled in direct chats!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Wired ethernet" xml:space="preserve">
-        <source>Wired ethernet</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="With encrypted files and media." xml:space="preserve">
        <source>With encrypted files and media.</source>
        <note>No comment provided by engineer.</note>
@@ -6043,10 +5639,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Sinä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
-        <source>You **must not** use the same database on two devices.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You accepted connection" xml:space="preserve">
        <source>You accepted connection</source>
        <target>Hyväksyit yhteyden</target>
@@ -6126,10 +5718,6 @@ Repeat join request?</source>
        <target>Voit ottaa ne käyttöön myöhemmin sovelluksen Yksityisyys &amp; Turvallisuus -asetuksista.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can give another try." xml:space="preserve">
-        <source>You can give another try.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
        <source>You can hide or mute a user profile - swipe it to the right.</source>
        <target>Voit piilottaa tai mykistää käyttäjäprofiilin pyyhkäisemällä sitä oikealle.</target>
@@ -6473,10 +6061,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>ylläpitäjä</target>
        <note>member role</note>
      </trans-unit>
-      <trans-unit id="admins" xml:space="preserve">
-        <source>admins</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
        <source>agreeing encryption for %@…</source>
        <target>salauksesta sovitaan %@:lle…</target>
@@ -6487,10 +6071,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>hyväksyy salausta…</target>
        <note>chat item text</note>
      </trans-unit>
-      <trans-unit id="all members" xml:space="preserve">
-        <source>all members</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="always" xml:space="preserve">
        <source>always</source>
        <target>aina</target>
@@ -6521,7 +6101,7 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
      </trans-unit>
      <trans-unit id="blocked" xml:space="preserve">
        <source>blocked</source>
-        <note>marked deleted chat item preview text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="blocked %@" xml:space="preserve">
        <source>blocked %@</source>
@@ -6529,7 +6109,7 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
      </trans-unit>
      <trans-unit id="blocked by admin" xml:space="preserve">
        <source>blocked by admin</source>
-        <note>marked deleted chat item preview text</note>
+        <note>blocked chat item</note>
      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
@@ -6813,10 +6393,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>tapahtuma tapahtui</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="forwarded" xml:space="preserve">
-        <source>forwarded</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="group deleted" xml:space="preserve">
        <source>group deleted</source>
        <target>ryhmä poistettu</target>
@@ -6959,7 +6535,7 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
      <trans-unit id="moderated by %@" xml:space="preserve">
        <source>moderated by %@</source>
        <target>%@ moderoi</target>
-        <note>marked deleted chat item preview text</note>
+        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="months" xml:space="preserve">
        <source>months</source>
@@ -7023,19 +6599,11 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>omistaja</target>
        <note>member role</note>
      </trans-unit>
-      <trans-unit id="owners" xml:space="preserve">
-        <source>owners</source>
-        <note>feature role</note>
-      </trans-unit>
      <trans-unit id="peer-to-peer" xml:space="preserve">
        <source>peer-to-peer</source>
        <target>vertais</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="quantum resistant e2e encryption" xml:space="preserve">
-        <source>quantum resistant e2e encryption</source>
-        <note>chat item text</note>
-      </trans-unit>
      <trans-unit id="received answer…" xml:space="preserve">
        <source>received answer…</source>
        <target>vastaus saatu…</target>
@@ -7074,14 +6642,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>poisti sinut</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="saved" xml:space="preserve">
-        <source>saved</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="saved from %@" xml:space="preserve">
-        <source>saved from %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="sec" xml:space="preserve">
        <source>sec</source>
        <target>sek</target>
@@ -7114,10 +6674,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <source>set new profile picture</source>
        <note>profile update event chat item</note>
      </trans-unit>
-      <trans-unit id="standard end-to-end encryption" xml:space="preserve">
-        <source>standard end-to-end encryption</source>
-        <note>chat item text</note>
-      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
        <source>starting…</source>
        <target>alkaa…</target>
@@ -7214,10 +6770,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>kyllä</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="you" xml:space="preserve">
-        <source>you</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="you are invited to group" xml:space="preserve">
        <source>you are invited to group</source>
        <target>sinut on kutsuttu ryhmään</target>
@@ -5311,11 +5311,6 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">ללא היסטוריה</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
-        <source>%@ and %@</source>
-        <target state="translated">%@ ו-%@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="he" datatype="plaintext">
@@ -1,15 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "locale" : "hu"
-    }
-  ],
-  "properties" : {
-    "localizable" : true
-  },
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.000",
-          "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.533"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "properties" : {
-    "localizable" : true
-  },
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
spaced4ndy	35cf113d98	Merge branch 'master' into master-ghc8107	2024-01-22 18:44:13 +04:00
Evgeny Poberezkin	a0e056994e	Merge branch 'master' into master-ghc8107	2024-01-20 21:36:23 +00:00
Evgeny Poberezkin	e69db17804	Merge branch 'master' into master-ghc8107	2024-01-20 15:07:20 +00:00
Evgeny Poberezkin	ad2eaeb004	Merge branch 'master' into master-ghc8107	2024-01-17 19:29:49 +00:00
Evgeny Poberezkin	4296515473	Merge branch 'master' into master-ghc8107	2024-01-10 12:06:48 +00:00
Evgeny Poberezkin	c8a269e391	Merge branch 'master' into master-ghc8107	2024-01-09 11:07:32 +00:00
Evgeny Poberezkin	42ea1df342	Merge branch 'master' into master-ghc8107	2023-12-30 19:19:39 +00:00
Evgeny Poberezkin	ff239d81e5	Merge branch 'master' into master-ghc8107	2023-12-27 21:02:11 +00:00
Evgeny Poberezkin	0a6e47dd61	Merge branch 'master' into master-ghc8107	2023-12-27 20:57:25 +00:00
Evgeny Poberezkin	ee75219ed3	core: 5.4.2.1 (simplexmq 5.5.0.2)	2023-12-27 20:57:05 +00:00
Evgeny Poberezkin	9918d91def	Merge branch 'master' into master-ghc8107	2023-12-27 14:09:23 +00:00
Evgeny Poberezkin	de637fab50	Merge branch 'master' into master-ghc8107	2023-12-26 21:12:36 +00:00
Evgeny Poberezkin	6d0a83aa58	Merge branch 'master' into master-ghc8107	2023-12-23 19:57:08 +00:00
Evgeny Poberezkin	6a66525927	Merge branch 'master' into master-ghc8107	2023-12-23 17:24:47 +00:00
Evgeny Poberezkin	f5ed8debcc	Merge branch 'master' into master-ghc8107	2023-12-23 15:11:38 +00:00
Evgeny Poberezkin	355d2449c5	fix for GHC 8.10.7	2023-12-23 15:05:36 +00:00
Evgeny Poberezkin	f7382cdd6f	Merge branch 'master' into master-ghc8107	2023-12-23 13:52:44 +00:00
Evgeny Poberezkin	521b901cc9	Merge branch 'master' into master-ghc8107 (without changes for iPhone7)	2023-12-21 09:59:25 +00:00
Evgeny Poberezkin	754c76d6fd	Merge branch 'master' into master-ghc8107	2023-12-21 00:45:10 +00:00
Evgeny Poberezkin	aea7ff1c89	nix: fix script	2023-12-13 20:27:58 +00:00
Evgeny Poberezkin	256f85024f	Merge branch 'master' into master-ghc8107	2023-12-13 12:35:37 +00:00
Evgeny Poberezkin	870f9e42dd	Merge branch 'master' into master-ghc8107	2023-12-12 20:09:39 +00:00
Evgeny Poberezkin	8a66390a78	fix for GHC 8.10.7	2023-12-11 16:14:56 +00:00
Evgeny Poberezkin	6546426ec0	Merge branch 'master' into master-ghc8107	2023-12-11 14:56:25 +00:00
spaced4ndy	53560378bb	Merge branch 'master' into master-ghc8107	2023-12-11 17:52:48 +04:00
Evgeny Poberezkin	9f3d3e8ba4	Merge branch 'master' into master-ghc8107	2023-12-07 15:00:23 +00:00
Evgeny Poberezkin	087acd9180	changes to support GHC 8.10.7 (#3512 ) * Revert "raise lower bound on mtl to a real version (#3499)" This reverts commit `f94c0311c1`. * Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)" This reverts commit `9a1c7f41f7`. * update simplexmq * remove netword-transport fork * compatibility with GHC 8.10.7 * simplexmq * fix test * simplexmq, deps * update sqlcipher deps in sha256nix * fix index-state in cabal.project * index-state * remove import * add cabal.project.freeze * simplexmq * remove freeze * simplexmq * bytestring,simplexmq * template-haskell, simplexmq * simplexmq * simplexmq * simplexmq * mtl * simplexmq * remove duplicate index-state	2023-12-04 12:29:49 +00:00
Evgeny Poberezkin	0b822e4a5c	Merge branch 'master' into master-ghc8107	2023-12-04 10:07:16 +00:00
Evgeny Poberezkin	f8a469488e	Merge branch 'master' into master-ghc8107	2023-12-02 12:30:36 +00:00
Evgeny Poberezkin	3b5e806418	Merge branch 'master' into master-ghc8107	2023-12-01 17:46:12 +00:00
spaced4ndy	ef5c13b1c1	Merge branch 'master' into master-ghc8107	2023-11-30 21:10:51 +04:00
spaced4ndy	38533213d2	Merge branch 'master' into master-ghc8107	2023-11-30 20:56:51 +04:00
spaced4ndy	b0002fe07d	Merge branch 'master' into master-ghc8107	2023-11-27 19:17:39 +04:00
Evgeny Poberezkin	4a311b9578	fix for ghc 8.10.7	2023-11-26 19:34:39 +00:00
Evgeny Poberezkin	b8da5e225b	Merge branch 'master' into master-ghc8107	2023-11-26 18:53:40 +00:00
Evgeny Poberezkin	5cc537f14c	Merge branch 'master' into master-ghc8107	2023-11-26 11:50:50 +00:00
Evgeny Poberezkin	0c096e2c89	Merge branch 'master' into master-ghc8107	2023-11-24 19:00:30 +00:00
Evgeny Poberezkin	1781495ee3	Merge branch 'master' into master-ghc8107	2023-11-23 16:22:46 +00:00
Evgeny Poberezkin	45102442f4	Merge branch 'master' into master-ghc8107	2023-11-21 21:15:10 +00:00
spaced4ndy	3bdc6b5e28	Merge branch 'master' into master-ghc8107	2023-11-21 19:41:06 +04:00
Evgeny Poberezkin	3597d34716	Merge branch 'master' into master-ghc8107	2023-11-21 00:00:59 +00:00
Evgeny Poberezkin	55ead740cc	update hpack	2023-11-20 14:43:05 +00:00
Evgeny Poberezkin	49a9b0e7d6	update hpack version	2023-11-20 14:30:10 +00:00
Evgeny Poberezkin	307a1b3c5e	fix for ghc 8.10.7	2023-11-20 13:23:45 +00:00
Evgeny Poberezkin	ed6b3bbead	Merge branch 'master' into master-ghc8107	2023-11-20 13:01:22 +00:00
spaced4ndy	7d4127c51d	Merge branch 'master' into master-ghc8107	2023-11-20 14:07:08 +04:00
Evgeny Poberezkin	e1a8099474	fix for GHC 8.10.7	2023-11-20 00:06:45 +00:00
Evgeny Poberezkin	daa8d9bb21	Merge branch 'master' into master-ghc8107	2023-11-19 23:42:13 +00:00
Evgeny Poberezkin	3937ffa9a6	Merge branch 'master' into master-ghc8107	2023-11-17 11:47:52 +00:00
Evgeny Poberezkin	f6e66f1c53	Merge branch 'master' into master-ghc8107	2023-11-16 18:13:02 +00:00
Evgeny Poberezkin	1570bc2b99	Merge branch 'master' into master-ghc8107	2023-11-11 13:56:53 +00:00
Evgeny Poberezkin	f3014f258d	Merge branch 'master' into master-ghc8107	2023-11-11 09:51:42 +00:00
Evgeny Poberezkin	74b78a8d7b	Merge branch 'master' into master-ghc8107	2023-11-10 21:11:08 +00:00
Evgeny Poberezkin	fe4eb7b5af	Merge branch 'master' into master-ghc8107 without changes, to skip update for ghc 9.6.3	2023-11-10 21:04:20 +00:00
Evgeny Poberezkin	2516d5a393	Merge branch 'master' into master-ghc8107	2023-11-06 11:26:22 +00:00
spaced4ndy	4253cd7fb9	Merge branch 'master' into master-ghc8107	2023-11-06 11:41:55 +04:00
Evgeny Poberezkin	1f5b80d560	fix for ghc8107	2023-11-04 13:37:25 +00:00
Evgeny Poberezkin	2de111e76c	Merge branch 'master' into master-ghc8107	2023-11-04 13:02:08 +00:00
spaced4ndy	5dbe2b2745	Merge branch 'master' into master-ghc8107	2023-10-30 21:00:11 +04:00
Evgeny Poberezkin	6881600e06	Merge branch 'master' into master-ghc8107	2023-10-29 18:24:13 +00:00
spaced4ndy	9ded1c9821	Merge branch 'master' into master-ghc8107	2023-10-25 10:47:35 +04:00
spaced4ndy	c3e82a6a4e	Merge branch 'master' into master-ghc8107	2023-10-24 18:13:56 +04:00
spaced4ndy	e7e66ff873	Merge branch 'master' into master-ghc8107	2023-10-24 17:40:55 +04:00
Evgeny Poberezkin	d6b9a45a39	Merge branch 'master' into master-ghc8107	2023-10-22 15:10:33 +01:00
Evgeny Poberezkin	4004aafbc5	Merge branch 'master' into master-ghc8107	2023-10-18 22:44:27 +01:00
spaced4ndy	c7a8992043	core: fix compilation for ghc 8.10.7	2023-10-16 20:05:13 +04:00
spaced4ndy	ed9f277421	Merge branch 'master' into master-ghc8107	2023-10-16 19:28:06 +04:00
Evgeny Poberezkin	d8fb31f167	Merge branch 'master' into master-ghc8107	2023-10-15 18:53:23 +01:00
Evgeny Poberezkin	7692195bfa	core: fix for ghc 8.10.7	2023-10-11 21:57:53 +01:00
Evgeny Poberezkin	effc281271	Merge branch 'master' into master-ghc8107	2023-10-11 21:27:21 +01:00
spaced4ndy	67d74a0a27	Merge branch 'master' into master-ghc8107	2023-10-11 13:21:46 +04:00
Evgeny Poberezkin	74d186af16	Merge branch 'master' into master-ghc8107	2023-10-09 17:31:27 +01:00
Evgeny Poberezkin	4782cab507	Merge branch 'master' into master-ghc8107	2023-10-09 14:05:04 +01:00
Evgeny Poberezkin	2501cbe55d	Merge branch 'master' into master-ghc8107	2023-10-08 08:38:02 +01:00
Evgeny Poberezkin	6b8b9ab4fd	Merge branch 'master' into master-ghc8107	2023-10-07 19:06:38 +01:00
Evgeny Poberezkin	316d605899	Merge branch 'master' into master-ghc8107	2023-10-02 23:04:13 +01:00
Evgeny Poberezkin	a3f2d5c919	Merge branch 'master' into master-ghc8107	2023-10-01 13:20:06 +01:00
Evgeny Poberezkin	0312fde818	Merge branch 'master' into master-ghc8107	2023-10-01 11:19:27 +01:00
Evgeny Poberezkin	915b53054c	Merge branch 'master' into master-ghc8107	2023-09-29 13:14:57 +01:00
Evgeny Poberezkin	e273bd1239	Merge branch 'master' into master-ghc8107	2023-09-27 22:04:00 +01:00
spaced4ndy	e7f0234134	Merge branch 'master' into master-ghc8107	2023-09-27 20:11:39 +04:00
Evgeny Poberezkin	98a3fc214d	Merge branch 'master' into master-ghc8107	2023-09-27 16:04:25 +01:00
Evgeny Poberezkin	dacc075fe8	Merge branch 'master' into master-ghc8107	2023-09-25 16:52:33 +01:00
spaced4ndy	f2b5c0f3a8	Merge branch 'master' into master-ghc8107	2023-09-25 17:43:37 +04:00
spaced4ndy	8e045764df	Merge branch 'master' into master-ghc8107	2023-09-25 16:40:08 +04:00
Evgeny Poberezkin	81bd7d97c5	Merge branch 'master' into master-ghc8107	2023-09-22 17:21:54 +01:00
Evgeny Poberezkin	8f57925067	compatibility with GHC 8.10.7	2023-09-22 14:01:25 +01:00
Evgeny Poberezkin	9bf99db82e	Merge branch 'master' into master-ghc8107	2023-09-22 13:46:50 +01:00
Evgeny Poberezkin	5615cdbf1a	Merge branch 'master' into master-android	2023-09-21 17:04:47 +01:00
Evgeny Poberezkin	d802ae0058	Merge branch 'master' into master-android	2023-09-21 12:06:10 +01:00
Evgeny Poberezkin	8f2278198c	Merge branch 'master' into master-android	2023-09-20 14:55:25 +01:00
spaced4ndy	10937a5a4e	Merge branch 'master' into master-android	2023-09-20 17:36:53 +04:00
Evgeny Poberezkin	6aff6e9804	Merge branch 'master-ghc9' into master-ghc8107	2023-09-18 21:56:35 +01:00
Evgeny Poberezkin	95477cae7e	core: use commit from simplexmq branch master-ghc8107	2023-09-18 21:45:50 +01:00